diff --git a/agendacalendarview/build.gradle b/agendacalendarview/build.gradle
index 824ce517..92731fb9 100644
--- a/agendacalendarview/build.gradle
+++ b/agendacalendarview/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 //apply plugin: 'me.tatarka.retrolambda'
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    compileSdkVersion setup.compileSdk
 
     android {
         lintOptions {
@@ -12,7 +12,7 @@ android {
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion rootProject.ext.targetSdkVersion
+        targetSdkVersion setup.targetSdk
         versionCode 1
         versionName "1.0"
     }
@@ -43,9 +43,9 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     // Google libraries
-    implementation "androidx.appcompat:appcompat:${androidXAppCompat}"
-    implementation "androidx.recyclerview:recyclerview:${androidXRecyclerView}"
-    implementation "com.google.android.material:material:${googleMaterial}"
+    implementation "androidx.appcompat:appcompat:${versions.appcompat}"
+    implementation "androidx.recyclerview:recyclerview:${versions.recyclerView}"
+    implementation "com.google.android.material:material:${versions.material}"
 
     // other libraries
     //implementation 'se.emilsjolander:stickylistheaders:2.7.0'
diff --git a/app/build.gradle b/app/build.gradle
index f7131927..f034b276 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,14 @@
 apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'io.fabric'
 
 android {
     signingConfigs {
     }
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    compileSdkVersion setup.compileSdk
     defaultConfig {
         applicationId 'pl.szczodrzynski.edziennik'
         minSdkVersion setup.minSdk
@@ -103,7 +104,7 @@ tasks.whenTaskAdded { task ->
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
-    annotationProcessor "androidx.room:room-compiler:${versions.room}"
+    kapt "androidx.room:room-compiler:${versions.room}"
     debugImplementation "com.amitshekhar.android:debug-db:1.0.5"
 
     implementation "android.arch.navigation:navigation-fragment-ktx:${versions.navigationFragment}"
diff --git a/app/proguard/app.pro b/app/proguard/app.pro
index 65817554..cad3fa17 100644
--- a/app/proguard/app.pro
+++ b/app/proguard/app.pro
@@ -28,7 +28,7 @@
 -keepclassmembers class pl.szczodrzynski.edziennik.ui.widgets.WidgetConfig { public *; }
 -keepnames class pl.szczodrzynski.edziennik.ui.widgets.timetable.WidgetTimetableProvider
 -keepnames class pl.szczodrzynski.edziennik.ui.widgets.notifications.WidgetNotificationsProvider
--keepnames class pl.szczodrzynski.edziennik.widgets.luckynumber.WidgetLuckyNumber
+-keepnames class pl.szczodrzynski.edziennik.ui.widgets.luckynumber.WidgetLuckyNumberProvider
 
 -keep class .R
 -keep class **.R$* {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 87d87c67..ce47405c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -80,6 +80,7 @@
         <service android:name=".ui.widgets.timetable.WidgetTimetableService"
             android:permission="android.permission.BIND_REMOTEVIEWS" />
         <activity android:name=".ui.widgets.LessonDialogActivity"
+            android:label=""
             android:configChanges="orientation|keyboardHidden"
             android:excludeFromRecents="true"
             android:noHistory="true"
@@ -141,12 +142,8 @@
             android:label="@string/app_name"
             android:theme="@style/AppTheme" />
         <activity android:name=".ui.modules.settings.SettingsLicenseActivity"
-
             android:configChanges="orientation|keyboardHidden"
             android:theme="@style/AppTheme" />
-        <activity android:name=".ui.modules.webpush.WebPushConfigActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:theme="@style/AppTheme.Dark" />
         <activity android:name=".ui.modules.webpush.QrScannerActivity" />
         <activity android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
             android:configChanges="orientation|keyboardHidden"
@@ -165,20 +162,11 @@
                 <action android:name="android.intent.action.USER_PRESENT" />
             </intent-filter>
         </receiver>
-        <receiver android:name=".receivers.BootReceiver">
+        <receiver android:name=".sync.UpdateDownloaderService$DownloadProgressReceiver">
             <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
-                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
             </intent-filter>
         </receiver>
-        <!--<receiver android:name=".sync.FirebaseBroadcastReceiver"
-            android:exported="true"
-            android:permission="com.google.android.c2dm.permission.SEND">
-            <intent-filter>
-                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-            </intent-filter>
-        </receiver>-->
         <receiver android:name=".receivers.SzkolnyReceiver"
             android:exported="true">
             <intent-filter>
@@ -200,8 +188,6 @@
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>-->
-        <service android:name=".receivers.BootReceiver$NotificationActionService" />
-        <service android:name=".Notifier$GetDataRetryService" />
         <service android:name=".data.api.ApiService" />
         <service android:name=".data.firebase.MyFirebaseService"
             android:exported="false">
@@ -210,6 +196,7 @@
                 <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
             </intent-filter>
         </service>
+        <service android:name=".sync.UpdateDownloaderService" />
 
         <!--
               _____                _     _
diff --git a/app/src/main/assets/pl-changelog.html b/app/src/main/assets/pl-changelog.html
index 60d222ca..15789ca0 100644
--- a/app/src/main/assets/pl-changelog.html
+++ b/app/src/main/assets/pl-changelog.html
@@ -1,4 +1,4 @@
-<h3>Wersja 4.0-beta.3, 2020-01-10</h3>
+<h3>Wersja 4.0-beta.4, 2020-01-19</h3>
 <ul>
     <li><b>Przebudowaliśmy cały moduł synchronizacji</b>, co oznacza większą stabilność aplikacji, szybkosć oraz poprawność pobieranych danych.</li>
     <li><b><u>Wysyłanie wiadomości</u></b> - funkcja, na którą czekał każdy. Od teraz w Szkolnym można wysyłać oraz odpowiadać na wiadomości do nauczycieli &#x1F44F;</li>
@@ -6,6 +6,7 @@
     <li>Nowa <b>Strona główna</b> - ładniejszy wygląd oraz możliwość przestawiania kart na każdym profilu</li>
     <li>Nowy <b>Plan lekcji</b> - z doskonałą obsługą lekcji przesuniętych oraz dwóch lekcji o tej samej godzinie</li>
     <li>Nowe okienka informacji o wydarzeniach oraz lekcjach</li>
+    <li>Nowe, przyjemniejsze powiadomienia</li>
     <li>Łatwiejsze dodawanie własnych wydarzeń</li>
     <li>Dużo poprawek w widoku <b>Wiadomości</b> oraz <b>Ogłoszeń</b></li>
     <li>Częściowa <b>Obsługa dziennika EduDziennik</b></li>
@@ -14,7 +15,9 @@
     <li>Librus: obsługa Zadań domowych bez posiadania Mobilnych dodatków (przez system Synergia)</li>
     <li>Lepsze <b>przekazywanie powiadomień na komputer</b> oraz łatwiejsze parowanie</li>
     <li>Poprawiliśmy synchronizację w tle na niektórych telefonach</li>
+    <li>Usunąłem denerwujący brak zaznaczenia w lewym menu</li>
     <li>Znaczna ilość błędów z poprzednich wersji już nie występuje</li>
+    <li><strike>Występują natomiast nowe błędy, dlatego proszę o ich zgłaszanie :)</strike></li>
 </ul>
 <br>
 <br>
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/App.kt b/app/src/main/java/pl/szczodrzynski/edziennik/App.kt
index f31deb09..96ae5cde 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/App.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/App.kt
@@ -4,20 +4,93 @@
 
 package pl.szczodrzynski.edziennik
 
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.content.pm.ShortcutInfo
+import android.content.pm.ShortcutManager
+import android.graphics.drawable.Icon
+import android.os.Build
+import android.provider.Settings
 import android.util.Log
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.multidex.MultiDexApplication
 import androidx.work.Configuration
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
+import cat.ereza.customactivityoncrash.config.CaocConfig
+import com.chuckerteam.chucker.api.ChuckerCollector
+import com.chuckerteam.chucker.api.ChuckerInterceptor
+import com.chuckerteam.chucker.api.RetentionManager
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import com.google.firebase.iid.FirebaseInstanceId
+import com.google.firebase.messaging.FirebaseMessaging
+import com.google.gson.Gson
+import com.hypertrack.hyperlog.HyperLog
+import com.mikepenz.iconics.Iconics
+import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont
+import im.wangchao.mhttp.MHttp
+import im.wangchao.mhttp.internal.cookie.PersistentCookieJar
+import im.wangchao.mhttp.internal.cookie.cache.SetCookieCache
+import im.wangchao.mhttp.internal.cookie.persistence.SharedPrefsCookiePersistor
+import kotlinx.coroutines.*
+import me.leolin.shortcutbadger.ShortcutBadger
+import okhttp3.OkHttpClient
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.config.Config
+import pl.szczodrzynski.edziennik.data.api.events.ProfileListEmptyEvent
+import pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing
+import pl.szczodrzynski.edziennik.data.db.AppDb
+import pl.szczodrzynski.edziennik.data.db.entity.Profile
+import pl.szczodrzynski.edziennik.network.NetworkUtils
+import pl.szczodrzynski.edziennik.sync.SyncWorker
+import pl.szczodrzynski.edziennik.sync.UpdateWorker
+import pl.szczodrzynski.edziennik.ui.modules.base.CrashActivity
+import pl.szczodrzynski.edziennik.utils.*
+import java.util.concurrent.TimeUnit
 import kotlin.coroutines.CoroutineContext
 
-class Szkolny : /*MultiDexApplication(),*/ Configuration.Provider, CoroutineScope {
+class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
     companion object {
+        @Volatile
+        lateinit var db: AppDb
+        val config: Config by lazy { Config(db) }
+        var profile: Profile by mutableLazy { Profile(0, 0, 0, "") }
+        val profileId
+            get() = profile.id
+
         var devMode = false
     }
 
-    //lateinit var db: AppDb
-    //val config by lazy { Config(db); // TODO migrate }
+    val notifications by lazy { Notifications() }
+    inner class Notifications {
+        val syncId = 1
+        val syncKey = "pl.szczodrzynski.edziennik.SYNC"
+        val syncChannelName: String by lazy { getString(R.string.notification_channel_get_data_name) }
+        val syncChannelDesc: String by lazy { getString(R.string.notification_channel_get_data_desc) }
+        val dataId = 50
+        val dataKey = "pl.szczodrzynski.edziennik.DATA"
+        val dataChannelName: String by lazy { getString(R.string.notification_channel_notifications_name) }
+        val dataChannelDesc: String by lazy { getString(R.string.notification_channel_notifications_desc) }
+        val dataQuietId = 60
+        val dataQuietKey = "pl.szczodrzynski.edziennik.DATA_QUIET"
+        val dataQuietChannelName: String by lazy { getString(R.string.notification_channel_notifications_quiet_name) }
+        val dataQuietChannelDesc: String by lazy { getString(R.string.notification_channel_notifications_quiet_desc) }
+        val updatesId = 100
+        val updatesKey = "pl.szczodrzynski.edziennik.UPDATES"
+        val updatesChannelName: String by lazy { getString(R.string.notification_channel_updates_name) }
+        val updatesChannelDesc: String by lazy { getString(R.string.notification_channel_updates_desc) }
+    }
+
+    val db
+        get() = App.db
+    val config
+        get() = App.config
+    val profile
+        get() = App.profile
+    val profileId
+        get() = App.profileId
 
     private val job = Job()
     override val coroutineContext: CoroutineContext
@@ -26,11 +99,10 @@ class Szkolny : /*MultiDexApplication(),*/ Configuration.Provider, CoroutineScop
             .setMinimumLoggingLevel(Log.VERBOSE)
             .build()
 
-    /*val preferences by lazy { getSharedPreferences(getString(R.string.preference_file), Context.MODE_PRIVATE) }
-    val notifier by lazy { Notifier(this) }
+    val preferences by lazy { getSharedPreferences(getString(R.string.preference_file), Context.MODE_PRIVATE) }
     val permissionChecker by lazy { PermissionChecker(this) }
-
-    lateinit var profile: ProfileFull
+    val networkUtils by lazy { NetworkUtils(this) }
+    val gson by lazy { Gson() }
 
     /*    _    _ _______ _______ _____
          | |  | |__   __|__   __|  __ \
@@ -48,13 +120,13 @@ class Szkolny : /*MultiDexApplication(),*/ Configuration.Provider, CoroutineScop
                 .connectTimeout(20, TimeUnit.SECONDS)
                 .writeTimeout(5, TimeUnit.SECONDS)
                 .readTimeout(10, TimeUnit.SECONDS)
-        builder.installHttpsSupport()
+        builder.installHttpsSupport(this)
 
         if (devMode || BuildConfig.DEBUG) {
             HyperLog.initialize(this)
             HyperLog.setLogLevel(Log.VERBOSE)
             HyperLog.setLogFormat(DebugLogFormat(this))
-            val chuckerCollector = ChuckerCollector(this, true, Period.ONE_HOUR)
+            val chuckerCollector = ChuckerCollector(this, true, RetentionManager.Period.ONE_HOUR)
             val chuckerInterceptor = ChuckerInterceptor(this, chuckerCollector)
             builder.addInterceptor(chuckerInterceptor)
         }
@@ -77,22 +149,7 @@ class Szkolny : /*MultiDexApplication(),*/ Configuration.Provider, CoroutineScop
          |_____/|_|\__, |_| |_|\__,_|\__|\__,_|_|  \___|
                     __/ |
                    |__*/
-    private val deviceId: String by lazy { Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID) ?: "" }
-    private val signature: String by lazy {
-        var str = ""
-        try {
-            val packageInfo: PackageInfo = packageManager.getPackageInfo(packageName, PackageManager.GET_SIGNATURES)
-            for (signature in packageInfo.signatures) {
-                val signatureBytes = signature.toByteArray()
-                val md = MessageDigest.getInstance("SHA")
-                md.update(signatureBytes)
-                str = Base64.encodeToString(md.digest(), Base64.DEFAULT)
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-        str
-    }
+    val deviceId: String by lazy { Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID) ?: "" }
     private var unreadBadgesAvailable = true
 
     /*                 _____                _
@@ -118,193 +175,214 @@ class Szkolny : /*MultiDexApplication(),*/ Configuration.Provider, CoroutineScop
                 .apply()
         Iconics.init(applicationContext)
         Iconics.registerFont(SzkolnyFont)
-        db = AppDb.getDatabase(this)
+        App.db = AppDb(this)
         Themes.themeInt = config.ui.theme
         MHttp.instance().customOkHttpClient(http)
 
+        if (!profileLoadById(config.lastProfileId)) {
+            db.profileDao().firstId?.let { profileLoadById(it) }
+        }
+
         devMode = "f054761fbdb6a238" == deviceId || BuildConfig.DEBUG
-        if (config.devModePassword != null)
-            checkDevModePassword()
 
         Signing.getCert(this)
 
-        launch { async(Dispatchers.Default) {
-            if (config.sync.enabled) {
-                scheduleNext(this@App, false)
-            } else {
-                cancelNext(this@App)
+        launch {
+            withContext(Dispatchers.Default) {
+                config.migrate(this@App)
+
+                if (config.devModePassword != null)
+                    checkDevModePassword()
+
+                if (config.sync.enabled)
+                    SyncWorker.scheduleNext(this@App, false)
+                else
+                    SyncWorker.cancelNext(this@App)
+
+                if (config.sync.notifyAboutUpdates)
+                    UpdateWorker.scheduleNext(this@App, false)
+                else
+                    UpdateWorker.cancelNext(this@App)
+
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+                    val shortcutManager = getSystemService(ShortcutManager::class.java)
+
+                    val shortcutTimetable = ShortcutInfo.Builder(this@App, "item_timetable")
+                            .setShortLabel(getString(R.string.shortcut_timetable)).setLongLabel(getString(R.string.shortcut_timetable))
+                            .setIcon(Icon.createWithResource(this@App, R.mipmap.ic_shortcut_timetable))
+                            .setIntent(Intent(Intent.ACTION_MAIN, null, this@App, MainActivity::class.java)
+                                    .putExtra("fragmentId", MainActivity.DRAWER_ITEM_TIMETABLE))
+                            .build()
+
+                    val shortcutAgenda = ShortcutInfo.Builder(this@App, "item_agenda")
+                            .setShortLabel(getString(R.string.shortcut_agenda)).setLongLabel(getString(R.string.shortcut_agenda))
+                            .setIcon(Icon.createWithResource(this@App, R.mipmap.ic_shortcut_agenda))
+                            .setIntent(Intent(Intent.ACTION_MAIN, null, this@App, MainActivity::class.java)
+                                    .putExtra("fragmentId", MainActivity.DRAWER_ITEM_AGENDA))
+                            .build()
+
+                    val shortcutGrades = ShortcutInfo.Builder(this@App, "item_grades")
+                            .setShortLabel(getString(R.string.shortcut_grades)).setLongLabel(getString(R.string.shortcut_grades))
+                            .setIcon(Icon.createWithResource(this@App, R.mipmap.ic_shortcut_grades))
+                            .setIntent(Intent(Intent.ACTION_MAIN, null, this@App, MainActivity::class.java)
+                                    .putExtra("fragmentId", MainActivity.DRAWER_ITEM_GRADES))
+                            .build()
+
+                    val shortcutHomework = ShortcutInfo.Builder(this@App, "item_homeworks")
+                            .setShortLabel(getString(R.string.shortcut_homework)).setLongLabel(getString(R.string.shortcut_homework))
+                            .setIcon(Icon.createWithResource(this@App, R.mipmap.ic_shortcut_homework))
+                            .setIntent(Intent(Intent.ACTION_MAIN, null, this@App, MainActivity::class.java)
+                                    .putExtra("fragmentId", MainActivity.DRAWER_ITEM_HOMEWORK))
+                            .build()
+
+                    val shortcutMessages = ShortcutInfo.Builder(this@App, "item_messages")
+                            .setShortLabel(getString(R.string.shortcut_messages)).setLongLabel(getString(R.string.shortcut_messages))
+                            .setIcon(Icon.createWithResource(this@App, R.mipmap.ic_shortcut_messages))
+                            .setIntent(Intent(Intent.ACTION_MAIN, null, this@App, MainActivity::class.java)
+                                    .putExtra("fragmentId", MainActivity.DRAWER_ITEM_MESSAGES))
+                            .build()
+
+                    shortcutManager.dynamicShortcuts = listOf(
+                            shortcutTimetable,
+                            shortcutAgenda,
+                            shortcutGrades,
+                            shortcutHomework,
+                            shortcutMessages
+                    )
+                } // shortcuts - end
+
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    val notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+                    notificationManager.createNotificationChannel(
+                            NotificationChannel(notifications.syncKey, notifications.syncChannelName, NotificationManager.IMPORTANCE_MIN).apply {
+                                description = notifications.syncChannelDesc
+                            })
+                    notificationManager.createNotificationChannel(
+                            NotificationChannel(notifications.dataKey, notifications.dataChannelName, NotificationManager.IMPORTANCE_HIGH).apply {
+                                description = notifications.dataChannelDesc
+                                enableLights(true)
+                                lightColor = 0xff2196f3.toInt()
+                            })
+                    notificationManager.createNotificationChannel(
+                            NotificationChannel(notifications.dataQuietKey, notifications.dataQuietChannelName, NotificationManager.IMPORTANCE_LOW).apply {
+                                description = notifications.dataQuietChannelDesc
+                                setSound(null, null)
+                                enableVibration(false)
+                            })
+                    notificationManager.createNotificationChannel(
+                            NotificationChannel(notifications.updatesKey, notifications.updatesChannelName, NotificationManager.IMPORTANCE_DEFAULT).apply {
+                                description = notifications.updatesChannelDesc
+                            })
+                }
+
+
+                if (config.appInstalledTime == 0L)
+                    try {
+                        config.appInstalledTime = packageManager.getPackageInfo(packageName, 0).firstInstallTime
+                        config.appRateSnackbarTime = config.appInstalledTime + 7 * DAY * MS
+                    } catch (e: PackageManager.NameNotFoundException) {
+                        e.printStackTrace()
+                    }
+
+                val pushMobidziennikApp = FirebaseApp.initializeApp(
+                        this@App,
+                        FirebaseOptions.Builder()
+                                .setApiKey("AIzaSyCi5LmsZ5BBCQnGtrdvWnp1bWLCNP8OWQE")
+                                .setApplicationId("1:747285019373:android:f6341bf7b158621d")
+                                .build(),
+                        "Mobidziennik2"
+                )
+
+                val pushLibrusApp = FirebaseApp.initializeApp(
+                        this@App,
+                        FirebaseOptions.Builder()
+                                .setApiKey("AIzaSyDfTuEoYPKdv4aceEws1CO3n0-HvTndz-o")
+                                .setApplicationId("1:513056078587:android:1e29083b760af544")
+                                .build(),
+                        "Librus"
+                )
+
+                val pushVulcanApp = FirebaseApp.initializeApp(
+                        this@App,
+                        FirebaseOptions.Builder()
+                                .setApiKey("AIzaSyDW8MUtanHy64_I0oCpY6cOxB3jrvJd_iA")
+                                .setApplicationId("1:987828170337:android:ac97431a0a4578c3")
+                                .build(),
+                        "Vulcan"
+                )
+
+                try {
+                    FirebaseInstanceId.getInstance().instanceId.addOnSuccessListener { instanceIdResult ->
+                        val token = instanceIdResult.token
+                        config.sync.tokenApp = token
+                    }
+                    FirebaseInstanceId.getInstance(pushMobidziennikApp).instanceId.addOnSuccessListener { instanceIdResult ->
+                        val token = instanceIdResult.token
+                        if (token != config.sync.tokenMobidziennik) {
+                            config.sync.tokenMobidziennik = token
+                            config.sync.tokenMobidziennikList = listOf()
+                        }
+                    }
+                    FirebaseInstanceId.getInstance(pushLibrusApp).instanceId.addOnSuccessListener { instanceIdResult ->
+                        val token = instanceIdResult.token
+                        if (token != config.sync.tokenLibrus) {
+                            config.sync.tokenLibrus = token
+                            config.sync.tokenLibrusList = listOf()
+                        }
+                    }
+                    FirebaseInstanceId.getInstance(pushVulcanApp).instanceId.addOnSuccessListener { instanceIdResult ->
+                        val token = instanceIdResult.token
+                        if (token != config.sync.tokenVulcan) {
+                            config.sync.tokenVulcan = token
+                            config.sync.tokenVulcanList = listOf()
+                        }
+                    }
+                    FirebaseMessaging.getInstance().subscribeToTopic(packageName)
+                } catch (e: IllegalStateException) {
+                    e.printStackTrace()
+                }
             }
 
             db.metadataDao().countUnseen().observeForever { count: Int ->
                 if (unreadBadgesAvailable)
                     unreadBadgesAvailable = ShortcutBadger.applyCount(this@App, count)
             }
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
-                val shortcutManager = getSystemService(ShortcutManager::class.java)
-
-                val shortcutTimetable = ShortcutInfo.Builder(this@App, "item_timetable")
-                        .setShortLabel(getString(R.string.shortcut_timetable)).setLongLabel(getString(R.string.shortcut_timetable))
-                        .setIcon(Icon.createWithResource(this@App, R.mipmap.ic_shortcut_timetable))
-                        .setIntent(Intent(Intent.ACTION_MAIN, null, this@App, MainActivity::class.java)
-                                .putExtra("fragmentId", MainActivity.DRAWER_ITEM_TIMETABLE))
-                        .build()
-
-                val shortcutAgenda = ShortcutInfo.Builder(this@App, "item_agenda")
-                        .setShortLabel(getString(R.string.shortcut_agenda)).setLongLabel(getString(R.string.shortcut_agenda))
-                        .setIcon(Icon.createWithResource(this@App, R.mipmap.ic_shortcut_agenda))
-                        .setIntent(Intent(Intent.ACTION_MAIN, null, this@App, MainActivity::class.java)
-                                .putExtra("fragmentId", MainActivity.DRAWER_ITEM_AGENDA))
-                        .build()
-
-                val shortcutGrades = ShortcutInfo.Builder(this@App, "item_grades")
-                        .setShortLabel(getString(R.string.shortcut_grades)).setLongLabel(getString(R.string.shortcut_grades))
-                        .setIcon(Icon.createWithResource(this@App, R.mipmap.ic_shortcut_grades))
-                        .setIntent(Intent(Intent.ACTION_MAIN, null, this@App, MainActivity::class.java)
-                                .putExtra("fragmentId", MainActivity.DRAWER_ITEM_GRADES))
-                        .build()
-
-                val shortcutHomework = ShortcutInfo.Builder(this@App, "item_homeworks")
-                        .setShortLabel(getString(R.string.shortcut_homework)).setLongLabel(getString(R.string.shortcut_homework))
-                        .setIcon(Icon.createWithResource(this@App, R.mipmap.ic_shortcut_homework))
-                        .setIntent(Intent(Intent.ACTION_MAIN, null, this@App, MainActivity::class.java)
-                                .putExtra("fragmentId", MainActivity.DRAWER_ITEM_HOMEWORK))
-                        .build()
-
-                val shortcutMessages = ShortcutInfo.Builder(this@App, "item_messages")
-                        .setShortLabel(getString(R.string.shortcut_messages)).setLongLabel(getString(R.string.shortcut_messages))
-                        .setIcon(Icon.createWithResource(this@App, R.mipmap.ic_shortcut_messages))
-                        .setIntent(Intent(Intent.ACTION_MAIN, null, this@App, MainActivity::class.java)
-                                .putExtra("fragmentId", MainActivity.DRAWER_ITEM_MESSAGES))
-                        .build()
-
-                shortcutManager.dynamicShortcuts = listOf(
-                        shortcutTimetable,
-                        shortcutAgenda,
-                        shortcutGrades,
-                        shortcutHomework,
-                        shortcutMessages
-                )
-            } // shortcuts - end
-
-            if (config.appInstalledTime == 0L)
-                try {
-                    config.appInstalledTime = packageManager.getPackageInfo(packageName, 0).firstInstallTime
-                    config.appRateSnackbarTime = config.appInstalledTime + 7*DAY*MS
-                } catch (e: NameNotFoundException) {
-                    e.printStackTrace()
-                }
-
-            val pushMobidziennikApp = FirebaseApp.initializeApp(
-                    this@App,
-                    FirebaseOptions.Builder()
-                            .setApiKey("AIzaSyCi5LmsZ5BBCQnGtrdvWnp1bWLCNP8OWQE")
-                            .setApplicationId("1:747285019373:android:f6341bf7b158621d")
-                            .build(),
-                    "Mobidziennik2"
-            )
-
-            val pushLibrusApp = FirebaseApp.initializeApp(
-                    this@App,
-                    FirebaseOptions.Builder()
-                            .setApiKey("AIzaSyDfTuEoYPKdv4aceEws1CO3n0-HvTndz-o")
-                            .setApplicationId("1:513056078587:android:1e29083b760af544")
-                            .build(),
-                    "Librus"
-            )
-
-            val pushVulcanApp = FirebaseApp.initializeApp(
-                    this@App,
-                    FirebaseOptions.Builder()
-                            .setApiKey("AIzaSyDW8MUtanHy64_I0oCpY6cOxB3jrvJd_iA")
-                            .setApplicationId("1:987828170337:android:ac97431a0a4578c3")
-                            .build(),
-                    "Vulcan"
-            )
-
-            try {
-                FirebaseInstanceId.getInstance().instanceId.addOnSuccessListener { instanceIdResult ->
-                    val token = instanceIdResult.token
-                    config.sync.tokenApp = token
-                }
-                FirebaseInstanceId.getInstance(pushMobidziennikApp).instanceId.addOnSuccessListener { instanceIdResult ->
-                    val token = instanceIdResult.token
-                    if (token != config.sync.tokenMobidziennik) {
-                        config.sync.tokenMobidziennik = token
-                        config.sync.tokenMobidziennikList = listOf()
-                    }
-                }
-                FirebaseInstanceId.getInstance(pushLibrusApp).instanceId.addOnSuccessListener { instanceIdResult ->
-                    val token = instanceIdResult.token
-                    if (token != config.sync.tokenLibrus) {
-                        config.sync.tokenLibrus = token
-                        config.sync.tokenLibrusList = listOf()
-                    }
-                }
-                FirebaseInstanceId.getInstance(pushVulcanApp).instanceId.addOnSuccessListener { instanceIdResult ->
-                    val token = instanceIdResult.token
-                    if (token != config.sync.tokenVulcan) {
-                        config.sync.tokenVulcan = token
-                        config.sync.tokenVulcanList = listOf()
-                    }
-                }
-                FirebaseMessaging.getInstance().subscribeToTopic(packageName)
-            } catch (e: IllegalStateException) {
-                e.printStackTrace()
-            }
-        }}
-    }
-
-    private fun profileLoad(profileId: Int) {
-        db.profileDao().getFullByIdNow(profileId)?.also {
-            profile = it
-        } ?: run {
-            if (!::profile.isInitialized) {
-                profile = ProfileFull(-1, "", "", -1)
-            }
         }
     }
-    fun profileLoad(profileId: Int, onSuccess: (profile: ProfileFull) -> Unit) {
+
+    private fun profileLoadById(profileId: Int): Boolean {
+        db.profileDao().getByIdNow(profileId)?.also {
+            App.profile = it
+            App.config.lastProfileId = it.id
+            return true
+        }
+        return false
+    }
+    fun profileLoad(profileId: Int, onSuccess: (profile: Profile) -> Unit) {
         launch {
-            val deferred = async(Dispatchers.Default) {
-                profileLoad(profileId)
+            val success = withContext(Dispatchers.Default) {
+                profileLoadById(profileId)
             }
-            deferred.await()
-            onSuccess(profile)
+            if (success)
+                onSuccess(profile)
+            else
+                profileLoadLast(onSuccess)
         }
     }
-
-    private fun OkHttpClient.Builder.installHttpsSupport() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN && Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) {
-            try {
-                try {
-                    ProviderInstaller.installIfNeeded(this@App)
-                } catch (e: Exception) {
-                    Log.e("OkHttpTLSCompat", "Play Services not found or outdated")
-
-                    val trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
-                    trustManagerFactory.init(null as KeyStore?)
-
-                    val x509TrustManager = trustManagerFactory.trustManagers.singleOrNull { it is X509TrustManager } as X509TrustManager?
-                            ?: return
-
-                    val sc = SSLContext.getInstance("TLSv1.2")
-                    sc.init(null, null, null)
-                    sslSocketFactory(TLSSocketFactory(sc.socketFactory), x509TrustManager)
-                    val cs: ConnectionSpec = ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
-                            .tlsVersions(TlsVersion.TLS_1_0)
-                            .tlsVersions(TlsVersion.TLS_1_1)
-                            .tlsVersions(TlsVersion.TLS_1_2)
-                            .build()
-                    val specs: MutableList<ConnectionSpec> = ArrayList()
-                    specs.add(cs)
-                    specs.add(ConnectionSpec.COMPATIBLE_TLS)
-                    specs.add(ConnectionSpec.CLEARTEXT)
-                    connectionSpecs(specs)
-                }
-            } catch (exc: Exception) {
-                Log.e("OkHttpTLSCompat", "Error while setting TLS 1.2", exc)
+    fun profileLoadLast(onSuccess: (profile: Profile) -> Unit) {
+        launch {
+            val success = withContext(Dispatchers.Default) {
+                profileLoadById(db.profileDao().lastId ?: return@withContext false)
             }
+            if (!success) {
+                EventBus.getDefault().post(ProfileListEmptyEvent())
+            }
+        }
+    }
+    fun profileSave() = profileSave(profile)
+    fun profileSave(profile: Profile) {
+        launch(Dispatchers.Default) {
+            App.db.profileDao().add(profile)
         }
     }
 
@@ -315,5 +393,5 @@ class Szkolny : /*MultiDexApplication(),*/ Configuration.Provider, CoroutineScop
             e.printStackTrace()
             false
         }
-    }*/
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/App.java b/app/src/main/java/pl/szczodrzynski/edziennik/AppOld.java
similarity index 72%
rename from app/src/main/java/pl/szczodrzynski/edziennik/App.java
rename to app/src/main/java/pl/szczodrzynski/edziennik/AppOld.java
index 56342064..1b389b4a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/App.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/AppOld.java
@@ -1,91 +1,10 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-1-19.
+ */
+
 package pl.szczodrzynski.edziennik;
 
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ShortcutInfo;
-import android.content.pm.ShortcutManager;
-import android.content.pm.Signature;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.drawable.Icon;
-import android.os.AsyncTask;
-import android.os.Build;
-import android.os.Handler;
-import android.provider.Settings;
-import android.util.Base64;
-import android.util.Log;
-
-import androidx.annotation.RequiresApi;
-import androidx.appcompat.app.AppCompatDelegate;
-import androidx.work.Configuration;
-
-import com.chuckerteam.chucker.api.ChuckerCollector;
-import com.chuckerteam.chucker.api.ChuckerInterceptor;
-import com.chuckerteam.chucker.api.RetentionManager;
-import com.google.android.gms.security.ProviderInstaller;
-import com.google.firebase.FirebaseApp;
-import com.google.firebase.FirebaseOptions;
-import com.google.firebase.iid.FirebaseInstanceId;
-import com.google.firebase.messaging.FirebaseMessaging;
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonSyntaxException;
-import com.hypertrack.hyperlog.HyperLog;
-import com.mikepenz.iconics.Iconics;
-import com.mikepenz.iconics.IconicsColor;
-import com.mikepenz.iconics.IconicsDrawable;
-import com.mikepenz.iconics.IconicsSize;
-import com.mikepenz.iconics.typeface.IIcon;
-import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont;
-
-import java.lang.reflect.Field;
-import java.security.KeyStore;
-import java.security.MessageDigest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.ConcurrentModificationException;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509TrustManager;
-
-import cat.ereza.customactivityoncrash.config.CaocConfig;
-import im.wangchao.mhttp.MHttp;
-import im.wangchao.mhttp.internal.cookie.PersistentCookieJar;
-import im.wangchao.mhttp.internal.cookie.cache.SetCookieCache;
-import im.wangchao.mhttp.internal.cookie.persistence.SharedPrefsCookiePersistor;
-import me.leolin.shortcutbadger.ShortcutBadger;
-import okhttp3.ConnectionSpec;
-import okhttp3.OkHttpClient;
-import okhttp3.TlsVersion;
-import pl.szczodrzynski.edziennik.config.Config;
-import pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing;
-import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask;
-import pl.szczodrzynski.edziennik.data.db.AppDb;
-import pl.szczodrzynski.edziennik.data.db.entity.DebugLog;
-import pl.szczodrzynski.edziennik.data.db.entity.Profile;
-import pl.szczodrzynski.edziennik.network.NetworkUtils;
-import pl.szczodrzynski.edziennik.network.TLSSocketFactory;
-import pl.szczodrzynski.edziennik.sync.SyncWorker;
-import pl.szczodrzynski.edziennik.ui.modules.base.CrashActivity;
-import pl.szczodrzynski.edziennik.utils.DebugLogFormat;
-import pl.szczodrzynski.edziennik.utils.PermissionChecker;
-import pl.szczodrzynski.edziennik.utils.Themes;
-import pl.szczodrzynski.edziennik.utils.Utils;
-import pl.szczodrzynski.edziennik.utils.models.AppConfig;
-
-import static pl.szczodrzynski.edziennik.data.db.entity.LoginStore.LOGIN_TYPE_MOBIDZIENNIK;
-
-public class App extends androidx.multidex.MultiDexApplication implements Configuration.Provider {
+/*public class AppOld extends androidx.multidex.MultiDexApplication implements Configuration.Provider {
     private static final String TAG = "App";
     public static int profileId = -1;
     private Context mContext;
@@ -379,36 +298,7 @@ public class App extends androidx.multidex.MultiDexApplication implements Config
                 }
             }
 
-            /*Task<CapabilityInfo> capabilityInfoTask =
-                    Wearable.getCapabilityClient(this)
-                            .getCapability("edziennik_wear_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);
 
-                    if (nodes.size() > 0) {
-                        Wearable.getMessageClient(this).sendMessage(
-                                nodes.toArray(new Node[]{})[0].getId(), "/ping", "Hello world".getBytes());
-                    }
-                } 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()));
-                    }
-                }
-            });*/
 
             FirebaseApp pushMobidziennikApp = FirebaseApp.initializeApp(
                     this,
@@ -498,14 +388,7 @@ public class App extends androidx.multidex.MultiDexApplication implements Config
 
         if (appSharedPrefs.contains("profiles")) {
             SharedPreferences.Editor appSharedPrefsEditor = appSharedPrefs.edit();
-            /*List<Integer> appProfileIds = gson.fromJson(appSharedPrefs.getString("profiles", ""), new TypeToken<List<Integer>>(){}.getType());
-            for (int id: appProfileIds) {
-                AppProfile appProfile = gson.fromJson(appSharedPrefs.getString("profile"+id, ""), AppProfile.class);
-                if (appProfile != null) {
-                    appConfig.profiles.add(appProfile);
-                }
-                appSharedPrefsEditor.remove("profile"+id);
-            }*/
+
             appSharedPrefsEditor.remove("profiles");
             appSharedPrefsEditor.apply();
             //profilesSave();
@@ -539,16 +422,6 @@ public class App extends androidx.multidex.MultiDexApplication implements Config
             }
         }
 
-        /*if (appConfig.lastAppVersion > BuildConfig.VERSION_CODE) {
-            BootReceiver br = new BootReceiver();
-            Intent i = new Intent();
-            //i.putExtra("UserChecked", true);
-            br.onReceive(getContext(), i);
-            Toast.makeText(mContext, R.string.warning_older_version_running, Toast.LENGTH_LONG).show();
-            //Toast.makeText(mContext, "Zaktualizuj aplikację.", Toast.LENGTH_LONG).show();
-            //System.exit(0);
-        }*/
-
         if (appConfig == null) {
             appConfig = new AppConfig(this);
         }
@@ -564,15 +437,7 @@ public class App extends androidx.multidex.MultiDexApplication implements Config
             for (Map.Entry<String, JsonElement> entry : appConfigJson.entrySet()) {
                 String jsonObj;
                 jsonObj = entry.getValue().toString();
-            /*if (entry.getValue().isJsonObject()) {
-                jsonObj = entry.getValue().getAsJsonObject().toString();
-            }
-            else if (entry.getValue().isJsonArray()) {
-                jsonObj = entry.getValue().getAsJsonArray().toString();
-            }
-            else {
-                jsonObj = entry.getValue().toString();
-            }*/
+
                 appSharedPrefsEditor.putString("app.appConfig." + entry.getKey(), jsonObj);
             }
 
@@ -628,18 +493,10 @@ public class App extends androidx.multidex.MultiDexApplication implements Config
     }
     public void profileLoadById(int id, boolean loadedLast) {
         //Log.d(TAG, "Loading ID "+id);
-        /*if (profile == null) {
-            profile = profileNew();
-            AppDb.profileId = profile.id;
-            appSharedPrefs.edit().putInt("current_profile_id", profile.id).apply();
-            return;
-        }*/
+
         if (profile == null || profile.getId() != id) {
             profile = db.profileDao().getByIdNow(id);
-            /*if (profile == null) {
-                profileLoadById(id);
-                return;
-            }*/
+
             if (profile != null) {
                 MainActivity.Companion.setUseOldMessages(profile.getLoginStoreType() == LOGIN_TYPE_MOBIDZIENNIK && appConfig.mobidziennikOldMessages == 1);
                 profileId = profile.getId();
@@ -655,44 +512,6 @@ public class App extends androidx.multidex.MultiDexApplication implements Config
         }
     }
 
-    /*public void profileRemove(int id)
-    {
-        Profile profile = db.profileDao().getFullByIdNow(id);
-
-        if (profile.id == profile.loginStoreId) {
-            // this profile is the owner of the login store
-            // we need to check if any other profile is using it
-            List<Integer> transferProfileIds = db.profileDao().getIdsByLoginStoreIdNow(profile.loginStoreId);
-            if (transferProfileIds.size() == 1) {
-                // this login store is free of users, remove it along with the profile
-                db.loginStoreDao().remove(profile.loginStoreId);
-                // the current store is removed, we are ready to remove the profile
-            }
-            else if (transferProfileIds.size() > 1) {
-                transferProfileIds.remove(transferProfileIds.indexOf(profile.id));
-                // someone is using the store
-                // we need to transfer it to the firstProfileId
-                db.loginStoreDao().changeId(profile.loginStoreId, transferProfileIds.get(0));
-                db.profileDao().changeStoreId(profile.loginStoreId, transferProfileIds.get(0));
-                // the current store is removed, we are ready to remove the profile
-            }
-        }
-        // else, the profile uses a store that it doesn't own
-        // leave the store and go on with removing
-
-        Log.d(TAG, "Before removal: "+db.profileDao().getAllNow().toString());
-        db.profileDao().remove(profile.id);
-        Log.d(TAG, "After removal: "+db.profileDao().getAllNow().toString());
-
-        *//*int newId = 1;
-        if (appConfig.profiles.size() > 0) {
-            newId = appConfig.profiles.get(appConfig.profiles.size() - 1).id;
-        }
-        Log.d(TAG, "New ID: "+newId);
-        //Toast.makeText(mContext, "selected new id "+newId, Toast.LENGTH_SHORT).show();
-        profileLoadById(newId);*//*
-    }*/
-
     public int profileFirstId() {
         Integer id = db.profileDao().getFirstId();
         return id == null ? 1 : id;
@@ -719,4 +538,4 @@ public class App extends androidx.multidex.MultiDexApplication implements Config
         }
     }
 
-}
+}*/
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt b/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt
index 34daa5fb..9e48e624 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt
@@ -35,6 +35,7 @@ import androidx.core.util.forEach
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
+import com.google.android.gms.security.ProviderInstaller
 import com.google.gson.JsonArray
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
@@ -42,23 +43,31 @@ import im.wangchao.mhttp.Response
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import okhttp3.ConnectionSpec
+import okhttp3.OkHttpClient
 import okhttp3.RequestBody
+import okhttp3.TlsVersion
 import okio.Buffer
 import pl.szczodrzynski.edziennik.data.db.entity.Notification
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
 import pl.szczodrzynski.edziennik.data.db.entity.Team
+import pl.szczodrzynski.edziennik.network.TLSSocketFactory
 import pl.szczodrzynski.edziennik.utils.models.Time
 import java.io.PrintWriter
 import java.io.StringWriter
 import java.math.BigInteger
 import java.nio.charset.Charset
+import java.security.KeyStore
 import java.security.MessageDigest
 import java.text.SimpleDateFormat
 import java.util.*
 import java.util.zip.CRC32
 import javax.crypto.Mac
 import javax.crypto.spec.SecretKeySpec
+import javax.net.ssl.SSLContext
+import javax.net.ssl.TrustManagerFactory
+import javax.net.ssl.X509TrustManager
 import kotlin.Pair
 
 
@@ -643,6 +652,12 @@ fun Bundle(vararg properties: Pair<String, Any?>): Bundle {
         }
     }
 }
+fun Intent(action: String? = null, vararg properties: Pair<String, Any?>): Intent {
+    return Intent(action).putExtras(Bundle(*properties))
+}
+fun Intent(packageContext: Context, cls: Class<*>, vararg properties: Pair<String, Any?>): Intent {
+    return Intent(packageContext, cls).putExtras(Bundle(*properties))
+}
 
 fun Bundle.toJsonObject(): JsonObject {
     val json = JsonObject()
@@ -957,6 +972,8 @@ fun Context.getNotificationTitle(type: Int): String {
         Notification.TYPE_NEW_EVENT -> R.string.notification_type_new_event
         Notification.TYPE_NEW_HOMEWORK -> R.string.notification_type_new_homework
         Notification.TYPE_NEW_SHARED_EVENT -> R.string.notification_type_new_shared_event
+        Notification.TYPE_NEW_SHARED_HOMEWORK -> R.string.notification_type_new_shared_homework
+        Notification.TYPE_REMOVED_SHARED_EVENT -> R.string.notification_type_removed_shared_event
         Notification.TYPE_NEW_MESSAGE -> R.string.notification_type_new_message
         Notification.TYPE_NEW_NOTICE -> R.string.notification_type_notice
         Notification.TYPE_NEW_ATTENDANCE -> R.string.notification_type_attendance
@@ -973,3 +990,37 @@ fun Context.getNotificationTitle(type: Int): String {
 fun Cursor?.getString(columnName: String) = this?.getStringOrNull(getColumnIndex(columnName))
 fun Cursor?.getInt(columnName: String) = this?.getIntOrNull(getColumnIndex(columnName))
 fun Cursor?.getLong(columnName: String) = this?.getLongOrNull(getColumnIndex(columnName))
+
+fun OkHttpClient.Builder.installHttpsSupport(context: Context) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN && Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) {
+        try {
+            try {
+                ProviderInstaller.installIfNeeded(context)
+            } catch (e: Exception) {
+                Log.e("OkHttpTLSCompat", "Play Services not found or outdated")
+
+                val trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
+                trustManagerFactory.init(null as KeyStore?)
+
+                val x509TrustManager = trustManagerFactory.trustManagers.singleOrNull { it is X509TrustManager } as X509TrustManager?
+                        ?: return
+
+                val sc = SSLContext.getInstance("TLSv1.2")
+                sc.init(null, null, null)
+                sslSocketFactory(TLSSocketFactory(sc.socketFactory), x509TrustManager)
+                val cs: ConnectionSpec = ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
+                        .tlsVersions(TlsVersion.TLS_1_0)
+                        .tlsVersions(TlsVersion.TLS_1_1)
+                        .tlsVersions(TlsVersion.TLS_1_2)
+                        .build()
+                val specs: MutableList<ConnectionSpec> = ArrayList()
+                specs.add(cs)
+                specs.add(ConnectionSpec.COMPATIBLE_TLS)
+                specs.add(ConnectionSpec.CLEARTEXT)
+                connectionSpecs(specs)
+            }
+        } catch (exc: Exception) {
+            Log.e("OkHttpTLSCompat", "Error while setting TLS 1.2", exc)
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
index eac5f03c..0ea51fd4 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
@@ -1,6 +1,5 @@
 package pl.szczodrzynski.edziennik
 
-import android.app.Activity
 import android.app.ActivityManager
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -9,7 +8,6 @@ import android.content.IntentFilter
 import android.content.pm.PackageManager
 import android.graphics.BitmapFactory
 import android.graphics.drawable.BitmapDrawable
-import android.os.AsyncTask
 import android.os.Build
 import android.os.Bundle
 import android.os.Environment
@@ -41,15 +39,16 @@ 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.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.data.api.events.*
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing
-import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata.*
 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.changelog.ChangelogDialog
 import pl.szczodrzynski.edziennik.ui.dialogs.settings.ProfileRemoveDialog
 import pl.szczodrzynski.edziennik.ui.dialogs.sync.SyncViewListDialog
@@ -269,12 +268,21 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        d(TAG, "Activity created")
+
         setTheme(Themes.appTheme)
 
         app.config.ui.language?.let {
             setLanguage(it)
         }
 
+        if (App.profileId == 0) {
+            onProfileListEmptyEvent(ProfileListEmptyEvent())
+            return
+        }
+
+        d(TAG, "Profile is valid, inflating views")
+
         setContentView(b.root)
 
         Log.d(TAG, Signing.appPassword)
@@ -344,8 +352,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                 setAccountHeaderBackground(app.config.ui.headerBackground)
 
                 drawerProfileListEmptyListener = {
-                    app.config.loginFinished = false
-                    profileListEmptyListener()
+                    onProfileListEmptyEvent(ProfileListEmptyEvent())
                 }
                 drawerItemSelectedListener = { id, position, drawerItem ->
                     loadTarget(id)
@@ -374,30 +381,19 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
 
         navTarget = navTargetList[0]
 
-        var profileListEmpty = drawer.profileListEmpty
-
         if (savedInstanceState != null) {
             intent?.putExtras(savedInstanceState)
             savedInstanceState.clear()
         }
 
-        if (!profileListEmpty) {
-            handleIntent(intent?.extras)
-        }
         app.db.profileDao().all.observe(this, Observer { profiles ->
             drawer.setProfileList(profiles.filter { it.id >= 0 }.toMutableList())
-            if (profileListEmpty) {
-                profileListEmpty = false
-                handleIntent(intent?.extras)
-            }
-            else if (app.profile != null) {
-                drawer.currentProfile = app.profile.id
-            }
+            drawer.currentProfile = App.profileId
         })
 
-        // if null, getAllFull will load a profile and update drawerItems
-        if (app.profile != null)
-            setDrawerItems()
+        setDrawerItems()
+
+        handleIntent(intent?.extras)
 
         app.db.metadataDao().unreadCounts.observe(this, Observer { unreadCounters ->
             unreadCounters.map {
@@ -417,6 +413,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         isStoragePermissionGranted()
 
         SyncWorker.scheduleNext(app)
+        UpdateWorker.scheduleNext(app)
 
         // APP BACKGROUND
         if (app.config.ui.appBackground != null) {
@@ -521,13 +518,10 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         }
     }
 
-    var profileListEmptyListener = {
-        startActivityForResult(Intent(this, LoginActivity::class.java), REQUEST_LOGIN_ACTIVITY)
-    }
     private var profileSettingClickListener = { id: Int, view: View? ->
         when (id) {
             DRAWER_PROFILE_ADD_NEW -> {
-                profileListEmptyListener()
+                startActivityForResult(Intent(this, LoginActivity::class.java), REQUEST_LOGIN_ACTIVITY)
             }
             DRAWER_PROFILE_SYNC_ALL -> {
                 EdziennikTask.sync().enqueue(this)
@@ -587,6 +581,13 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         }
     }
     @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onProfileListEmptyEvent(event: ProfileListEmptyEvent) {
+        d(TAG, "Profile list is empty. Launch LoginActivity.")
+        app.config.loginFinished = false
+        startActivity(Intent(this, LoginActivity::class.java))
+        finish()
+    }
+    @Subscribe(threadMode = ThreadMode.MAIN)
     fun onApiTaskProgressEvent(event: ApiTaskProgressEvent) {
         if (event.profileId == App.profileId) {
             navView.toolbar.apply {
@@ -630,7 +631,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
     @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
     fun onAppManagerDetectedEvent(event: AppManagerDetectedEvent) {
         EventBus.getDefault().removeStickyEvent(event)
-        if (app.appConfig.dontShowAppManagerDialog)
+        if (app.config.sync.dontShowAppManagerDialog)
             return
         MaterialAlertDialogBuilder(this)
                 .setTitle(R.string.app_manager_dialog_title)
@@ -652,8 +653,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                     }
                 }
                 .setNeutralButton(R.string.dont_ask_again) { dialog, which ->
-                    app.appConfig.dontShowAppManagerDialog = true
-                    app.saveConfig("dontShowAppManagerDialog")
+                    app.config.sync.dontShowAppManagerDialog = true
                 }
                 .setCancelable(false)
                 .show()
@@ -698,7 +698,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         if (extras?.containsKey("reloadProfileId") == true) {
             val reloadProfileId = extras.getInt("reloadProfileId", -1)
             extras.remove("reloadProfileId")
-            if (reloadProfileId == -1 || (app.profile != null && app.profile.id == reloadProfileId)) {
+            if (reloadProfileId == -1 || app.profile.id == reloadProfileId) {
                 reloadTarget()
                 return
             }
@@ -728,9 +728,9 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         }
 
         when {
-            app.profile == null || app.profile.id == -1 -> {
+            app.profile.id == 0 -> {
                 if (intentProfileId == -1)
-                    intentProfileId = app.appSharedPrefs.getInt("current_profile_id", 1)
+                    intentProfileId = app.config.lastProfileId
                 loadProfile(intentProfileId, intentTargetId, extras)
             }
             intentProfileId != -1 -> {
@@ -769,7 +769,16 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         startActivity(intent)
     }
 
+    override fun onStart() {
+        d(TAG, "Activity started")
+        super.onStart()
+    }
+    override fun onStop() {
+        d(TAG, "Activity stopped")
+        super.onStop()
+    }
     override fun onResume() {
+        d(TAG, "Activity resumed")
         val filter = IntentFilter()
         filter.addAction(Intent.ACTION_MAIN)
         registerReceiver(intentReceiver, filter)
@@ -777,10 +786,15 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         super.onResume()
     }
     override fun onPause() {
+        d(TAG, "Activity paused")
         unregisterReceiver(intentReceiver)
         EventBus.getDefault().unregister(this)
         super.onPause()
     }
+    override fun onDestroy() {
+        d(TAG, "Activity destroyed")
+        super.onDestroy()
+    }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
@@ -794,15 +808,10 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if (requestCode == REQUEST_LOGIN_ACTIVITY) {
-            if (resultCode == Activity.RESULT_CANCELED && false) {
+            if (!app.config.loginFinished)
                 finish()
-            }
             else {
-                if (!app.config.loginFinished)
-                    finish()
-                else {
-                    handleIntent(data?.extras)
-                }
+                handleIntent(data?.extras)
             }
         }
     }
@@ -823,34 +832,23 @@ 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) {
-        //d("NavDebug", "loadProfile(id = $id, drawerSelection = $drawerSelection)")
-        if (app.profile != null && App.profileId == id) {
+        if (App.profileId == id) {
             drawer.currentProfile = app.profile.id
             loadTarget(drawerSelection, arguments)
             return
         }
-        AsyncTask.execute {
-            app.profileLoadById(id)
+        app.profileLoad(id) {
             MessagesFragment.pageSelection = -1
             MessagesListFragment.tapPositions = intArrayOf(RecyclerView.NO_POSITION, RecyclerView.NO_POSITION)
             MessagesListFragment.topPositions = intArrayOf(RecyclerView.NO_POSITION, RecyclerView.NO_POSITION)
             MessagesListFragment.bottomPositions = intArrayOf(RecyclerView.NO_POSITION, RecyclerView.NO_POSITION)
 
-            this.runOnUiThread {
-                if (app.profile == null) {
-                    if (app.config.loginFinished) {
-                        // this shouldn't run
-                        profileListEmptyListener()
-                    }
-                } else {
-                    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.profile.id
-                    loadTarget(drawerSelection, arguments)
-                }
-            }
+            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)
         }
     }
     fun loadTarget(id: Int, arguments: Bundle? = null) {
@@ -995,7 +993,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
      * that something has changed in the bottom sheet.
      */
     fun gainAttention() {
-        if (app.config.ui.bottomSheetOpened || true)
+        if (app.config.ui.bottomSheetOpened)
             return
         b.navView.postDelayed({
             navView.gainAttentionOnBottomBar()
@@ -1044,12 +1042,11 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
     }
 
     fun setDrawerItems() {
-        d("NavDebug", "setDrawerItems() app.profile = ${app.profile ?: "null"}")
+        d("NavDebug", "setDrawerItems() app.profile = ${app.profile}")
         val drawerItems = arrayListOf<IDrawerItem<*>>()
         val drawerProfiles = arrayListOf<ProfileSettingDrawerItem>()
 
-        val supportedFragments = if (app.profile == null) arrayListOf<Int>()
-        else app.profile.supportedFragments
+        val supportedFragments = app.profile.supportedFragments
 
         targetPopToHomeList.clear()
 
@@ -1113,7 +1110,7 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
     private var targetHomeId: Int = -1
     override fun onBackPressed() {
         if (!b.navView.onBackPressed()) {
-            if (App.getConfig().ui.openDrawerOnBackPressed) {
+            if (App.config.ui.openDrawerOnBackPressed) {
                 b.navView.drawer.toggle()
             } else {
                 navigateUp()
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/Notifier.java b/app/src/main/java/pl/szczodrzynski/edziennik/Notifier.java
deleted file mode 100644
index 0b878b53..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/Notifier.java
+++ /dev/null
@@ -1,350 +0,0 @@
-package pl.szczodrzynski.edziennik;
-
-import android.app.IntentService;
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import android.util.Log;
-
-import androidx.core.app.NotificationCompat;
-import androidx.core.content.ContextCompat;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import pl.szczodrzynski.edziennik.receivers.BootReceiver;
-import pl.szczodrzynski.edziennik.utils.models.Date;
-import pl.szczodrzynski.edziennik.utils.models.Time;
-
-import static androidx.core.app.NotificationCompat.PRIORITY_DEFAULT;
-import static androidx.core.app.NotificationCompat.PRIORITY_MAX;
-
-public class Notifier {
-
-    private static final String TAG = "Notifier";
-    public static final int ID_GET_DATA = 1337000;
-    public static final int ID_GET_DATA_ERROR = 1337001;
-    private static String CHANNEL_GET_DATA_NAME;
-    private static String CHANNEL_GET_DATA_DESC;
-    private static final String GROUP_KEY_GET_DATA = "pl.szczodrzynski.edziennik.GET_DATA";
-
-    public static final int ID_NOTIFICATIONS = 1337002;
-    public static String CHANNEL_NOTIFICATIONS_NAME;
-    public static String CHANNEL_NOTIFICATIONS_DESC;
-    public static final String GROUP_KEY_NOTIFICATIONS = "pl.szczodrzynski.edziennik.NOTIFICATIONS";
-
-    public static final int ID_NOTIFICATIONS_QUIET = 1337002;
-    public static String CHANNEL_NOTIFICATIONS_QUIET_NAME;
-    public static String CHANNEL_NOTIFICATIONS_QUIET_DESC;
-    public static final String GROUP_KEY_NOTIFICATIONS_QUIET = "pl.szczodrzynski.edziennik.NOTIFICATIONS_QUIET";
-
-    private static final int ID_UPDATES = 1337003;
-    private static String CHANNEL_UPDATES_NAME;
-    private static String CHANNEL_UPDATES_DESC;
-    private static final String GROUP_KEY_UPDATES = "pl.szczodrzynski.edziennik.UPDATES";
-
-    private App app;
-    public NotificationManager notificationManager;
-    private NotificationCompat.Builder getDataNotificationBuilder;
-    public int notificationColor;
-
-    Notifier(App _app) {
-        this.app = _app;
-
-        CHANNEL_GET_DATA_NAME = app.getString(R.string.notification_channel_get_data_name);
-        CHANNEL_GET_DATA_DESC = app.getString(R.string.notification_channel_get_data_desc);
-        CHANNEL_NOTIFICATIONS_NAME = app.getString(R.string.notification_channel_notifications_name);
-        CHANNEL_NOTIFICATIONS_DESC = app.getString(R.string.notification_channel_notifications_desc);
-        CHANNEL_NOTIFICATIONS_QUIET_NAME = app.getString(R.string.notification_channel_notifications_quiet_name);
-        CHANNEL_NOTIFICATIONS_QUIET_DESC = app.getString(R.string.notification_channel_notifications_quiet_desc);
-        CHANNEL_UPDATES_NAME = app.getString(R.string.notification_channel_updates_name);
-        CHANNEL_UPDATES_DESC = app.getString(R.string.notification_channel_updates_desc);
-
-        notificationColor = ContextCompat.getColor(app.getContext(), R.color.colorPrimary);
-        notificationManager = (NotificationManager) app.getSystemService(Context.NOTIFICATION_SERVICE);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationChannel channelGetData = new NotificationChannel(GROUP_KEY_GET_DATA, CHANNEL_GET_DATA_NAME, NotificationManager.IMPORTANCE_MIN);
-            channelGetData.setDescription(CHANNEL_GET_DATA_DESC);
-            notificationManager.createNotificationChannel(channelGetData);
-
-            NotificationChannel channelNotifications = new NotificationChannel(GROUP_KEY_NOTIFICATIONS, CHANNEL_NOTIFICATIONS_NAME, NotificationManager.IMPORTANCE_HIGH);
-            channelNotifications.setDescription(CHANNEL_NOTIFICATIONS_DESC);
-            channelNotifications.enableLights(true);
-            channelNotifications.setLightColor(notificationColor);
-            notificationManager.createNotificationChannel(channelNotifications);
-
-            NotificationChannel channelNotificationsQuiet = new NotificationChannel(GROUP_KEY_NOTIFICATIONS_QUIET, CHANNEL_NOTIFICATIONS_QUIET_NAME, NotificationManager.IMPORTANCE_DEFAULT);
-            channelNotificationsQuiet.setDescription(CHANNEL_NOTIFICATIONS_QUIET_DESC);
-            channelNotificationsQuiet.setSound(null, null);
-            channelNotificationsQuiet.enableVibration(false);
-            notificationManager.createNotificationChannel(channelNotificationsQuiet);
-
-            NotificationChannel channelUpdates = new NotificationChannel(GROUP_KEY_UPDATES, CHANNEL_UPDATES_NAME, NotificationManager.IMPORTANCE_HIGH);
-            channelUpdates.setDescription(CHANNEL_UPDATES_DESC);
-            notificationManager.createNotificationChannel(channelUpdates);
-        }
-    }
-
-    public boolean shouldBeQuiet() {
-        long now = Time.getNow().getInMillis();
-        long start = app.config.getSync().getQuietHoursStart();
-        long end = app.config.getSync().getQuietHoursEnd();
-        if (start > end) {
-            end += 1000 * 60 * 60 * 24;
-            //Log.d(TAG, "Night passing");
-        }
-        if (start > now) {
-            now += 1000 * 60 * 60 * 24;
-            //Log.d(TAG, "Now is smaller");
-        }
-        //Log.d(TAG, "Start is "+start+", now is "+now+", end is "+end);
-        return start > 0 && now >= start && now <= end;
-    }
-
-    public int getNotificationDefaults() {
-        return (shouldBeQuiet() ? 0 : Notification.DEFAULT_ALL);
-    }
-    public String getNotificationGroup() {
-        return shouldBeQuiet() ? GROUP_KEY_NOTIFICATIONS_QUIET : GROUP_KEY_NOTIFICATIONS;
-    }
-    public int getNotificationPriority() {
-        return shouldBeQuiet() ? PRIORITY_DEFAULT : PRIORITY_MAX;
-    }
-
-    /*    _____        _           _____      _
-         |  __ \      | |         / ____|    | |
-         | |  | | __ _| |_ __ _  | |  __  ___| |_
-         | |  | |/ _` | __/ _` | | | |_ |/ _ \ __|
-         | |__| | (_| | || (_| | | |__| |  __/ |_
-         |_____/ \__,_|\__\__,_|  \_____|\___|\_*/
-    public Notification notificationGetDataShow(int maxProgress) {
-        /*Intent notificationIntent = new Intent(app.getContext(), SyncService.class);
-        notificationIntent.setAction(ACTION_CANCEL);
-        PendingIntent pendingIntent = PendingIntent.getService(app.getContext(), 0,
-                notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT);*/
-
-        getDataNotificationBuilder = new NotificationCompat.Builder(app, GROUP_KEY_GET_DATA)
-                .setSmallIcon(android.R.drawable.stat_sys_download)
-                .setColor(notificationColor)
-                .setContentTitle(app.getString(R.string.notification_get_data_title))
-                .setContentText(app.getString(R.string.notification_get_data_text))
-                //.addAction(R.drawable.ic_notification, app.getString(R.string.notification_get_data_cancel), pendingIntent)
-                //.setGroup(GROUP_KEY_GET_DATA)
-                .setOngoing(true)
-                .setProgress(maxProgress, 0, false)
-                .setTicker(app.getString(R.string.notification_get_data_summary))
-                .setPriority(NotificationCompat.PRIORITY_LOW);
-        return getDataNotificationBuilder.build();
-    }
-
-    public Notification notificationGetDataProgress(int progress, int maxProgress) {
-        getDataNotificationBuilder.setProgress(maxProgress, progress, false);
-        return getDataNotificationBuilder.build();
-    }
-
-    public Notification notificationGetDataAction(int stringResId) {
-        getDataNotificationBuilder.setContentTitle(app.getString(R.string.sync_action_format, app.getString(stringResId)));
-        return getDataNotificationBuilder.build();
-    }
-
-    public Notification notificationGetDataProfile(String profileName) {
-        getDataNotificationBuilder.setContentText(profileName);
-        return getDataNotificationBuilder.build();
-    }
-
-    public Notification notificationGetDataError(String profileName, String error, int failedProfileId) {
-        Intent notificationIntent = new Intent(app.getContext(), Notifier.GetDataRetryService.class);
-        notificationIntent.putExtra("failedProfileId", failedProfileId);
-        PendingIntent pendingIntent = PendingIntent.getService(app.getContext(), 0,
-                notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT);
-
-        getDataNotificationBuilder.mActions.clear();
-        /*try {
-            //Use reflection clean up old actions
-            Field f = getDataNotificationBuilder.getClass().getDeclaredField("mActions");
-            f.setAccessible(true);
-            f.set(getDataNotificationBuilder, new ArrayList<NotificationCompat.Action>());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }*/
-
-        getDataNotificationBuilder.setProgress(0, 0, false)
-                .setTicker(app.getString(R.string.notification_get_data_error_summary))
-                .setSmallIcon(android.R.drawable.stat_sys_warning)
-                .addAction(R.drawable.ic_notification, app.getString(R.string.notification_get_data_once_again), pendingIntent)
-                .setContentTitle(app.getString(R.string.notification_get_data_error_title, profileName))
-                .setContentText(error)
-                .setStyle(new NotificationCompat.BigTextStyle().bigText(error))
-                .setOngoing(false);
-        return getDataNotificationBuilder.build();
-    }
-
-    public void notificationPost(int id, Notification notification) {
-        notificationManager.notify(id, notification);
-    }
-
-    public void notificationCancel(int id) {
-        notificationManager.cancel(id);
-    }
-
-    //public void notificationGetDataHide() {
-     //   notificationManager.cancel(ID_GET_DATA);
-   // }
-
-    public static class GetDataRetryService extends IntentService {
-        private static final String TAG = "Notifier/GetDataRetry";
-
-        public GetDataRetryService() {
-            super(Notifier.GetDataRetryService.class.getSimpleName());
-        }
-
-        @Override
-        protected void onHandleIntent(Intent intent) {
-
-
-        }
-    }
-
-    /*    _   _       _   _  __ _           _   _
-         | \ | |     | | (_)/ _(_)         | | (_)
-         |  \| | ___ | |_ _| |_ _  ___ __ _| |_ _  ___  _ __
-         | . ` |/ _ \| __| |  _| |/ __/ _` | __| |/ _ \| '_ \
-         | |\  | (_) | |_| | | | | (_| (_| | |_| | (_) | | | |
-         |_| \_|\___/ \__|_|_| |_|\___\__,_|\__|_|\___/|_| |*/
-    public void add(pl.szczodrzynski.edziennik.utils.models.Notification notification) {
-        app.appConfig.notifications.add(notification);
-    }
-
-    public void postAll() {
-        Collections.sort(app.appConfig.notifications, (o1, o2) -> (o2.addedDate - o1.addedDate > 0) ? 1 : (o2.addedDate - o1.addedDate < 0) ? -1 : 0);
-
-        if (app.appConfig.notifications.size() > 40) {
-            app.appConfig.notifications.subList(40, app.appConfig.notifications.size() - 1).clear();
-        }
-
-        int unreadCount = 0;
-        List<pl.szczodrzynski.edziennik.utils.models.Notification> notificationList = new ArrayList<>();
-        for (pl.szczodrzynski.edziennik.utils.models.Notification notification: app.appConfig.notifications) {
-            if (!notification.notified) {
-                notification.seen = false;
-                notification.notified = true;
-                unreadCount++;
-                if (notificationList.size() < 10) {
-                    notificationList.add(notification);
-                }
-            }
-            else {
-                notification.seen = true;
-            }
-        }
-
-        for (pl.szczodrzynski.edziennik.utils.models.Notification notification: notificationList) {
-            Intent intent = new Intent(app, MainActivity.class);
-            notification.fillIntent(intent);
-            PendingIntent pendingIntent = PendingIntent.getActivity(app, notification.id, intent, 0);
-            NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(app, getNotificationGroup())
-                    // title, text, type, date
-                    .setContentTitle(notification.title)
-                    .setContentText(notification.text)
-                    .setSubText(pl.szczodrzynski.edziennik.utils.models.Notification.stringType(app, notification.type))
-                    .setWhen(notification.addedDate)
-                    .setTicker(app.getString(R.string.notification_ticker_format, pl.szczodrzynski.edziennik.utils.models.Notification.stringType(app, notification.type)))
-                    // icon, color, lights, priority
-                    .setSmallIcon(R.drawable.ic_notification)
-                    .setColor(notificationColor)
-                    .setLights(0xFF00FFFF, 2000, 2000)
-                    .setPriority(getNotificationPriority())
-                    // channel, group, style
-                    .setChannelId(getNotificationGroup())
-                    .setGroup(getNotificationGroup())
-                    .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY)
-                    .setStyle(new NotificationCompat.BigTextStyle().bigText(notification.text))
-                    // intent, auto cancel
-                    .setContentIntent(pendingIntent)
-                    .setAutoCancel(true);
-            if (!shouldBeQuiet()) {
-                notificationBuilder.setDefaults(getNotificationDefaults());
-            }
-            notificationManager.notify(notification.id, notificationBuilder.build());
-        }
-
-        if (notificationList.size() > 0 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            Intent intent = new Intent(app, MainActivity.class);
-            intent.setAction("android.intent.action.MAIN");
-            intent.putExtra("fragmentId", MainActivity.DRAWER_ITEM_NOTIFICATIONS);
-            PendingIntent pendingIntent = PendingIntent.getActivity(app, ID_NOTIFICATIONS,
-                    intent, 0);
-
-            NotificationCompat.Builder groupBuilder =
-                    new NotificationCompat.Builder(app, getNotificationGroup())
-                            .setSmallIcon(R.drawable.ic_notification)
-                            .setColor(notificationColor)
-                            .setContentTitle(app.getString(R.string.notification_new_notification_title_format, unreadCount))
-                            .setGroupSummary(true)
-                            .setAutoCancel(true)
-                            .setChannelId(getNotificationGroup())
-                            .setGroup(getNotificationGroup())
-                            .setLights(0xFF00FFFF, 2000, 2000)
-                            .setPriority(getNotificationPriority())
-                            .setContentIntent(pendingIntent)
-                            .setStyle(new NotificationCompat.BigTextStyle());
-            if (!shouldBeQuiet()) {
-                groupBuilder.setDefaults(getNotificationDefaults());
-            }
-            notificationManager.notify(ID_NOTIFICATIONS, groupBuilder.build());
-        }
-    }
-
-    /*    _    _           _       _
-         | |  | |         | |     | |
-         | |  | |_ __   __| | __ _| |_ ___  ___
-         | |  | | '_ \ / _` |/ _` | __/ _ \/ __|
-         | |__| | |_) | (_| | (_| | ||  __/\__ \
-          \____/| .__/ \__,_|\__,_|\__\___||___/
-                | |
-                |*/
-    public void notificationUpdatesShow(String updateVersion, String updateUrl, String updateFilename, boolean updateDirect) {
-        if (!app.config.getSync().getNotifyAboutUpdates())
-            return;
-        Intent notificationIntent = new Intent(app.getContext(), BootReceiver.NotificationActionService.class)
-                .putExtra("update_version", updateVersion)
-                .putExtra("update_url", updateUrl)
-                .putExtra("update_filename", updateFilename)
-                .putExtra("update_direct", updateDirect);
-
-        PendingIntent pendingIntent = PendingIntent.getService(app.getContext(), 0,
-                notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT);
-
-        NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(app, GROUP_KEY_UPDATES)
-                .setSmallIcon(android.R.drawable.stat_sys_download_done)
-                .setColor(notificationColor)
-                .setContentTitle(app.getString(R.string.notification_updates_title))
-                .setContentText(app.getString(R.string.notification_updates_text, updateVersion))
-                .setLights(0xFF00FFFF, 2000, 2000)
-                .setContentIntent(pendingIntent)
-                .setTicker(app.getString(R.string.notification_updates_summary))
-                .setPriority(PRIORITY_MAX)
-                .setAutoCancel(true);
-        if (!shouldBeQuiet()) {
-            notificationBuilder.setDefaults(getNotificationDefaults());
-        }
-        notificationManager.notify(ID_UPDATES, notificationBuilder.build());
-    }
-
-    public void notificationUpdatesHide() {
-        if (!app.config.getSync().getNotifyAboutUpdates())
-            return;
-        notificationManager.cancel(ID_UPDATES);
-    }
-
-    public void dump() {
-        for (pl.szczodrzynski.edziennik.utils.models.Notification notification: app.appConfig.notifications) {
-            Log.d(TAG, "Profile"+notification.profileId+" Notification from "+ Date.fromMillis(notification.addedDate).getFormattedString()+" "+ Time.fromMillis(notification.addedDate).getStringHMS()+" - "+notification.text);
-        }
-    }
-}
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 ac8831e3..edc661ec 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/config/Config.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/Config.kt
@@ -16,12 +16,13 @@ import pl.szczodrzynski.edziennik.config.utils.ConfigMigration
 import pl.szczodrzynski.edziennik.config.utils.get
 import pl.szczodrzynski.edziennik.config.utils.set
 import pl.szczodrzynski.edziennik.config.utils.toHashMap
+import pl.szczodrzynski.edziennik.data.api.szkolny.response.Update
 import pl.szczodrzynski.edziennik.data.db.AppDb
 import kotlin.coroutines.CoroutineContext
 
 class Config(val db: AppDb) : CoroutineScope, AbstractConfig {
     companion object {
-        const val DATA_VERSION = 2
+        const val DATA_VERSION = 10
     }
 
     private val job = Job()
@@ -45,6 +46,20 @@ class Config(val db: AppDb) : CoroutineScope, AbstractConfig {
         get() { mHash = mHash ?: values.get("hash", ""); return mHash ?: "" }
         set(value) { set("hash", value); mHash = value }
 
+    private var mLastProfileId: Int? = null
+    var lastProfileId: Int
+        get() { mLastProfileId = mLastProfileId ?: values.get("lastProfileId", 0); return mLastProfileId ?: 0 }
+        set(value) { set("lastProfileId", value); mLastProfileId = value }
+
+    private var mUpdatesChannel: String? = null
+    var updatesChannel: String
+        get() { mUpdatesChannel = mUpdatesChannel ?: values.get("updatesChannel", "release"); return mUpdatesChannel ?: "release" }
+        set(value) { set("updatesChannel", value); mUpdatesChannel = value }
+    private var mUpdate: Update? = null
+    var update: Update?
+        get() { mUpdate = mUpdate ?: values.get("update", null as Update?); return mUpdate ?: null as Update? }
+        set(value) { set("update", value); mUpdate = value }
+
     private var mAppVersion: Int? = null
     var appVersion: Int
         get() { mAppVersion = mAppVersion ?: values.get("appVersion", BuildConfig.VERSION_CODE); return mAppVersion ?: BuildConfig.VERSION_CODE }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigGrades.kt
index 130d8129..649bbed7 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigGrades.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigGrades.kt
@@ -17,6 +17,6 @@ class ConfigGrades(private val config: Config) {
 
     private var mOrderBy: Int? = null
     var orderBy: Int
-        get() { mOrderBy = mOrderBy ?: config.values.get("gradesOrderBy", 0); return mOrderBy ?: 0 }
+        get() { mOrderBy = mOrderBy ?: config.values.get("gradesOrderBy", 0); return mOrderBy ?: ORDER_BY_DATE_DESC }
         set(value) { config.set("gradesOrderBy", value); mOrderBy = value }
 }
\ No newline at end of file
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 01810824..808b7893 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigSync.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigSync.kt
@@ -9,6 +9,11 @@ import pl.szczodrzynski.edziennik.config.utils.getIntList
 import pl.szczodrzynski.edziennik.config.utils.set
 
 class ConfigSync(private val config: Config) {
+    private var mDontShowAppManagerDialog: Boolean? = null
+    var dontShowAppManagerDialog: Boolean
+        get() { mDontShowAppManagerDialog = mDontShowAppManagerDialog ?: config.values.get("dontShowAppManagerDialog", false); return mDontShowAppManagerDialog ?: false }
+        set(value) { config.set("dontShowAppManagerDialog", value); mDontShowAppManagerDialog = value }
+
     private var mSyncEnabled: Boolean? = null
     var enabled: Boolean
         get() { mSyncEnabled = mSyncEnabled ?: config.values.get("syncEnabled", true); return mSyncEnabled ?: true }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigUI.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigUI.kt
index 2c43bb00..bd876c4c 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigUI.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigUI.kt
@@ -45,11 +45,6 @@ class ConfigUI(private val config: Config) {
         get() { mOpenDrawerOnBackPressed = mOpenDrawerOnBackPressed ?: config.values.get("openDrawerOnBackPressed", false); return mOpenDrawerOnBackPressed ?: false }
         set(value) { config.set("openDrawerOnBackPressed", value); mOpenDrawerOnBackPressed = value }
 
-    private var mAgendaViewType: Int? = null
-    var agendaViewType: Int
-        get() { mAgendaViewType = mAgendaViewType ?: config.values.get("agendaViewType", 0); return mAgendaViewType ?: 0 }
-        set(value) { config.set("agendaViewType", value); mAgendaViewType = value }
-
     private var mHomeCards: List<HomeCardModel>? = null
     var homeCards: List<HomeCardModel>
         get() { mHomeCards = mHomeCards ?: config.values.get("homeCards", listOf(), HomeCardModel::class.java); return mHomeCards ?: listOf() }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfig.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfig.kt
index 3dd29361..3e9ef09a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfig.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfig.kt
@@ -9,6 +9,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import pl.szczodrzynski.edziennik.config.db.ConfigEntry
+import pl.szczodrzynski.edziennik.config.utils.ProfileConfigMigration
 import pl.szczodrzynski.edziennik.config.utils.get
 import pl.szczodrzynski.edziennik.config.utils.set
 import pl.szczodrzynski.edziennik.config.utils.toHashMap
@@ -27,6 +28,7 @@ class ProfileConfig(val db: AppDb, val profileId: Int, rawEntries: List<ConfigEn
     val values: HashMap<String, String?> = hashMapOf()
 
     val grades by lazy { ProfileConfigGrades(this) }
+    val ui by lazy { ProfileConfigUI(this) }
     /*
     val sync by lazy { ConfigSync(this) }
     val timetable by lazy { ConfigTimetable(this) }
@@ -44,8 +46,8 @@ class ProfileConfig(val db: AppDb, val profileId: Int, rawEntries: List<ConfigEn
 
     init {
         rawEntries.toHashMap(profileId, values)
-        /*if (dataVersion < DATA_VERSION)
-            ProfileConfigMigration(this)*/
+        if (dataVersion < DATA_VERSION)
+            ProfileConfigMigration(this)
     }
 
     override fun set(key: String, value: String?) {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfigUI.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfigUI.kt
new file mode 100644
index 00000000..00904447
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfigUI.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-1-19.
+ */
+
+package pl.szczodrzynski.edziennik.config
+
+import pl.szczodrzynski.edziennik.config.utils.get
+import pl.szczodrzynski.edziennik.config.utils.set
+import pl.szczodrzynski.edziennik.data.db.entity.Profile.Companion.AGENDA_DEFAULT
+
+class ProfileConfigUI(private val config: ProfileConfig) {
+    private var mAgendaViewType: Int? = null
+    var agendaViewType: Int
+        get() { mAgendaViewType = mAgendaViewType ?: config.values.get("agendaViewType", 0); return mAgendaViewType ?: AGENDA_DEFAULT }
+        set(value) { config.set("agendaViewType", value); mAgendaViewType = value }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/db/ConfigDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/db/ConfigDao.kt
index d4665910..f55df857 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/config/db/ConfigDao.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/db/ConfigDao.kt
@@ -22,4 +22,7 @@ interface ConfigDao {
 
     @Query("SELECT * FROM config WHERE profileId = :profileId")
     fun getAllNow(profileId: Int): List<ConfigEntry>
+
+    @Query("DELETE FROM config WHERE profileId = :profileId")
+    fun clear(profileId: Int)
 }
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/AppConfigMigrationV3.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/AppConfigMigrationV3.kt
new file mode 100644
index 00000000..6c2fa19c
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/AppConfigMigrationV3.kt
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-1-19.
+ */
+
+package pl.szczodrzynski.edziennik.config.utils
+
+import android.content.SharedPreferences
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import pl.szczodrzynski.edziennik.BuildConfig
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.config.Config
+import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_LIBRUS
+import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_MOBIDZIENNIK
+import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_VULCAN
+import pl.szczodrzynski.edziennik.utils.models.Time
+
+class AppConfigMigrationV3(p: SharedPreferences, config: Config) {
+    init { config.apply {
+        val s = "app.appConfig"
+        if (dataVersion < 1) {
+            ui.theme = p.getString("$s.appTheme", null)?.toIntOrNull() ?: 1
+            sync.enabled = p.getString("$s.registerSyncEnabled", null)?.toBoolean() ?: true
+            sync.interval = p.getString("$s.registerSyncInterval", null)?.toIntOrNull() ?: 3600
+            val oldButtons = p.getString("$s.miniDrawerButtonIds", null)?.let { str ->
+                str.replace("[\\[\\]]*".toRegex(), "")
+                        .split(",\\s?".toRegex())
+                        .mapNotNull { it.toIntOrNull() }
+            }
+            ui.miniMenuButtons = oldButtons ?: listOf(
+                    MainActivity.DRAWER_ITEM_HOME,
+                    MainActivity.DRAWER_ITEM_TIMETABLE,
+                    MainActivity.DRAWER_ITEM_AGENDA,
+                    MainActivity.DRAWER_ITEM_GRADES,
+                    MainActivity.DRAWER_ITEM_MESSAGES,
+                    MainActivity.DRAWER_ITEM_HOMEWORK,
+                    MainActivity.DRAWER_ITEM_SETTINGS
+            )
+            dataVersion = 1
+        }
+        if (dataVersion < 2) {
+            devModePassword = p.getString("$s.devModePassword", null).fix()
+            sync.tokenApp = p.getString("$s.fcmToken", null).fix()
+            timetable.bellSyncMultiplier = p.getString("$s.bellSyncMultiplier", null)?.toIntOrNull() ?: 0
+            sync.quietHoursStart = p.getString("$s.quietHoursStart", null)?.toLongOrNull() ?: 0
+            appRateSnackbarTime = p.getString("$s.appRateSnackbarTime", null)?.toLongOrNull() ?: 0
+            sync.quietHoursEnd = p.getString("$s.quietHoursEnd", null)?.toLongOrNull() ?: 0
+            timetable.countInSeconds = p.getString("$s.countInSeconds", null)?.toBoolean() ?: false
+            ui.headerBackground = p.getString("$s.headerBackground", null).fix()
+            ui.appBackground = p.getString("$s.appBackground", null).fix()
+            ui.language = p.getString("$s.language", null).fix()
+            appVersion = p.getString("$s.lastAppVersion", null)?.toIntOrNull() ?: BuildConfig.VERSION_CODE
+            appInstalledTime = p.getString("$s.appInstalledTime", null)?.toLongOrNull() ?: 0
+            grades.orderBy = p.getString("$s.gradesOrderBy", null)?.toIntOrNull() ?: 0
+            sync.quietDuringLessons = p.getString("$s.quietDuringLessons", null)?.toBoolean() ?: false
+            ui.miniMenuVisible = p.getString("$s.miniDrawerVisible", null)?.toBoolean() ?: false
+            loginFinished = p.getString("$s.loginFinished", null)?.toBoolean() ?: false
+            sync.onlyWifi = p.getString("$s.registerSyncOnlyWifi", null)?.toBoolean() ?: false
+            sync.notifyAboutUpdates = p.getString("$s.notifyAboutUpdates", null)?.toBoolean() ?: true
+            timetable.bellSyncDiff = p.getString("$s.bellSyncDiff", null)?.let { Gson().fromJson(it, Time::class.java) }
+
+            sync.tokenMobidziennikList = listOf()
+            sync.tokenVulcanList = listOf()
+            sync.tokenLibrusList = listOf()
+            val tokens = p.getString("$s.fcmTokens", null)?.let { Gson().fromJson<Map<Int, Pair<String, List<Int>>>>(it, object: TypeToken<Map<Int, Pair<String, List<Int>>>>(){}.type) }
+            tokens?.forEach {
+                val token = it.value.first
+                when (it.key) {
+                    LOGIN_TYPE_MOBIDZIENNIK -> sync.tokenMobidziennik = token
+                    LOGIN_TYPE_VULCAN -> sync.tokenVulcan = token
+                    LOGIN_TYPE_LIBRUS -> sync.tokenLibrus = token
+                }
+            }
+            dataVersion = 2
+        }
+    }}
+
+    private fun String?.fix(): String? {
+        return this?.replace("\"", "")?.let { if (it == "null") null else it }
+    }
+}
\ No newline at end of file
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 aec5ebee..9124542f 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
@@ -37,6 +37,9 @@ fun AbstractConfig.set(key: String, value: JsonElement?) {
 fun AbstractConfig.set(key: String, value: List<Any>?) {
     set(key, value?.let { gson.toJson(it) })
 }
+fun AbstractConfig.set(key: String, value: Any?) {
+    set(key, value?.let { gson.toJson(it) })
+}
 fun AbstractConfig.setStringList(key: String, value: List<String>?) {
     set(key, value?.let { gson.toJson(it) })
 }
@@ -74,6 +77,9 @@ fun HashMap<String, String?>.get(key: String, default: JsonObject?): JsonObject?
 fun HashMap<String, String?>.get(key: String, default: JsonArray?): JsonArray? {
     return this[key]?.let { JsonParser().parse(it)?.asJsonArray } ?: default
 }
+inline fun <reified T> HashMap<String, String?>.get(key: String, default: T?): T? {
+    return this[key]?.let { Gson().fromJson(it, T::class.java) } ?: default
+}
 /* !!! cannot use mutable list here - modifying it will not update the DB */
 fun <T> HashMap<String, String?>.get(key: String, default: List<T>?, classOfT: Class<T>): List<T>? {
     return this[key]?.let { ConfigGsonUtils().deserializeList<T>(gson, it, classOfT) } ?: default
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigMigration.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigMigration.kt
index 4ed95f6f..39e4bd0a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigMigration.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigMigration.kt
@@ -5,32 +5,32 @@
 package pl.szczodrzynski.edziennik.config.utils
 
 import android.content.Context
-import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.BuildConfig
+import pl.szczodrzynski.edziennik.HOUR
 import pl.szczodrzynski.edziennik.MainActivity
-import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_LIBRUS
-import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_MOBIDZIENNIK
-import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_VULCAN
 import pl.szczodrzynski.edziennik.config.Config
-import pl.szczodrzynski.edziennik.utils.models.Time
+import pl.szczodrzynski.edziennik.config.ConfigGrades.Companion.ORDER_BY_DATE_DESC
 
 class ConfigMigration(app: App, config: Config) {
     init { config.apply {
-        val p = app.getSharedPreferences("pl.szczodrzynski.edziennik_profiles", Context.MODE_PRIVATE)
-        val s = "app.appConfig"
 
-        if (dataVersion < 1) {
-            ui.theme = p.getString("$s.appTheme", null)?.toIntOrNull() ?: 1
-            sync.enabled = p.getString("$s.registerSyncEnabled", null)?.toBoolean() ?: true
-            sync.interval = p.getString("$s.registerSyncEnabled", null)?.toIntOrNull() ?: 3600
-            val oldButtons = p.getString("$s.miniDrawerButtonIds", null)?.let { str ->
-                str.replace("[\\[\\]]*".toRegex(), "")
-                        .split(",\\s?".toRegex())
-                        .mapNotNull { it.toIntOrNull() }
-            }
-            ui.miniMenuButtons = oldButtons ?: listOf(
+        val p = app.getSharedPreferences("pl.szczodrzynski.edziennik_profiles", Context.MODE_PRIVATE)
+        if (p.contains("app.appConfig.appTheme")) {
+            // migrate appConfig from app version 3.x and lower.
+            // Updates dataVersion to level 2.
+            AppConfigMigrationV3(p, config)
+        }
+
+        if (dataVersion < 2) {
+            appVersion = BuildConfig.VERSION_CODE
+            loginFinished = false
+            ui.language = null
+            ui.theme = 1
+            ui.appBackground = null
+            ui.headerBackground = null
+            ui.miniMenuVisible = false
+            ui.miniMenuButtons = listOf(
                     MainActivity.DRAWER_ITEM_HOME,
                     MainActivity.DRAWER_ITEM_TIMETABLE,
                     MainActivity.DRAWER_ITEM_AGENDA,
@@ -39,46 +39,36 @@ class ConfigMigration(app: App, config: Config) {
                     MainActivity.DRAWER_ITEM_HOMEWORK,
                     MainActivity.DRAWER_ITEM_SETTINGS
             )
-            dataVersion = 1
-        }
-        if (dataVersion < 2) {
-            devModePassword = p.getString("$s.devModePassword", null).fix()
-            sync.tokenApp = p.getString("$s.fcmToken", null).fix()
-            timetable.bellSyncMultiplier = p.getString("$s.bellSyncMultiplier", null)?.toIntOrNull() ?: 0
-            sync.quietHoursStart = p.getString("$s.quietHoursStart", null)?.toLongOrNull() ?: 0
-            appRateSnackbarTime = p.getString("$s.appRateSnackbarTime", null)?.toLongOrNull() ?: 0
-            sync.quietHoursEnd = p.getString("$s.quietHoursEnd", null)?.toLongOrNull() ?: 0
-            timetable.countInSeconds = p.getString("$s.countInSeconds", null)?.toBoolean() ?: false
-            ui.headerBackground = p.getString("$s.headerBackground", null).fix()
-            ui.appBackground = p.getString("$s.appBackground", null).fix()
-            ui.language = p.getString("$s.language", null).fix()
-            appVersion = p.getString("$s.lastAppVersion", null)?.toIntOrNull() ?: BuildConfig.VERSION_CODE
-            appInstalledTime = p.getString("$s.appInstalledTime", null)?.toLongOrNull() ?: 0
-            grades.orderBy = p.getString("$s.gradesOrderBy", null)?.toIntOrNull() ?: 0
-            sync.quietDuringLessons = p.getString("$s.quietDuringLessons", null)?.toBoolean() ?: false
-            ui.miniMenuVisible = p.getString("$s.miniDrawerVisible", null)?.toBoolean() ?: false
-            loginFinished = p.getString("$s.loginFinished", null)?.toBoolean() ?: false
-            sync.onlyWifi = p.getString("$s.registerSyncOnlyWifi", null)?.toBoolean() ?: false
-            sync.notifyAboutUpdates = p.getString("$s.notifyAboutUpdates", null)?.toBoolean() ?: true
-            timetable.bellSyncDiff = p.getString("$s.bellSyncDiff", null)?.let { Gson().fromJson(it, Time::class.java) }
-
+            sync.enabled = true
+            sync.interval = 1*HOUR.toInt()
+            sync.notifyAboutUpdates = true
+            sync.onlyWifi = false
+            sync.quietHoursStart = 0
+            sync.quietHoursEnd = 0
+            sync.quietDuringLessons = false
+            sync.tokenApp = null
+            sync.tokenMobidziennik = null
             sync.tokenMobidziennikList = listOf()
-            sync.tokenVulcanList = listOf()
+            sync.tokenLibrus = null
             sync.tokenLibrusList = listOf()
-            val tokens = p.getString("$s.fcmTokens", null)?.let { Gson().fromJson<Map<Int, Pair<String, List<Int>>>>(it, object: TypeToken<Map<Int, Pair<String, List<Int>>>>(){}.type) }
-            tokens?.forEach {
-                val token = it.value.first
-                when (it.key) {
-                    LOGIN_TYPE_MOBIDZIENNIK -> sync.tokenMobidziennik = token
-                    LOGIN_TYPE_VULCAN -> sync.tokenVulcan = token
-                    LOGIN_TYPE_LIBRUS -> sync.tokenLibrus = token
-                }
-            }
+            sync.tokenVulcan = null
+            sync.tokenVulcanList = listOf()
+            timetable.bellSyncMultiplier = 0
+            timetable.bellSyncDiff = null
+            timetable.countInSeconds = false
+            grades.orderBy = ORDER_BY_DATE_DESC
+
             dataVersion = 2
         }
-    }}
 
-    private fun String?.fix(): String? {
-        return this?.replace("\"", "")?.let { if (it == "null") null else it }
-    }
+        if (dataVersion < 10) {
+            ui.openDrawerOnBackPressed = false
+            ui.homeCards = listOf()
+            ui.snowfall = false
+            ui.bottomSheetOpened = false
+            sync.dontShowAppManagerDialog = false
+
+            dataVersion = 10
+        }
+    }}
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ProfileConfigMigration.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ProfileConfigMigration.kt
index 31c4dbc3..dbfe8191 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ProfileConfigMigration.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ProfileConfigMigration.kt
@@ -4,23 +4,21 @@
 
 package pl.szczodrzynski.edziennik.config.utils
 
-import android.content.Context
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.config.Config
+import pl.szczodrzynski.edziennik.config.ProfileConfig
+import pl.szczodrzynski.edziennik.data.db.entity.Profile.Companion.AGENDA_DEFAULT
+import pl.szczodrzynski.edziennik.data.db.entity.Profile.Companion.COLOR_MODE_WEIGHTED
+import pl.szczodrzynski.edziennik.data.db.entity.Profile.Companion.YEAR_ALL_GRADES
 
-class ProfileConfigMigration(app: App, config: Config) {
+class ProfileConfigMigration(config: ProfileConfig) {
     init { config.apply {
-        val p = app.getSharedPreferences("pl.szczodrzynski.edziennik_profiles", Context.MODE_PRIVATE)
-        val s = "app.appConfig"
 
         if (dataVersion < 1) {
+            grades.colorMode = COLOR_MODE_WEIGHTED
+            grades.countZeroToAvg = true
+            grades.yearAverageMode = YEAR_ALL_GRADES
+            ui.agendaViewType = AGENDA_DEFAULT
 
-            //dataVersion = 1
-        }
-        if (dataVersion < 2) {
-            //gradesColorMode do profilu !
-            //agendaViewType do profilu !
-            // app.appConfig.dontCountZeroToAverage do profilu !
+            dataVersion = 1
         }
     }}
 }
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/ApiService.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/ApiService.kt
index bbf3dbb8..8f97a5e6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/ApiService.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/ApiService.kt
@@ -12,12 +12,15 @@ import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.data.api.events.*
 import pl.szczodrzynski.edziennik.data.api.events.requests.ServiceCloseRequest
 import pl.szczodrzynski.edziennik.data.api.events.requests.TaskCancelRequest
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.api.task.*
+import pl.szczodrzynski.edziennik.data.api.task.ErrorReportTask
+import pl.szczodrzynski.edziennik.data.api.task.IApiTask
+import pl.szczodrzynski.edziennik.data.api.task.SzkolnyTask
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import kotlin.math.min
@@ -40,11 +43,8 @@ class ApiService : Service() {
 
     private val syncingProfiles = mutableListOf<Profile>()
 
-    private val finishingTaskQueue = mutableListOf(
-            SzkolnyTask.sync(syncingProfiles),
-            NotifyTask()
-    )
-    private val allTaskList = mutableListOf<IApiTask>()
+    private var szkolnyTaskFinished = false
+    private val allTaskRequestList = mutableListOf<Any>()
     private val taskQueue = mutableListOf<IApiTask>()
     private val errorList = mutableListOf<ApiError>()
 
@@ -132,14 +132,20 @@ class ApiService : Service() {
         checkIfTaskFrozen()
         if (taskIsRunning)
             return
-        if (taskCancelled || serviceClosed || (taskQueue.isEmpty() && finishingTaskQueue.isEmpty())) {
+        if (taskCancelled || serviceClosed || (taskQueue.isEmpty() && szkolnyTaskFinished)) {
             allCompleted()
             return
         }
 
         lastEventTime = System.currentTimeMillis()
 
-        val task = if (taskQueue.isEmpty()) finishingTaskQueue.removeAt(0) else taskQueue.removeAt(0)
+        val task = if (taskQueue.isNotEmpty()) {
+            taskQueue.removeAt(0)
+        } else {
+            szkolnyTaskFinished = true
+            SzkolnyTask(app, syncingProfiles)
+        }
+
         task.taskId = ++taskMaximumId
         task.prepare(app)
         taskIsRunning = true
@@ -162,9 +168,8 @@ class ApiService : Service() {
         try {
             when (task) {
                 is EdziennikTask -> task.run(app, taskCallback)
-                is NotifyTask -> task.run(app, taskCallback)
                 is ErrorReportTask -> task.run(app, taskCallback, notification, errorList)
-                is SzkolnyTask -> task.run(app, taskCallback)
+                is SzkolnyTask -> task.run(taskCallback)
             }
         } catch (e: Exception) {
             taskCallback.onError(ApiError(TAG, EXCEPTION_API_TASK).withThrowable(e))
@@ -230,10 +235,12 @@ class ApiService : Service() {
         EventBus.getDefault().removeStickyEvent(task)
         d(TAG, task.toString())
 
-        // fix for duplicated tasks, thank you EventBus
-        if (task in allTaskList)
-            return
-        allTaskList += task
+        if (task is EdziennikTask) {
+            // fix for duplicated tasks, thank you EventBus
+            if (task.request in allTaskRequestList)
+                return
+            allTaskRequestList += task.request
+        }
 
         if (task is EdziennikTask) {
             when (task.request) {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/DataNotifications.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/DataNotifications.kt
deleted file mode 100644
index 84a209b8..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/DataNotifications.kt
+++ /dev/null
@@ -1,206 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api
-
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_AGENDA
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_ANNOUNCEMENTS
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_ATTENDANCE
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_BEHAVIOUR
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_GRADES
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_HOME
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_HOMEWORK
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES
-import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_TIMETABLE
-import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.data.api.models.Data
-import pl.szczodrzynski.edziennik.data.db.entity.*
-import pl.szczodrzynski.edziennik.data.db.entity.Grade.*
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_LUCKY_NUMBER
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_NEW_ANNOUNCEMENT
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_NEW_ATTENDANCE
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_NEW_EVENT
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_NEW_GRADE
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_NEW_HOMEWORK
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_NEW_MESSAGE
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_NEW_NOTICE
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_TIMETABLE_LESSON_CHANGE
-import pl.szczodrzynski.edziennik.getNotificationTitle
-import pl.szczodrzynski.edziennik.utils.models.Date
-
-class DataNotifications(val data: Data) {
-    companion object {
-        private const val TAG = "DataNotifications"
-    }
-
-    val app = data.app
-    val profileId = data.profile?.id ?: -1
-    val profileName = data.profile?.name ?: ""
-    val profile = data.profile
-    val loginStore = data.loginStore
-
-    init { run {
-        if (profile == null) {
-            return@run
-        }
-
-        val today = Date.getToday()
-        val todayValue = today.value
-
-        for (lesson in app.db.timetableDao().getNotNotifiedNow(profileId)) {
-            val text = app.getString(R.string.notification_lesson_change_format, lesson.getDisplayChangeType(app), if (lesson.displayDate == null) "" else lesson.displayDate!!.formattedString, lesson.changeSubjectName)
-            data.notifications += Notification(
-                    title = app.getNotificationTitle(TYPE_TIMETABLE_LESSON_CHANGE),
-                    text = text,
-                    type = TYPE_TIMETABLE_LESSON_CHANGE,
-                    profileId = profileId,
-                    profileName = profileName,
-                    viewId = DRAWER_ITEM_TIMETABLE,
-                    addedDate = lesson.addedDate
-            ).addExtra("timetableDate", lesson.displayDate?.stringY_m_d ?: "")
-        }
-
-        for (event in app.db.eventDao().getNotNotifiedNow(profileId)) {
-            val text = if (event.type == Event.TYPE_HOMEWORK)
-                app.getString(
-                        if (event.subjectLongName.isNullOrEmpty())
-                            R.string.notification_homework_no_subject_format
-                        else
-                            R.string.notification_homework_format,
-                        event.subjectLongName,
-                        event.eventDate.formattedString
-                )
-            else
-                app.getString(
-                        if (event.subjectLongName.isNullOrEmpty())
-                            R.string.notification_event_no_subject_format
-                        else
-                            R.string.notification_event_format,
-                        event.typeName,
-                        event.eventDate.formattedString,
-                        event.subjectLongName
-                )
-            val type = if (event.type == Event.TYPE_HOMEWORK) TYPE_NEW_HOMEWORK else TYPE_NEW_EVENT
-            data.notifications += Notification(
-                    title = app.getNotificationTitle(type),
-                    text = text,
-                    type = type,
-                    profileId = profileId,
-                    profileName = profileName,
-                    viewId = if (event.type == Event.TYPE_HOMEWORK) DRAWER_ITEM_HOMEWORK else DRAWER_ITEM_AGENDA,
-                    addedDate = event.addedDate
-            ).addExtra("eventId", event.id).addExtra("eventDate", event.eventDate.value.toLong())
-        }
-
-        for (grade in app.db.gradeDao().getNotNotifiedNow(profileId)) {
-            val gradeName = when (grade.type) {
-                TYPE_SEMESTER1_PROPOSED, TYPE_SEMESTER2_PROPOSED -> app.getString(R.string.grade_semester_proposed_format_2, grade.name)
-                TYPE_SEMESTER1_FINAL, TYPE_SEMESTER2_FINAL -> app.getString(R.string.grade_semester_final_format_2, grade.name)
-                TYPE_YEAR_PROPOSED -> app.getString(R.string.grade_year_proposed_format_2, grade.name)
-                TYPE_YEAR_FINAL -> app.getString(R.string.grade_year_final_format_2, grade.name)
-                else -> grade.name
-            }
-            val text = app.getString(R.string.notification_grade_format, gradeName, grade.subjectLongName)
-            data.notifications += Notification(
-                    title = app.getNotificationTitle(TYPE_NEW_GRADE),
-                    text = text,
-                    type = TYPE_NEW_GRADE,
-                    profileId = profileId,
-                    profileName = profileName,
-                    viewId = DRAWER_ITEM_GRADES,
-                    addedDate = grade.addedDate
-            ).addExtra("gradeId", grade.id).addExtra("gradesSubjectId", grade.subjectId)
-        }
-
-        for (notice in app.db.noticeDao().getNotNotifiedNow(profileId)) {
-            val noticeTypeStr = if (notice.type == Notice.TYPE_POSITIVE) app.getString(R.string.notification_notice_praise) else if (notice.type == Notice.TYPE_NEGATIVE) app.getString(R.string.notification_notice_warning) else app.getString(R.string.notification_notice_new)
-            val text = app.getString(R.string.notification_notice_format, noticeTypeStr, notice.teacherFullName, Date.fromMillis(notice.addedDate).formattedString)
-            data.notifications += Notification(
-                    title = app.getNotificationTitle(TYPE_NEW_NOTICE),
-                    text = text,
-                    type = TYPE_NEW_NOTICE,
-                    profileId = profileId,
-                    profileName = profileName,
-                    viewId = DRAWER_ITEM_BEHAVIOUR,
-                    addedDate = notice.addedDate
-            ).addExtra("noticeId", notice.id)
-        }
-
-        for (attendance in app.db.attendanceDao().getNotNotifiedNow(profileId)) {
-            val attendanceTypeStr = when (attendance.type) {
-                Attendance.TYPE_ABSENT -> app.getString(R.string.notification_absence)
-                Attendance.TYPE_ABSENT_EXCUSED -> app.getString(R.string.notification_absence_excused)
-                Attendance.TYPE_BELATED -> app.getString(R.string.notification_belated)
-                Attendance.TYPE_BELATED_EXCUSED -> app.getString(R.string.notification_belated_excused)
-                Attendance.TYPE_RELEASED -> app.getString(R.string.notification_release)
-                Attendance.TYPE_DAY_FREE -> app.getString(R.string.notification_day_free)
-                else -> app.getString(R.string.notification_type_attendance)
-            }
-            val text = app.getString(
-                    if (attendance.subjectLongName.isNullOrEmpty())
-                        R.string.notification_attendance_no_lesson_format
-                    else
-                        R.string.notification_attendance_format,
-                    attendanceTypeStr,
-                    attendance.subjectLongName,
-                    attendance.lessonDate.formattedString
-            )
-            data.notifications += Notification(
-                    title = app.getNotificationTitle(TYPE_NEW_ATTENDANCE),
-                    text = text,
-                    type = TYPE_NEW_ATTENDANCE,
-                    profileId = profileId,
-                    profileName = profileName,
-                    viewId = DRAWER_ITEM_ATTENDANCE,
-                    addedDate = attendance.addedDate
-            ).addExtra("attendanceId", attendance.id).addExtra("attendanceSubjectId", attendance.subjectId)
-        }
-
-        for (announcement in app.db.announcementDao().getNotNotifiedNow(profileId)) {
-            val text = app.context.getString(R.string.notification_announcement_format, announcement.subject)
-            data.notifications += Notification(
-                    title = app.getNotificationTitle(TYPE_NEW_ANNOUNCEMENT),
-                    text = text,
-                    type = TYPE_NEW_ANNOUNCEMENT,
-                    profileId = profileId,
-                    profileName = profileName,
-                    viewId = DRAWER_ITEM_ANNOUNCEMENTS,
-                    addedDate = announcement.addedDate
-            ).addExtra("announcementId", announcement.id)
-        }
-
-        for (message in app.db.messageDao().getReceivedNotNotifiedNow(profileId)) {
-            val text = app.context.getString(R.string.notification_message_format, message.senderFullName, message.subject)
-            data.notifications += Notification(
-                    title = app.getNotificationTitle(TYPE_NEW_MESSAGE),
-                    text = text,
-                    type = TYPE_NEW_MESSAGE,
-                    profileId = profileId,
-                    profileName = profileName,
-                    viewId = DRAWER_ITEM_MESSAGES,
-                    addedDate = message.addedDate
-            ).addExtra("messageType", Message.TYPE_RECEIVED.toLong()).addExtra("messageId", message.id)
-        }
-
-        val luckyNumbers = app.db.luckyNumberDao().getNotNotifiedNow(profileId)
-        luckyNumbers?.removeAll { it.date < today }
-        luckyNumbers?.forEach { luckyNumber ->
-            val text = when (luckyNumber.date.value) {
-                todayValue -> // LN for today
-                    app.getString(if (profile.studentNumber != -1 && profile.studentNumber == luckyNumber.number) R.string.notification_lucky_number_yours_format else R.string.notification_lucky_number_format, luckyNumber.number)
-                todayValue + 1 -> // LN for tomorrow
-                    app.getString(if (profile.studentNumber != -1 && profile.studentNumber == luckyNumber.number) R.string.notification_lucky_number_yours_tomorrow_format else R.string.notification_lucky_number_tomorrow_format, luckyNumber.number)
-                else -> // LN for later
-                    app.getString(if (profile.studentNumber != -1 && profile.studentNumber == luckyNumber.number) R.string.notification_lucky_number_yours_later_format else R.string.notification_lucky_number_later_format, luckyNumber.date.formattedString, luckyNumber.number)
-            }
-            data.notifications += Notification(
-                    title = app.getNotificationTitle(TYPE_LUCKY_NUMBER),
-                    text = text,
-                    type = TYPE_LUCKY_NUMBER,
-                    profileId = profileId,
-                    profileName = profileName,
-                    viewId = DRAWER_ITEM_HOME,
-                    addedDate = luckyNumber.addedDate
-            )
-        }
-
-        data.db.metadataDao().setAllNotified(profileId, true)
-    }}
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/EdziennikTask.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/EdziennikTask.kt
similarity index 97%
rename from app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/EdziennikTask.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/EdziennikTask.kt
index dbc8501d..a485f582 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/EdziennikTask.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/EdziennikTask.kt
@@ -1,4 +1,8 @@
-package pl.szczodrzynski.edziennik.data.api.task
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-1-16.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.edziennik
 
 import com.google.gson.JsonObject
 import pl.szczodrzynski.edziennik.App
@@ -12,11 +16,12 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.template.Template
 import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.Vulcan
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface
-import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
+import pl.szczodrzynski.edziennik.data.api.task.IApiTask
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
+import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 
 open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTask(profileId) {
     companion object {
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 73cf0392..7ab9acb6 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
@@ -15,12 +15,12 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login.Edudzienn
 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.full.AnnouncementFull
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
+import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.utils.Utils.d
 
 class Edudziennik(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
@@ -41,9 +41,7 @@ class Edudziennik(val app: App, val profile: Profile?, val loginStore: LoginStor
 
     private fun completed() {
         data.saveData()
-        data.notify {
-            callback.onCompleted()
-        }
+        callback.onCompleted()
     }
 
     /*    _______ _                     _                  _ _   _
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebExams.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebExams.kt
index accebe10..3ce3c2aa 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebExams.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebExams.kt
@@ -13,9 +13,9 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_EXAMS
 import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
 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.get
 import pl.szczodrzynski.edziennik.utils.models.Date
 
@@ -60,7 +60,7 @@ class EdudziennikWebExams(override val data: DataEdudziennik,
                         startTime,
                         topic,
                         -1,
-                        eventType.id.toInt(),
+                        eventType.id,
                         false,
                         -1,
                         subject.id,
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
index ac4edfbb..2a5223e5 100644
--- 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
@@ -17,12 +17,12 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login.IdziennikLo
 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.full.AnnouncementFull
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
+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 {
@@ -43,9 +43,7 @@ class Idziennik(val app: App, val profile: Profile?, val loginStore: LoginStore,
 
     private fun completed() {
         data.saveData()
-        data.notify {
-            callback.onCompleted()
-        }
+        callback.onCompleted()
     }
 
     /*    _______ _                     _                  _ _   _
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 18fc1875..8ef7d211 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
@@ -19,12 +19,12 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLogin
 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.full.AnnouncementFull
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
+import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.utils.Utils.d
 
 class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
@@ -45,9 +45,7 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va
 
     private fun completed() {
         data.saveData()
-        data.notify {
-            callback.onCompleted()
-        }
+        callback.onCompleted()
     }
 
     /*    _______ _                     _                  _ _   _
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiEvents.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiEvents.kt
index 5a0c1f1c..bc0d491d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiEvents.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiEvents.kt
@@ -10,9 +10,9 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_EVENTS
 import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel
-import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS
 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 pl.szczodrzynski.edziennik.utils.models.Time
 
@@ -34,7 +34,7 @@ class LibrusApiEvents(override val data: DataLibrus,
                 val id = event.getLong("Id") ?: return@forEach
                 val eventDate = Date.fromY_m_d(event.getString("Date"))
                 val topic = event.getString("Content") ?: ""
-                val type = event.getJsonObject("Category")?.getInt("Id") ?: -1
+                val type = event.getJsonObject("Category")?.getLong("Id") ?: -1
                 val teacherId = event.getJsonObject("CreatedBy")?.getLong("Id") ?: -1
                 val subjectId = event.getJsonObject("Subject")?.getLong("Id") ?: -1
                 val teamId = event.getJsonObject("Class")?.getLong("Id") ?: -1
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 a7a6842c..b805ea6a 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
@@ -17,12 +17,12 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.login.Mobidzie
 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.full.AnnouncementFull
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
+import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.utils.Utils.d
 
 class Mobidziennik(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
@@ -45,9 +45,7 @@ class Mobidziennik(val app: App, val profile: Profile?, val loginStore: LoginSto
 
     private fun completed() {
         data.saveData()
-        data.notify {
-            callback.onCompleted()
-        }
+        callback.onCompleted()
     }
 
     /*    _______ _                     _                  _ _   _
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 0ee8069f..209f5083 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
@@ -15,12 +15,12 @@ import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.api.prepare
 import pl.szczodrzynski.edziennik.data.api.templateLoginMethods
-import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
+import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.utils.Utils.d
 
 class Template(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
@@ -40,9 +40,7 @@ class Template(val app: App, val profile: Profile?, val loginStore: LoginStore,
 
     private fun completed() {
         data.saveData()
-        data.notify {
-            callback.onCompleted()
-        }
+        callback.onCompleted()
     }
 
     /*    _______ _                     _                  _ _   _
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 351fd46e..512fae0d 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
@@ -18,12 +18,12 @@ import pl.szczodrzynski.edziennik.data.api.models.ApiError
 import pl.szczodrzynski.edziennik.data.api.prepare
 import pl.szczodrzynski.edziennik.data.api.prepareFor
 import pl.szczodrzynski.edziennik.data.api.vulcanLoginMethods
-import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.data.db.entity.Message
-import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
+import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.utils.Utils.d
 
 class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
@@ -44,9 +44,7 @@ class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, va
 
     private fun completed() {
         data.saveData()
-        data.notify {
-            callback.onCompleted()
-        }
+        callback.onCompleted()
     }
 
     /*    _______ _                     _                  _ _   _
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/ProfileListEmptyEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/ProfileListEmptyEvent.kt
new file mode 100644
index 00000000..aef467b0
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/ProfileListEmptyEvent.kt
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-1-18.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.events
+
+class ProfileListEmptyEvent
\ No newline at end of file
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 24949849..ac726338 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
@@ -194,7 +194,6 @@ abstract class Data(val app: App, val profile: Profile?, val loginStore: LoginSt
         if (profile == null)
             return // return on first login
 
-        profile.empty = false
         profile.userCode = generateUserCode()
 
         db.profileDao().add(profile)
@@ -294,21 +293,6 @@ abstract class Data(val app: App, val profile: Profile?, val loginStore: LoginSt
             db.messageRecipientDao().addAllIgnore(messageRecipientIgnoreList)
     }
 
-    fun notify(onSuccess: () -> Unit) {
-        if (profile == null) {
-            onSuccess()
-            return
-        }
-        try {
-            DataNotifications(this)
-            db.notificationDao().addAll(notifications)
-            onSuccess()
-        } catch (e: Exception) {
-            error(ApiError(TAG, EXCEPTION_NOTIFY)
-                    .withThrowable(e))
-        }
-    }
-
     fun setSyncNext(endpointId: Int, syncIn: Long? = null, viewId: Int? = null, syncAt: Long? = null) {
         EndpointTimer(profile?.id
                 ?: -1, endpointId).apply {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/DataRemoveModel.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/DataRemoveModel.kt
index da5b8321..d6680415 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/DataRemoveModel.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/DataRemoveModel.kt
@@ -47,11 +47,11 @@ open class DataRemoveModel {
         }
     }
 
-    class Events(private val type: Int?, private val exceptType: Int?, private val exceptTypes: List<Int>?) : DataRemoveModel() {
+    class Events(private val type: Long?, private val exceptType: Long?, private val exceptTypes: List<Long>?) : DataRemoveModel() {
         companion object {
-            fun futureExceptType(exceptType: Int) = Events(null, exceptType, null)
-            fun futureExceptTypes(exceptTypes: List<Int>) = Events(null, null, exceptTypes)
-            fun futureWithType(type: Int) = Events(type, null, null)
+            fun futureExceptType(exceptType: Long) = Events(null, exceptType, null)
+            fun futureExceptTypes(exceptTypes: List<Long>) = Events(null, null, exceptTypes)
+            fun futureWithType(type: Long) = Events(type, null, null)
         }
 
         fun commit(profileId: Int, dao: EventDao) {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/Szkolny.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/Szkolny.kt
deleted file mode 100644
index 4931f9e2..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/Szkolny.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) Kacper Ziubryniewicz 2019-12-13
- */
-
-package pl.szczodrzynski.edziennik.data.api.szkolny
-
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.Profile
-
-class Szkolny(val app: App, val callback: EdziennikCallback) {
-
-    private val api = SzkolnyApi(app)
-
-    fun sync(profileList: List<Profile>) {
-        val profiles = profileList.filter { it.registration == Profile.REGISTRATION_ENABLED }
-        if (profiles.isNotEmpty()) {
-            val events = api.getEvents(profiles)
-
-            if (events.isNotEmpty()) {
-                app.db.eventDao().addAll(events)
-                app.db.metadataDao().addAllIgnore(events.map { event ->
-                    Metadata(
-                            event.profileId,
-                            Metadata.TYPE_EVENT,
-                            event.id,
-                            event.seen,
-                            event.notified,
-                            event.addedDate
-                    )
-                })
-            }
-        }
-
-        completed()
-    }
-
-    /*fun shareEvent(event: EventFull) {
-        api.shareEvent(event)
-        completed()
-    }
-
-    fun unshareEvent(event: EventFull) {
-        api.unshareEvent(event)
-        completed()
-    }*/
-
-    private fun completed() {
-        callback.onCompleted()
-    }
-}
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 26b12c7e..44119134 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,15 +12,14 @@ import pl.szczodrzynski.edziennik.BuildConfig
 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.ErrorReportRequest
-import pl.szczodrzynski.edziennik.data.api.szkolny.request.EventShareRequest
-import pl.szczodrzynski.edziennik.data.api.szkolny.request.ServerSyncRequest
-import pl.szczodrzynski.edziennik.data.api.szkolny.request.WebPushRequest
+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.Update
 import pl.szczodrzynski.edziennik.data.api.szkolny.response.WebPushResponse
 import pl.szczodrzynski.edziennik.data.db.entity.Event
-import pl.szczodrzynski.edziennik.data.db.full.EventFull
+import pl.szczodrzynski.edziennik.data.db.entity.Notification
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.md5
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
@@ -56,9 +55,8 @@ class SzkolnyApi(val app: App) {
         api = retrofit.create()
     }
 
-    fun getEvents(profiles: List<Profile>): List<EventFull> {
+    fun getEvents(profiles: List<Profile>, notifications: List<Notification>, blacklistedIds: List<Long>): List<EventFull> {
         val teams = app.db.teamDao().allNow
-        val notifications = app.db.notificationDao().getNotPostedNow()
 
         val response = api.serverSync(ServerSyncRequest(
                 deviceId = app.deviceId,
@@ -88,8 +86,8 @@ class SzkolnyApi(val app: App) {
                     val config = app.config.getFor(profile.id)
                     val user = ServerSyncRequest.User(
                             profile.userCode,
-                            profile.studentNameLong ?: "",
-                            profile.studentNameShort ?: "",
+                            profile.studentNameLong,
+                            profile.studentNameShort,
                             profile.loginStoreType,
                             teams.filter { it.profileId == profile.id }.map { it.code }
                     )
@@ -108,17 +106,19 @@ class SzkolnyApi(val app: App) {
         val events = mutableListOf<EventFull>()
 
         response?.data?.events?.forEach { event ->
-            teams.filter { it.code == event.teamCode }.forEach { team ->
-                val profile = profiles.firstOrNull { it.id == team.profileId }
+            if (event.id in blacklistedIds)
+                return@forEach
+            teams.filter { it.code == event.teamCode }.onEach { team ->
+                val profile = profiles.firstOrNull { it.id == team.profileId } ?: return@onEach
 
-                events.add(event.apply {
+                events.add(EventFull(event).apply {
                     profileId = team.profileId
                     teamId = team.id
                     addedManually = true
-                    seen = profile?.empty ?: false
-                    notified = profile?.empty ?: false
+                    seen = profile.empty
+                    notified = profile.empty
 
-                    if (profile?.userCode == event.sharedBy) sharedBy = "self"
+                    if (profile.userCode == event.sharedBy) sharedBy = "self"
                 })
             }
         }
@@ -193,4 +193,15 @@ class SzkolnyApi(val app: App) {
                 errors = errors
         )).execute().body()
     }
+
+    fun unregisterAppUser(userCode: String): ApiResponse<Nothing>? {
+        return api.appUser(AppUserRequest(
+                deviceId = app.deviceId,
+                userCode = userCode
+        )).execute().body()
+    }
+
+    fun getUpdate(): ApiResponse<List<Update>>? {
+        return api.updates().execute().body()
+    }
 }
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 7d5f73e5..ea5ac8f1 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
@@ -4,16 +4,16 @@
 
 package pl.szczodrzynski.edziennik.data.api.szkolny
 
-import pl.szczodrzynski.edziennik.data.api.szkolny.request.ErrorReportRequest
-import pl.szczodrzynski.edziennik.data.api.szkolny.request.EventShareRequest
-import pl.szczodrzynski.edziennik.data.api.szkolny.request.ServerSyncRequest
-import pl.szczodrzynski.edziennik.data.api.szkolny.request.WebPushRequest
+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.ServerSyncResponse
+import pl.szczodrzynski.edziennik.data.api.szkolny.response.Update
 import pl.szczodrzynski.edziennik.data.api.szkolny.response.WebPushResponse
 import retrofit2.Call
 import retrofit2.http.Body
+import retrofit2.http.GET
 import retrofit2.http.POST
+import retrofit2.http.Query
 
 interface SzkolnyService {
 
@@ -28,4 +28,10 @@ interface SzkolnyService {
 
     @POST("errorReport")
     fun errorReport(@Body request: ErrorReportRequest): Call<ApiResponse<Nothing>>
+
+    @POST("appUser")
+    fun appUser(@Body request: AppUserRequest): Call<ApiResponse<Nothing>>
+
+    @GET("updates/app")
+    fun updates(@Query("channel") channel: String = "release"): Call<ApiResponse<List<Update>>>
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/AppUserRequest.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/AppUserRequest.kt
new file mode 100644
index 00000000..30c95a13
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/AppUserRequest.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-1-18.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.szkolny.request
+
+data class AppUserRequest(
+        val action: String = "unregister",
+
+        val deviceId: String,
+        val userCode: 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
new file mode 100644
index 00000000..a2028926
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/UpdateResponse.kt
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-1-18.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.szkolny.response
+
+data class Update(
+        val versionCode: Int,
+        val versionName: String,
+        val releaseDate: String,
+        val releaseNotes: String?,
+        val releaseType: String,
+        val isOnGooglePlay: Boolean,
+        val downloadUrl: String?
+)
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/AppSync.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/AppSync.kt
new file mode 100644
index 00000000..de877d1c
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/AppSync.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-1-17.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.task
+
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.Notification
+import pl.szczodrzynski.edziennik.data.db.entity.Profile
+
+class AppSync(val app: App, val notifications: MutableList<Notification>, val profiles: List<Profile>, val api: SzkolnyApi) {
+    companion object {
+        private const val TAG = "AppSync"
+    }
+
+    /**
+     * Run the app sync, sending all pending notifications
+     * and retrieving a list of shared events.
+     *
+     * Events are automatically saved to app database,
+     * along with corresponding metadata objects.
+     *
+     * @return a number of events inserted to DB, possibly needing a notification
+     */
+    fun run(): Int {
+        val profiles = profiles.filter { it.registration == Profile.REGISTRATION_ENABLED && !it.archived }
+        if (profiles.isNotEmpty()) {
+            val blacklistedIds = app.db.eventDao().blacklistedIds;
+            val events = api.getEvents(profiles, notifications, blacklistedIds)
+
+            if (events.isNotEmpty()) {
+                app.db.metadataDao().addAllIgnore(events.map { event ->
+                    Metadata(
+                            event.profileId,
+                            Metadata.TYPE_EVENT,
+                            event.id,
+                            event.seen,
+                            event.notified,
+                            event.addedDate
+                    )
+                })
+                return app.db.eventDao().addAll(events).size
+            }
+        }
+        return 0;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/Notifications.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/Notifications.kt
new file mode 100644
index 00000000..cae3db24
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/Notifications.kt
@@ -0,0 +1,277 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-1-16.
+ */
+
+package pl.szczodrzynski.edziennik.data.api.task
+
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MainActivity
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.data.db.entity.*
+import pl.szczodrzynski.edziennik.getNotificationTitle
+import pl.szczodrzynski.edziennik.utils.models.Date
+
+class Notifications(val app: App, val notifications: MutableList<Notification>, val profiles: List<Profile>) {
+    companion object {
+        private const val TAG = "Notifications"
+    }
+
+    private val today by lazy { Date.getToday() }
+    private val todayValue by lazy { today.value }
+
+    /**
+     * Create a [Notification] from every possible
+     * data type. Notifications are posted whenever
+     * the object's metadata `notified` property is
+     * set to false.
+     */
+    fun run() {
+        timetableNotifications()
+        eventNotifications()
+        gradeNotifications()
+        behaviourNotifications()
+        attendanceNotifications()
+        announcementNotifications()
+        messageNotifications()
+        luckyNumberNotifications()
+    }
+
+    private fun timetableNotifications() {
+        for (lesson in app.db.timetableDao().getNotNotifiedNow()) {
+            val text = app.getString(
+                    R.string.notification_lesson_change_format,
+                    lesson.getDisplayChangeType(app),
+                    if (lesson.displayDate == null) "" else lesson.displayDate!!.formattedString,
+                    lesson.changeSubjectName
+            )
+            notifications += Notification(
+                    id = Notification.buildId(lesson.profileId, Notification.TYPE_TIMETABLE_LESSON_CHANGE, lesson.id),
+                    title = app.getNotificationTitle(Notification.TYPE_TIMETABLE_LESSON_CHANGE),
+                    text = text,
+                    type = Notification.TYPE_TIMETABLE_LESSON_CHANGE,
+                    profileId = lesson.profileId,
+                    profileName = profiles.singleOrNull { it.id == lesson.profileId }?.name,
+                    viewId = MainActivity.DRAWER_ITEM_TIMETABLE,
+                    addedDate = lesson.addedDate
+            ).addExtra("timetableDate", lesson.displayDate?.stringY_m_d ?: "")
+        }
+    }
+
+    private fun eventNotifications() {
+        for (event in app.db.eventDao().notNotifiedNow) {
+            val text = if (event.type == Event.TYPE_HOMEWORK)
+                app.getString(
+                        if (event.subjectLongName.isNullOrEmpty())
+                            R.string.notification_homework_no_subject_format
+                        else
+                            R.string.notification_homework_format,
+                        event.subjectLongName,
+                        event.eventDate.formattedString
+                )
+            else
+                app.getString(
+                        if (event.subjectLongName.isNullOrEmpty())
+                            R.string.notification_event_no_subject_format
+                        else
+                            R.string.notification_event_format,
+                        event.typeName,
+                        event.eventDate.formattedString,
+                        event.subjectLongName
+                )
+            val type = if (event.type == Event.TYPE_HOMEWORK) Notification.TYPE_NEW_HOMEWORK else Notification.TYPE_NEW_EVENT
+            notifications += Notification(
+                    id = Notification.buildId(event.profileId, type, event.id),
+                    title = app.getNotificationTitle(type),
+                    text = text,
+                    type = type,
+                    profileId = event.profileId,
+                    profileName = profiles.singleOrNull { it.id == event.profileId }?.name,
+                    viewId = if (event.type == Event.TYPE_HOMEWORK) MainActivity.DRAWER_ITEM_HOMEWORK else MainActivity.DRAWER_ITEM_AGENDA,
+                    addedDate = event.addedDate
+            ).addExtra("eventId", event.id).addExtra("eventDate", event.eventDate.value.toLong())
+        }
+    }
+
+    fun sharedEventNotifications() {
+        for (event in app.db.eventDao().notNotifiedNow.filter { it.sharedBy != null }) {
+            val text = app.getString(
+                    R.string.notification_shared_event_format,
+                    event.sharedByName,
+                    event.typeName ?: "wydarzenie",
+                    event.eventDate.formattedString,
+                    event.topic
+            )
+            val type = if (event.type == Event.TYPE_HOMEWORK) Notification.TYPE_NEW_HOMEWORK else Notification.TYPE_NEW_EVENT
+            notifications += Notification(
+                    id = Notification.buildId(event.profileId, type, event.id),
+                    title = app.getNotificationTitle(type),
+                    text = text,
+                    type = type,
+                    profileId = event.profileId,
+                    profileName = profiles.singleOrNull { it.id == event.profileId }?.name,
+                    viewId = if (event.type == Event.TYPE_HOMEWORK) MainActivity.DRAWER_ITEM_HOMEWORK else MainActivity.DRAWER_ITEM_AGENDA,
+                    addedDate = event.addedDate
+            ).addExtra("eventId", event.id).addExtra("eventDate", event.eventDate.value.toLong())
+        }
+    }
+
+    private fun gradeNotifications() {
+        for (grade in app.db.gradeDao().notNotifiedNow) {
+            val gradeName = when (grade.type) {
+                Grade.TYPE_SEMESTER1_PROPOSED, Grade.TYPE_SEMESTER2_PROPOSED -> app.getString(R.string.grade_semester_proposed_format_2, grade.name)
+                Grade.TYPE_SEMESTER1_FINAL, Grade.TYPE_SEMESTER2_FINAL -> app.getString(R.string.grade_semester_final_format_2, grade.name)
+                Grade.TYPE_YEAR_PROPOSED -> app.getString(R.string.grade_year_proposed_format_2, grade.name)
+                Grade.TYPE_YEAR_FINAL -> app.getString(R.string.grade_year_final_format_2, grade.name)
+                else -> grade.name
+            }
+            val text = app.getString(
+                    R.string.notification_grade_format,
+                    gradeName,
+                    grade.subjectLongName
+            )
+            notifications += Notification(
+                    id = Notification.buildId(grade.profileId, Notification.TYPE_NEW_GRADE, grade.id),
+                    title = app.getNotificationTitle(Notification.TYPE_NEW_GRADE),
+                    text = text,
+                    type = Notification.TYPE_NEW_GRADE,
+                    profileId = grade.profileId,
+                    profileName = profiles.singleOrNull { it.id == grade.profileId }?.name,
+                    viewId = MainActivity.DRAWER_ITEM_GRADES,
+                    addedDate = grade.addedDate
+            ).addExtra("gradeId", grade.id).addExtra("gradesSubjectId", grade.subjectId)
+        }
+    }
+
+    private fun behaviourNotifications() {
+        for (notice in app.db.noticeDao().notNotifiedNow) {
+
+            val noticeTypeStr = when (notice.type) {
+                Notice.TYPE_POSITIVE -> app.getString(R.string.notification_notice_praise)
+                Notice.TYPE_NEGATIVE -> app.getString(R.string.notification_notice_warning)
+                else -> app.getString(R.string.notification_notice_new)
+            }
+
+            val text = app.getString(
+                    R.string.notification_notice_format,
+                    noticeTypeStr,
+                    notice.teacherFullName,
+                    Date.fromMillis(notice.addedDate).formattedString
+            )
+            notifications += Notification(
+                    id = Notification.buildId(notice.profileId, Notification.TYPE_NEW_NOTICE, notice.id),
+                    title = app.getNotificationTitle(Notification.TYPE_NEW_NOTICE),
+                    text = text,
+                    type = Notification.TYPE_NEW_NOTICE,
+                    profileId = notice.profileId,
+                    profileName = profiles.singleOrNull { it.id == notice.profileId }?.name,
+                    viewId = MainActivity.DRAWER_ITEM_BEHAVIOUR,
+                    addedDate = notice.addedDate
+            ).addExtra("noticeId", notice.id)
+        }
+    }
+
+    private fun attendanceNotifications() {
+        for (attendance in app.db.attendanceDao().notNotifiedNow) {
+
+            val attendanceTypeStr = when (attendance.type) {
+                Attendance.TYPE_ABSENT -> app.getString(R.string.notification_absence)
+                Attendance.TYPE_ABSENT_EXCUSED -> app.getString(R.string.notification_absence_excused)
+                Attendance.TYPE_BELATED -> app.getString(R.string.notification_belated)
+                Attendance.TYPE_BELATED_EXCUSED -> app.getString(R.string.notification_belated_excused)
+                Attendance.TYPE_RELEASED -> app.getString(R.string.notification_release)
+                Attendance.TYPE_DAY_FREE -> app.getString(R.string.notification_day_free)
+                else -> app.getString(R.string.notification_type_attendance)
+            }
+
+            val text = app.getString(
+                    if (attendance.subjectLongName.isNullOrEmpty())
+                        R.string.notification_attendance_no_lesson_format
+                    else
+                        R.string.notification_attendance_format,
+                    attendanceTypeStr,
+                    attendance.subjectLongName,
+                    attendance.lessonDate.formattedString
+            )
+            notifications += Notification(
+                    id = Notification.buildId(attendance.profileId, Notification.TYPE_NEW_ATTENDANCE, attendance.id),
+                    title = app.getNotificationTitle(Notification.TYPE_NEW_ATTENDANCE),
+                    text = text,
+                    type = Notification.TYPE_NEW_ATTENDANCE,
+                    profileId = attendance.profileId,
+                    profileName = profiles.singleOrNull { it.id == attendance.profileId }?.name,
+                    viewId = MainActivity.DRAWER_ITEM_ATTENDANCE,
+                    addedDate = attendance.addedDate
+            ).addExtra("attendanceId", attendance.id).addExtra("attendanceSubjectId", attendance.subjectId)
+        }
+    }
+
+    private fun announcementNotifications() {
+        for (announcement in app.db.announcementDao().notNotifiedNow) {
+            val text = app.getString(
+                    R.string.notification_announcement_format,
+                    announcement.teacherFullName,
+                    announcement.subject
+            )
+            notifications += Notification(
+                    id = Notification.buildId(announcement.profileId, Notification.TYPE_NEW_ANNOUNCEMENT, announcement.id),
+                    title = app.getNotificationTitle(Notification.TYPE_NEW_ANNOUNCEMENT),
+                    text = text,
+                    type = Notification.TYPE_NEW_ANNOUNCEMENT,
+                    profileId = announcement.profileId,
+                    profileName = profiles.singleOrNull { it.id == announcement.profileId }?.name,
+                    viewId = MainActivity.DRAWER_ITEM_ANNOUNCEMENTS,
+                    addedDate = announcement.addedDate
+            ).addExtra("announcementId", announcement.id)
+        }
+    }
+
+    private fun messageNotifications() {
+        for (message in app.db.messageDao().receivedNotNotifiedNow) {
+            val text = app.getString(
+                    R.string.notification_message_format,
+                    message.senderFullName,
+                    message.subject
+            )
+            notifications += Notification(
+                    id = Notification.buildId(message.profileId, Notification.TYPE_NEW_MESSAGE, message.id),
+                    title = app.getNotificationTitle(Notification.TYPE_NEW_MESSAGE),
+                    text = text,
+                    type = Notification.TYPE_NEW_MESSAGE,
+                    profileId = message.profileId,
+                    profileName = profiles.singleOrNull { it.id == message.profileId }?.name,
+                    viewId = MainActivity.DRAWER_ITEM_MESSAGES,
+                    addedDate = message.addedDate
+            ).addExtra("messageType", Message.TYPE_RECEIVED.toLong()).addExtra("messageId", message.id)
+        }
+    }
+
+    private fun luckyNumberNotifications() {
+        val luckyNumbers = app.db.luckyNumberDao().notNotifiedNow
+        luckyNumbers?.removeAll { it.date < today }
+        luckyNumbers?.forEach { luckyNumber ->
+            val profile = profiles.singleOrNull { it.id == luckyNumber.profileId } ?: return@forEach
+            val text = when (profile.studentNumber != -1 && profile.studentNumber == luckyNumber.number) {
+                true -> when (luckyNumber.date.value) {
+                    todayValue -> R.string.notification_lucky_number_yours_format
+                    todayValue + 1 -> R.string.notification_lucky_number_yours_tomorrow_format
+                    else -> R.string.notification_lucky_number_yours_later_format
+                }
+                else -> when (luckyNumber.date.value) {
+                    todayValue -> R.string.notification_lucky_number_format
+                    todayValue + 1 -> R.string.notification_lucky_number_tomorrow_format
+                    else -> R.string.notification_lucky_number_later_format
+                }
+            }
+            notifications += Notification(
+                    id = Notification.buildId(luckyNumber.profileId, Notification.TYPE_LUCKY_NUMBER, luckyNumber.date.value.toLong()),
+                    title = app.getNotificationTitle(Notification.TYPE_LUCKY_NUMBER),
+                    text = app.getString(text, luckyNumber.date.formattedString, luckyNumber.number),
+                    type = Notification.TYPE_LUCKY_NUMBER,
+                    profileId = luckyNumber.profileId,
+                    profileName = profile.name,
+                    viewId = MainActivity.DRAWER_ITEM_HOME,
+                    addedDate = luckyNumber.addedDate
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/NotifyTask.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/NotifyTask.kt
deleted file mode 100644
index fe51ab0e..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/NotifyTask.kt
+++ /dev/null
@@ -1,90 +0,0 @@
-package pl.szczodrzynski.edziennik.data.api.task
-
-import android.app.PendingIntent
-import android.content.Intent
-import android.os.Build
-import androidx.core.app.NotificationCompat
-import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.MainActivity
-import pl.szczodrzynski.edziennik.Notifier.ID_NOTIFICATIONS
-import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
-import pl.szczodrzynski.edziennik.getNotificationTitle
-import pl.szczodrzynski.edziennik.utils.models.Notification
-import kotlin.math.min
-
-class NotifyTask : IApiTask(-1) {
-    override fun prepare(app: App) {
-        taskName = app.getString(R.string.edziennik_notification_api_notify_title)
-    }
-
-    override fun cancel() {
-
-    }
-
-    fun run(app: App, taskCallback: EdziennikCallback) {
-        val list = app.db.notificationDao().getNotPostedNow()
-        val notificationList = list.subList(0, min(10, list.size))
-
-        val unreadCount = list.size
-
-        for (notification in notificationList) {
-            val intent = Intent(app, MainActivity::class.java)
-            notification.fillIntent(intent)
-            val pendingIntent = PendingIntent.getActivity(app, notification.id, intent, 0)
-            val notificationBuilder = NotificationCompat.Builder(app, app.notifier.notificationGroup)
-                    // title, text, type, date
-                    .setContentTitle(notification.profileName)
-                    .setContentText(notification.text)
-                    .setSubText(app.getNotificationTitle(notification.type))
-                    .setWhen(notification.addedDate)
-                    .setTicker(app.getString(R.string.notification_ticker_format, Notification.stringType(app, notification.type)))
-                    // icon, color, lights, priority
-                    .setSmallIcon(R.drawable.ic_notification)
-                    .setColor(app.notifier.notificationColor)
-                    .setLights(-0xff0001, 2000, 2000)
-                    .setPriority(app.notifier.notificationPriority)
-                    // channel, group, style
-                    .setChannelId(app.notifier.notificationGroup)
-                    .setGroup(app.notifier.notificationGroup)
-                    .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY)
-                    .setStyle(NotificationCompat.BigTextStyle().bigText(notification.text))
-                    // intent, auto cancel
-                    .setContentIntent(pendingIntent)
-                    .setAutoCancel(true)
-            if (!app.notifier.shouldBeQuiet()) {
-                notificationBuilder.setDefaults(app.notifier.notificationDefaults)
-            }
-            app.notifier.notificationManager.notify(notification.id, notificationBuilder.build())
-        }
-
-        if (notificationList.isNotEmpty() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            val intent = Intent(app, MainActivity::class.java)
-            intent.action = "android.intent.action.MAIN"
-            intent.putExtra("fragmentId", MainActivity.DRAWER_ITEM_NOTIFICATIONS)
-            val pendingIntent = PendingIntent.getActivity(app, ID_NOTIFICATIONS,
-                    intent, 0)
-
-            val groupBuilder = NotificationCompat.Builder(app, app.notifier.notificationGroup)
-                    .setSmallIcon(R.drawable.ic_notification)
-                    .setColor(app.notifier.notificationColor)
-                    .setContentTitle(app.getString(R.string.notification_new_notification_title_format, unreadCount))
-                    .setGroupSummary(true)
-                    .setAutoCancel(true)
-                    .setChannelId(app.notifier.notificationGroup)
-                    .setGroup(app.notifier.notificationGroup)
-                    .setLights(-0xff0001, 2000, 2000)
-                    .setPriority(app.notifier.notificationPriority)
-                    .setContentIntent(pendingIntent)
-                    .setStyle(NotificationCompat.BigTextStyle())
-            if (!app.notifier.shouldBeQuiet()) {
-                groupBuilder.setDefaults(app.notifier.notificationDefaults)
-            }
-            app.notifier.notificationManager.notify(ID_NOTIFICATIONS, groupBuilder.build())
-        }
-
-        app.db.notificationDao().setAllPosted()
-
-        taskCallback.onCompleted()
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/PostNotifications.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/PostNotifications.kt
new file mode 100644
index 00000000..ebf77f6a
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/PostNotifications.kt
@@ -0,0 +1,169 @@
+package pl.szczodrzynski.edziennik.data.api.task
+
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.os.Build
+import android.util.SparseIntArray
+import androidx.core.app.NotificationCompat
+import androidx.core.util.forEach
+import androidx.core.util.set
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.db.entity.Notification as AppNotification
+
+class PostNotifications(val app: App, nList: MutableList<AppNotification>) {
+    companion object {
+        private const val TAG = "PostNotifications"
+    }
+
+    /*public boolean shouldBeQuiet() {
+        long now = Time.getNow().getInMillis();
+        long start = app.config.getSync().getQuietHoursStart();
+        long end = app.config.getSync().getQuietHoursEnd();
+        if (start > end) {
+            end += 1000 * 60 * 60 * 24;
+            //Log.d(TAG, "Night passing");
+        }
+        if (start > now) {
+            now += 1000 * 60 * 60 * 24;
+            //Log.d(TAG, "Now is smaller");
+        }
+        //Log.d(TAG, "Start is "+start+", now is "+now+", end is "+end);
+        return start > 0 && now >= start && now <= end;
+    }*/
+    fun shouldBeQuiet() = false
+
+    private fun buildSummaryText(summaryCounts: SparseIntArray): CharSequence {
+        val summaryTexts = mutableListOf<String>()
+        summaryCounts.forEach { key, value ->
+            if (value <= 0)
+                return@forEach
+            val pluralRes = when (key) {
+                AppNotification.TYPE_TIMETABLE_LESSON_CHANGE -> R.plurals.notification_new_timetable_change_format
+                AppNotification.TYPE_NEW_GRADE -> R.plurals.notification_new_grades_format
+                AppNotification.TYPE_NEW_EVENT -> R.plurals.notification_new_events_format
+                AppNotification.TYPE_NEW_HOMEWORK -> R.plurals.notification_new_homework_format
+                AppNotification.TYPE_NEW_SHARED_EVENT -> R.plurals.notification_new_shared_events_format
+                AppNotification.TYPE_NEW_SHARED_HOMEWORK -> R.plurals.notification_new_shared_homework_format
+                AppNotification.TYPE_NEW_MESSAGE -> R.plurals.notification_new_messages_format
+                AppNotification.TYPE_NEW_NOTICE -> R.plurals.notification_new_notices_format
+                AppNotification.TYPE_NEW_ATTENDANCE -> R.plurals.notification_new_attendance_format
+                AppNotification.TYPE_LUCKY_NUMBER -> R.plurals.notification_new_lucky_number_format
+                AppNotification.TYPE_NEW_ANNOUNCEMENT -> R.plurals.notification_new_announcements_format
+                else -> R.plurals.notification_other_format
+            }
+            summaryTexts += app.resources.getQuantityString(pluralRes, value, value)
+        }
+        return summaryTexts.concat(", ")
+    }
+
+    init {
+        val notificationManager = app.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        val count = nList.size
+        val summaryCounts = SparseIntArray()
+
+        val newNotificationsText = app.resources.getQuantityString(R.plurals.notification_count_format, count, count)
+        val newNotificationsShortText = app.resources.getQuantityString(R.plurals.notification_count_short_format, count, count)
+
+        val intent = Intent(
+                app,
+                MainActivity::class.java,
+                "fragmentId" to MainActivity.DRAWER_ITEM_NOTIFICATIONS
+        )
+        val summaryIntent = PendingIntent.getActivity(app, app.notifications.dataId, intent, PendingIntent.FLAG_ONE_SHOT)
+
+        // On Nougat or newer - show maximum 8 notifications
+        // On Marshmallow or older - show maximum 4 notifications
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N && count > 4 || Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && count > 8) {
+            val summaryList = mutableListOf<CharSequence>()
+            nList.forEach {
+                summaryCounts[it.type]++
+                summaryList += listOf(
+                        it.profileName.asBoldSpannable(),
+                        it.text
+                ).concat(": ")
+            }
+
+            // Create a summary to show *instead* of notifications
+            val combined = NotificationCompat.Builder(app, app.notifications.dataKey)
+                    .setContentTitle(app.getString(R.string.app_name))
+                    .setContentText(buildSummaryText(summaryCounts))
+                    .setTicker(newNotificationsText)
+                    .setSmallIcon(R.drawable.ic_notification)
+                    .setStyle(NotificationCompat.InboxStyle()
+                            .also {
+                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                                    it.setBigContentTitle(app.getString(R.string.app_name))
+                                    it.setSummaryText(newNotificationsShortText)
+                                }
+                                else {
+                                    it.setBigContentTitle(newNotificationsText)
+                                    it.setSummaryText(app.getString(R.string.notification_click_to_see_all))
+                                }
+                                summaryList.forEach { line ->
+                                    it.addLine(line)
+                                }
+                            })
+                    .setColor(0xff2196f3.toInt())
+                    .setLights(0xff2196f3.toInt(), 2000, 2000)
+                    .setPriority(NotificationCompat.PRIORITY_MAX)
+                    .setDefaults(NotificationCompat.DEFAULT_ALL)
+                    .setGroup(app.notifications.dataKey)
+                    .setContentIntent(summaryIntent)
+                    .setAutoCancel(true)
+                    .build()
+            notificationManager.notify(System.currentTimeMillis().toInt(), combined)
+        }
+        else {
+            // Less than 8 notifications
+            val notifications = nList.map {
+                summaryCounts[it.type]++
+                NotificationCompat.Builder(app, app.notifications.dataKey)
+                        .setContentTitle(it.profileName ?: app.getString(R.string.app_name))
+                        .setContentText(it.text)
+                        .setSubText(it.title)
+                        .setTicker("${it.profileName}: ${it.title}")
+                        .setSmallIcon(R.drawable.ic_notification)
+                        .setStyle(NotificationCompat.BigTextStyle()
+                                .bigText(it.text))
+                        .setWhen(it.addedDate)
+                        .setColor(0xff2196f3.toInt())
+                        .setLights(0xff2196f3.toInt(), 2000, 2000)
+                        .setPriority(NotificationCompat.PRIORITY_MAX)
+                        .setDefaults(NotificationCompat.DEFAULT_ALL)
+                        .setGroup(app.notifications.dataKey)
+                        .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY)
+                        .setContentIntent(it.getPendingIntent(app))
+                        .setAutoCancel(true)
+                        .build()
+            }
+
+            val time = System.currentTimeMillis()
+            notificationManager.apply {
+                notifications.forEachIndexed { index, it ->
+                    notificationManager.notify((time + index).toInt(), it)
+                }
+            }
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                val summary = NotificationCompat.Builder(app, app.notifications.dataKey)
+                        .setContentTitle(newNotificationsText)
+                        .setContentText(buildSummaryText(summaryCounts))
+                        .setTicker(newNotificationsText)
+                        .setSmallIcon(R.drawable.ic_notification)
+                        .setColor(0xff2196f3.toInt())
+                        .setLights(0xff2196f3.toInt(), 2000, 2000)
+                        .setPriority(NotificationCompat.PRIORITY_MAX)
+                        .setDefaults(NotificationCompat.DEFAULT_ALL)
+                        .setGroup(app.notifications.dataKey)
+                        .setGroupSummary(true)
+                        .setContentIntent(summaryIntent)
+                        .setAutoCancel(true)
+                        .build()
+
+                notificationManager.notify(app.notifications.dataId, summary)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/SzkolnyTask.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/SzkolnyTask.kt
index 4923ee7f..cc8b7b3a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/SzkolnyTask.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/SzkolnyTask.kt
@@ -7,39 +7,39 @@ package pl.szczodrzynski.edziennik.data.api.task
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback
-import pl.szczodrzynski.edziennik.data.api.szkolny.Szkolny
+import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
+import pl.szczodrzynski.edziennik.data.db.entity.Notification
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
+import pl.szczodrzynski.edziennik.utils.Utils.d
 
-class SzkolnyTask(val request: Any) : IApiTask(-1) {
+class SzkolnyTask(val app: App, val syncingProfiles: List<Profile>) : IApiTask(-1) {
     companion object {
         private const val TAG = "SzkolnyTask"
-
-        fun sync(profiles: List<Profile>) = SzkolnyTask(SyncRequest(profiles))
-        /*fun shareEvent(event: EventFull) = SzkolnyTask(ShareEventRequest(event))
-        fun unshareEvent(event: EventFull) = SzkolnyTask(UnshareEventRequest(event))*/
     }
+    private val api by lazy { SzkolnyApi(app) }
+    private val profiles by lazy { app.db.profileDao().allNow }
+    override fun prepare(app: App) { taskName = app.getString(R.string.edziennik_szkolny_creating_notifications) }
+    override fun cancel() {}
 
-    private lateinit var szkolny: Szkolny
+    private val notificationList = mutableListOf<Notification>()
 
-    override fun prepare(app: App) {
-        taskName = app.getString(R.string.edziennik_szkolny_api_sync_title)
+    internal fun run(taskCallback: EdziennikCallback) {
+        val startTime = System.currentTimeMillis()
+        val notifications = Notifications(app, notificationList, profiles)
+        // create all e-register data notifications
+        notifications.run()
+        // send notifications to web push, get shared events
+        AppSync(app, notificationList, profiles, api).run()
+        // create notifications for shared events (not present before app sync)
+        notifications.sharedEventNotifications()
+        d(TAG, "Created ${notificationList.count()} notifications.")
+        // update the database
+        app.db.metadataDao().setAllNotified(true)
+        app.db.notificationDao().addAll(notificationList)
+        app.db.profileDao().setAllNotEmpty()
+        // post all notifications
+        PostNotifications(app, notificationList)
+        d(TAG, "SzkolnyTask: finished in ${System.currentTimeMillis()-startTime} ms.")
+        taskCallback.onCompleted()
     }
-
-    override fun cancel() {
-        // TODO
-    }
-
-    internal fun run(app: App, taskCallback: EdziennikCallback) {
-        szkolny = Szkolny(app, taskCallback)
-
-        when (request) {
-            is SyncRequest -> szkolny.sync(request.profiles)
-            /*is ShareEventRequest -> szkolny.shareEvent(request.event)
-            is UnshareEventRequest -> szkolny.unshareEvent(request.event)*/
-        }
-    }
-
-    data class SyncRequest(val profiles: List<Profile>)
-    /*data class ShareEventRequest(val event: EventFull)
-    data class UnshareEventRequest(val event: EventFull)*/
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/AnnouncementDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/AnnouncementDao.java
index 226e0bbe..ab32fb7c 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/AnnouncementDao.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/AnnouncementDao.java
@@ -16,8 +16,8 @@ import androidx.sqlite.db.SupportSQLiteQuery;
 import java.util.List;
 
 import pl.szczodrzynski.edziennik.data.db.entity.Announcement;
-import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull;
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata;
+import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull;
 
 import static pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_ANNOUNCEMENT;
 
@@ -69,4 +69,14 @@ public abstract class AnnouncementDao {
     public List<AnnouncementFull> getNotNotifiedNow(int profileId) {
         return getAllNow(profileId, "notified = 0");
     }
+
+    @Query("SELECT " +
+            "*, " +
+            "teachers.teacherName || ' ' || teachers.teacherSurname AS teacherFullName " +
+            "FROM announcements " +
+            "LEFT JOIN teachers USING(profileId, teacherId) " +
+            "LEFT JOIN metadata ON announcementId = thingId AND thingType = "+TYPE_ANNOUNCEMENT+" AND metadata.profileId = announcements.profileId " +
+            "WHERE notified = 0 " +
+            "ORDER BY addedDate DESC")
+    public abstract List<AnnouncementFull> getNotNotifiedNow();
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/AttendanceDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/AttendanceDao.java
index 9c6d6ed2..95c3147f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/AttendanceDao.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/AttendanceDao.java
@@ -5,20 +5,20 @@
 package pl.szczodrzynski.edziennik.data.db.dao;
 
 import androidx.lifecycle.LiveData;
-import androidx.sqlite.db.SimpleSQLiteQuery;
-import androidx.sqlite.db.SupportSQLiteQuery;
 import androidx.room.Dao;
 import androidx.room.Insert;
 import androidx.room.OnConflictStrategy;
 import androidx.room.Query;
 import androidx.room.RawQuery;
+import androidx.sqlite.db.SimpleSQLiteQuery;
+import androidx.sqlite.db.SupportSQLiteQuery;
+
+import java.util.List;
 
 import pl.szczodrzynski.edziennik.data.db.entity.Attendance;
 import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull;
 import pl.szczodrzynski.edziennik.utils.models.Date;
 
-import java.util.List;
-
 import static pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_ATTENDANCE;
 
 @Dao
@@ -72,6 +72,13 @@ public abstract class AttendanceDao {
         return getAllNow(profileId, "notified = 0");
     }
 
+    @Query("SELECT * FROM attendances " +
+            "LEFT JOIN subjects USING(profileId, subjectId) " +
+            "LEFT JOIN metadata ON attendanceId = thingId AND thingType = " + TYPE_ATTENDANCE + " AND metadata.profileId = attendances.profileId " +
+            "WHERE notified = 0 " +
+            "ORDER BY attendanceLessonDate DESC, attendanceStartTime DESC")
+    public abstract List<AttendanceFull> getNotNotifiedNow();
+
     // only absent and absent_excused count as absences
     // all the other types are counted as being present
     @Query("SELECT \n" +
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventDao.java
index 360e1abf..8d11b11b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventDao.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventDao.java
@@ -34,7 +34,7 @@ public abstract class EventDao {
     public abstract long add(Event event);
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    public abstract void addAll(List<Event> eventList);
+    public abstract long[] addAll(List<Event> eventList);
 
     @Query("DELETE FROM events WHERE profileId = :profileId")
     public abstract void clear(int profileId);
@@ -44,7 +44,7 @@ public abstract class EventDao {
     @Query("DELETE FROM metadata WHERE profileId = :profileId AND thingType = :thingType AND thingId = :thingId")
     public abstract void removeMetadata(int profileId, int thingType, long thingId);
     @Transaction
-    public void remove(int profileId, int type, long id) {
+    public void remove(int profileId, long type, long id) {
         remove(profileId, id);
         removeMetadata(profileId, type == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, id);
     }
@@ -88,7 +88,7 @@ public abstract class EventDao {
     public LiveData<List<EventFull>> getAllWhere(int profileId, String filter) {
         return getAll(profileId, filter);
     }
-    public LiveData<List<EventFull>> getAllByType(int profileId, int type, String filter) {
+    public LiveData<List<EventFull>> getAllByType(int profileId, long type, String filter) {
         return getAll(profileId, "eventType = "+type+" AND "+filter);
     }
     public LiveData<List<EventFull>> getAllByDate(int profileId, @NonNull Date date) {
@@ -125,6 +125,24 @@ public abstract class EventDao {
         return getAllNow(profileId, "notified = 0");
     }
 
+    @Query("SELECT eventId FROM events WHERE profileId = :profileId AND eventBlacklisted = 1")
+    public abstract List<Long> getBlacklistedIds(int profileId);
+    @Query("SELECT eventId FROM events WHERE eventBlacklisted = 1")
+    public abstract List<Long> getBlacklistedIds();
+
+    @Query("SELECT " +
+            "*, " +
+            "eventTypes.eventTypeName AS typeName, " +
+            "eventTypes.eventTypeColor AS typeColor " +
+            "FROM events " +
+            "LEFT JOIN subjects USING(profileId, subjectId) " +
+            "LEFT JOIN eventTypes USING(profileId, eventType) " +
+            "LEFT JOIN metadata ON eventId = thingId AND (thingType = " + TYPE_EVENT + " OR thingType = " + TYPE_HOMEWORK + ") AND metadata.profileId = events.profileId " +
+            "WHERE events.eventBlacklisted = 0 AND notified = 0 " +
+            "GROUP BY eventId " +
+            "ORDER BY addedDate ASC")
+    public abstract List<EventFull> getNotNotifiedNow();
+
     public EventFull getByIdNow(int profileId, long eventId) {
         List<EventFull> eventList = getAllNow(profileId, "eventId = "+eventId);
         return eventList.size() == 0 ? null : eventList.get(0);
@@ -146,13 +164,13 @@ public abstract class EventDao {
     }
 
     @Query("DELETE FROM events WHERE profileId = :profileId AND eventAddedManually = 0 AND eventDate >= :todayDate AND eventType = :type")
-    public abstract void removeFutureWithType(int profileId, Date todayDate, int type);
+    public abstract void removeFutureWithType(int profileId, Date todayDate, long type);
 
     @Query("DELETE FROM events WHERE profileId = :profileId AND eventAddedManually = 0 AND eventDate >= :todayDate AND eventType != :exceptType")
-    public abstract void removeFutureExceptType(int profileId, Date todayDate, int exceptType);
+    public abstract void removeFutureExceptType(int profileId, Date todayDate, long exceptType);
 
     @Transaction
-    public void removeFutureExceptTypes(int profileId, Date todayDate, List<Integer> exceptTypes) {
+    public void removeFutureExceptTypes(int profileId, Date todayDate, List<Long> exceptTypes) {
         removeFuture(profileId, todayDate, "eventType NOT IN " + exceptTypes.toString().replace('[', '(').replace(']', ')'));
     }
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventTypeDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventTypeDao.java
index 415f9743..25366699 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventTypeDao.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventTypeDao.java
@@ -4,14 +4,14 @@
 
 package pl.szczodrzynski.edziennik.data.db.dao;
 
-import java.util.List;
-
 import androidx.lifecycle.LiveData;
 import androidx.room.Dao;
 import androidx.room.Insert;
 import androidx.room.OnConflictStrategy;
 import androidx.room.Query;
 
+import java.util.List;
+
 import pl.szczodrzynski.edziennik.data.db.entity.EventType;
 
 @Dao
@@ -26,11 +26,14 @@ public interface EventTypeDao {
     void clear(int profileId);
 
     @Query("SELECT * FROM eventTypes WHERE profileId = :profileId AND eventType = :typeId")
-    EventType getByIdNow(int profileId, int typeId);
+    EventType getByIdNow(int profileId, long typeId);
 
     @Query("SELECT * FROM eventTypes WHERE profileId = :profileId")
     LiveData<List<EventType>> getAll(int profileId);
 
     @Query("SELECT * FROM eventTypes WHERE profileId = :profileId")
     List<EventType> getAllNow(int profileId);
+
+    @Query("SELECT * FROM eventTypes")
+    List<EventType> getAllNow();
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/GradeDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/GradeDao.java
index b0b3c3c9..f5aa5f48 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/GradeDao.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/GradeDao.java
@@ -83,6 +83,13 @@ public abstract class GradeDao {
         return getAllNow(profileId, "gradeParentId = "+parentId);
     }
 
+    @Query("SELECT * FROM grades " +
+            "LEFT JOIN subjects USING(profileId, subjectId) " +
+            "LEFT JOIN metadata ON gradeId = thingId AND thingType = " + TYPE_GRADE + " AND metadata.profileId = grades.profileId " +
+            "WHERE notified = 0 " +
+            "ORDER BY addedDate DESC")
+    public abstract List<GradeFull> getNotNotifiedNow();
+
     @RawQuery
     abstract GradeFull getNow(SupportSQLiteQuery query);
     public GradeFull getNow(int profileId, String filter) {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/LibrusLessonDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/LibrusLessonDao.kt
index 7190c243..6afcc2ba 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/LibrusLessonDao.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/LibrusLessonDao.kt
@@ -20,4 +20,7 @@ interface LibrusLessonDao {
 
     @Query("SELECT * FROM librusLessons WHERE profileId = :profileId")
     fun getAllNow(profileId: Int): List<LibrusLesson>
+
+    @Query("DELETE FROM librusLessons WHERE profileId = :profileId")
+    fun clear(profileId: Int)
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/LuckyNumberDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/LuckyNumberDao.java
index 861f36cc..c1c33c23 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/LuckyNumberDao.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/LuckyNumberDao.java
@@ -17,9 +17,9 @@ import androidx.sqlite.db.SupportSQLiteQuery;
 import java.util.List;
 
 import pl.szczodrzynski.edziennik.data.db.entity.LuckyNumber;
-import pl.szczodrzynski.edziennik.data.db.full.LuckyNumberFull;
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata;
 import pl.szczodrzynski.edziennik.data.db.entity.Notice;
+import pl.szczodrzynski.edziennik.data.db.full.LuckyNumberFull;
 import pl.szczodrzynski.edziennik.utils.models.Date;
 
 import static pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_LUCKY_NUMBER;
@@ -78,4 +78,10 @@ public abstract class LuckyNumberDao {
     public List<LuckyNumberFull> getNotNotifiedNow(int profileId) {
         return getAllNow(profileId, "notified = 0");
     }
+
+    @Query("SELECT * FROM luckyNumbers\n" +
+            "LEFT JOIN metadata ON luckyNumberDate = thingId AND thingType = "+TYPE_LUCKY_NUMBER+" AND metadata.profileId = luckyNumbers.profileId " +
+            "WHERE notified = 0 " +
+            "ORDER BY addedDate DESC")
+    public abstract List<LuckyNumberFull> getNotNotifiedNow();
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/MessageDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/MessageDao.java
index e491ce98..bc3a46a5 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/MessageDao.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/MessageDao.java
@@ -17,8 +17,8 @@ import androidx.sqlite.db.SupportSQLiteQuery;
 import java.util.List;
 
 import pl.szczodrzynski.edziennik.data.db.entity.Message;
-import pl.szczodrzynski.edziennik.data.db.full.MessageFull;
 import pl.szczodrzynski.edziennik.data.db.entity.Metadata;
+import pl.szczodrzynski.edziennik.data.db.full.MessageFull;
 
 import static pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_DELETED;
 import static pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_RECEIVED;
@@ -101,4 +101,14 @@ public abstract class MessageDao {
     public List<MessageFull> getReceivedNotNotifiedNow(int profileId) {
         return getReceivedNow(profileId, "notified = 0");
     }
+
+    @Query("SELECT " +
+            "*, " +
+            "teachers.teacherName || ' ' || teachers.teacherSurname AS senderFullName " +
+            "FROM messages " +
+            "LEFT JOIN teachers ON teachers.profileId = messages.profileId AND teacherId = senderId " +
+            "LEFT JOIN metadata ON messageId = thingId AND thingType = "+TYPE_MESSAGE+" AND metadata.profileId = messages.profileId " +
+            "WHERE messageType = 0 AND notified = 0 " +
+            "ORDER BY addedDate DESC")
+    public abstract List<MessageFull> getReceivedNotNotifiedNow();
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/MetadataDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/MetadataDao.java
index 5c74b8f1..4e8d0700 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/MetadataDao.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/MetadataDao.java
@@ -40,6 +40,9 @@ public abstract class MetadataDao {
     @Insert(onConflict = OnConflictStrategy.IGNORE)
     public abstract void addAllIgnore(List<Metadata> metadataList);
 
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    public abstract void addAllReplace(List<Metadata> metadataList);
+
     @Query("UPDATE metadata SET seen = :seen WHERE thingId = :thingId AND thingType = :thingType AND profileId = :profileId")
     abstract void updateSeen(int profileId, int thingType, long thingId, boolean seen);
 
@@ -165,6 +168,9 @@ public abstract class MetadataDao {
     @Query("UPDATE metadata SET notified = :notified WHERE profileId = :profileId")
     public abstract void setAllNotified(int profileId, boolean notified);
 
+    @Query("UPDATE metadata SET notified = :notified")
+    public abstract void setAllNotified(boolean notified);
+
 
 
     @Query("SELECT count() FROM metadata WHERE profileId = :profileId AND thingType = :thingType AND seen = 0")
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/NoticeDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/NoticeDao.java
index ce9239d4..110544e4 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/NoticeDao.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/NoticeDao.java
@@ -5,13 +5,13 @@
 package pl.szczodrzynski.edziennik.data.db.dao;
 
 import androidx.lifecycle.LiveData;
-import androidx.sqlite.db.SimpleSQLiteQuery;
-import androidx.sqlite.db.SupportSQLiteQuery;
 import androidx.room.Dao;
 import androidx.room.Insert;
 import androidx.room.OnConflictStrategy;
 import androidx.room.Query;
 import androidx.room.RawQuery;
+import androidx.sqlite.db.SimpleSQLiteQuery;
+import androidx.sqlite.db.SupportSQLiteQuery;
 
 import java.util.List;
 
@@ -69,4 +69,14 @@ public abstract class NoticeDao {
     public List<NoticeFull> getNotNotifiedNow(int profileId) {
         return getAllNow(profileId, "notified = 0");
     }
+
+    @Query("SELECT " +
+            "*, " +
+            "teachers.teacherName || ' ' || teachers.teacherSurname AS teacherFullName " +
+            "FROM notices " +
+            "LEFT JOIN teachers USING(profileId, teacherId) " +
+            "LEFT JOIN metadata ON noticeId = thingId AND thingType = "+TYPE_NOTICE+" AND metadata.profileId = notices.profileId " +
+            "WHERE notified = 0 " +
+            "ORDER BY addedDate DESC")
+    public abstract List<NoticeFull> getNotNotifiedNow();
 }
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 e80fbf5a..497c4ce3 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
@@ -52,9 +52,12 @@ interface ProfileDao {
     @Query("SELECT profiles.* FROM teams JOIN profiles USING(profileId) WHERE teamCode = :teamCode AND registration = " + Profile.REGISTRATION_ENABLED + " AND enableSharedEvents = 1")
     fun getByTeamCodeNowWithRegistration(teamCode: String?): List<Profile>
 
-    @get:Query("SELECT profileId FROM profiles WHERE profileId >= 0 ORDER BY profileId ASC LIMIT 1")
+    @get:Query("SELECT profileId FROM profiles WHERE profileId > 0 ORDER BY profileId ASC LIMIT 1")
     val firstId: Int?
 
-    @get:Query("SELECT profileId FROM profiles WHERE profileId >= 0 ORDER BY profileId DESC LIMIT 1")
+    @get:Query("SELECT profileId FROM profiles WHERE profileId > 0 ORDER BY profileId DESC LIMIT 1")
     val lastId: Int?
+
+    @Query("UPDATE profiles SET empty = 0")
+    fun setAllNotEmpty()
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TimetableDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TimetableDao.kt
index 7fd06b80..ada5b342 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TimetableDao.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TimetableDao.kt
@@ -107,4 +107,18 @@ interface TimetableDao {
         WHERE timetable.profileId = :profileId AND timetable.type NOT IN (${Lesson.TYPE_NORMAL}, ${Lesson.TYPE_NO_LESSONS}, ${Lesson.TYPE_SHIFTED_SOURCE}) AND metadata.notified = 0
     """)
     fun getNotNotifiedNow(profileId: Int): List<LessonFull>
+
+    @Query("""
+        SELECT 
+        timetable.*,
+        teachers.teacherName ||" "|| teachers.teacherSurname AS teacherName,
+        oldT.teacherName ||" "|| oldT.teacherSurname AS oldTeacherName,
+        metadata.seen, metadata.notified, metadata.addedDate
+        FROM timetable
+        LEFT JOIN teachers USING(profileId, teacherId)
+        LEFT JOIN teachers AS oldT ON timetable.profileId = oldT.profileId AND timetable.oldTeacherId = oldT.teacherId
+        LEFT JOIN metadata ON id = thingId AND thingType = ${Metadata.TYPE_LESSON_CHANGE} AND metadata.profileId = timetable.profileId
+        WHERE timetable.type NOT IN (${Lesson.TYPE_NORMAL}, ${Lesson.TYPE_NO_LESSONS}, ${Lesson.TYPE_SHIFTED_SOURCE}) AND metadata.notified = 0
+    """)
+    fun getNotNotifiedNow(): List<LessonFull>
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Event.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Event.java
index a85bdeb9..c18a93d4 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Event.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Event.java
@@ -32,19 +32,19 @@ public class Event {
     public String topic;
     @ColumnInfo(name = "eventColor")
     public int color = -1;
-    public static final int TYPE_UNDEFINED = -2;
-    public static final int TYPE_HOMEWORK = -1;
-    public static final int TYPE_DEFAULT = 0;
-    public static final int TYPE_EXAM = 1;
-    public static final int TYPE_SHORT_QUIZ = 2;
-    public static final int TYPE_ESSAY = 3;
-    public static final int TYPE_PROJECT = 4;
-    public static final int TYPE_PT_MEETING = 5;
-    public static final int TYPE_EXCURSION = 6;
-    public static final int TYPE_READING = 7;
-    public static final int TYPE_CLASS_EVENT = 8;
-    public static final int TYPE_INFORMATION = 9;
-    public static final int TYPE_TEACHER_ABSENCE = 10;
+    public static final long TYPE_UNDEFINED = -2;
+    public static final long TYPE_HOMEWORK = -1;
+    public static final long TYPE_DEFAULT = 0;
+    public static final long TYPE_EXAM = 1;
+    public static final long TYPE_SHORT_QUIZ = 2;
+    public static final long TYPE_ESSAY = 3;
+    public static final long TYPE_PROJECT = 4;
+    public static final long TYPE_PT_MEETING = 5;
+    public static final long TYPE_EXCURSION = 6;
+    public static final long TYPE_READING = 7;
+    public static final long TYPE_CLASS_EVENT = 8;
+    public static final long TYPE_INFORMATION = 9;
+    public static final long TYPE_TEACHER_ABSENCE = 10;
     public static final int COLOR_HOMEWORK = 0xff795548;
     public static final int COLOR_DEFAULT = 0xffffc107;
     public static final int COLOR_EXAM = 0xfff44336;
@@ -58,7 +58,7 @@ public class Event {
     public static final int COLOR_INFORMATION = 0xff039be5;
     public static final int COLOR_TEACHER_ABSENCE = 0xff039be5;
     @ColumnInfo(name = "eventType")
-    public int type = TYPE_DEFAULT;
+    public long type = TYPE_DEFAULT;
     @ColumnInfo(name = "eventAddedManually")
     public boolean addedManually;
     @ColumnInfo(name = "eventSharedBy")
@@ -76,7 +76,7 @@ public class Event {
     @Ignore
     public Event() {}
 
-    public Event(int profileId, long id, Date eventDate, @Nullable Time startTime, String topic, int color, int type, boolean addedManually, long teacherId, long subjectId, long teamId)
+    public Event(int profileId, long id, Date eventDate, @Nullable Time startTime, String topic, int color, long type, boolean addedManually, long teacherId, long subjectId, long teamId)
     {
         this.profileId = profileId;
         this.id = id;
@@ -97,8 +97,8 @@ public class Event {
     }
 
     @Override
-    public Event clone() throws CloneNotSupportedException {
-        return new Event(
+    public Event clone() {
+        Event event = new Event(
                 profileId,
                 id,
                 eventDate.clone(),
@@ -111,6 +111,10 @@ public class Event {
                 teacherId,
                 teamId
         );
+        event.sharedBy = sharedBy;
+        event.sharedByName = sharedByName;
+        event.blacklisted = blacklisted;
+        return event;
     }
 
     @Override
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Notification.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Notification.kt
index 62b87712..242d5999 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Notification.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Notification.kt
@@ -4,34 +4,18 @@
 
 package pl.szczodrzynski.edziennik.data.db.entity
 
+import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.google.gson.JsonObject
-import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_AUTO_ARCHIVING
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_ERROR
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_FEEDBACK_MESSAGE
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_GENERAL
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_LUCKY_NUMBER
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_NEW_ANNOUNCEMENT
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_NEW_ATTENDANCE
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_NEW_EVENT
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_NEW_GRADE
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_NEW_HOMEWORK
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_NEW_MESSAGE
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_NEW_NOTICE
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_NEW_SHARED_EVENT
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_SERVER_MESSAGE
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_TIMETABLE_CHANGED
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_TIMETABLE_LESSON_CHANGE
-import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_UPDATE
+import pl.szczodrzynski.edziennik.MainActivity
 
 @Entity(tableName = "notifications")
 data class Notification(
         @PrimaryKey(autoGenerate = true)
-        val id: Int = 0,
+        val id: Long = 0,
 
         val title: String,
         val text: String,
@@ -41,7 +25,7 @@ data class Notification(
         val profileId: Int?,
         val profileName: String?,
 
-        var posted: Boolean = false,
+        var posted: Boolean = true,
 
         var viewId: Int? = null,
         var extras: JsonObject? = null,
@@ -59,6 +43,7 @@ data class Notification(
         const val TYPE_NEW_HOMEWORK = 10
         const val TYPE_NEW_SHARED_EVENT = 7
         const val TYPE_NEW_SHARED_HOMEWORK = 12
+        const val TYPE_REMOVED_SHARED_EVENT = 18
         const val TYPE_NEW_MESSAGE = 8
         const val TYPE_NEW_NOTICE = 9
         const val TYPE_NEW_ATTENDANCE = 13
@@ -67,6 +52,10 @@ data class Notification(
         const val TYPE_NEW_ANNOUNCEMENT = 15
         const val TYPE_FEEDBACK_MESSAGE = 16
         const val TYPE_AUTO_ARCHIVING = 17
+
+        fun buildId(profileId: Int, type: Int, itemId: Long): Long {
+            return 1000000000000 + profileId*10000000000 + type*100000000 + itemId;
+        }
     }
 
     fun addExtra(key: String, value: Long?): Notification {
@@ -100,4 +89,10 @@ data class Notification(
             e.printStackTrace()
         }
     }
+
+    fun getPendingIntent(context: Context): PendingIntent {
+        val intent = Intent(context, MainActivity::class.java)
+        fillIntent(intent)
+        return PendingIntent.getActivity(context, id.toInt(), intent, PendingIntent.FLAG_ONE_SHOT)
+    }
 }
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 c6807ee6..7d9b7b8a 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
@@ -30,21 +30,21 @@ open class Profile(
         val loginStoreId: Int,
         val loginStoreType: Int,
 
-        override var name: String,
-        override var subname: String?,
+        override var name: String = "",
+        override var subname: String? = null,
 
         /**
          * The name of the student.
          * This doesn't change, no matter if it's a parent or student account.
          */
-        var studentNameLong: String,
-        var studentNameShort: String,
+        var studentNameLong: String = "",
+        var studentNameShort: String = "",
         /**
          * A full name of the account owner.
          * If null, then it's a student account.
          * If not null, then it's a parent account with this name.
          */
-        var accountName: String?,
+        var accountName: String? = null,
 
         val studentData: JsonObject = JsonObject()
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/EventFull.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/EventFull.java
index e00f9b49..beaf794e 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/EventFull.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/EventFull.java
@@ -45,6 +45,35 @@ public class EventFull extends Event {
         this.sharedByName = event.sharedByName;
         this.blacklisted = event.blacklisted;
     }
+    public EventFull(EventFull event) {
+        super(
+                event.profileId,
+                event.id,
+                event.eventDate.clone(),
+                event.startTime == null ? null : event.startTime.clone(),
+                event.topic,
+                event.color,
+                event.type,
+                event.addedManually,
+                event.teacherId,
+                event.subjectId,
+                event.teamId
+        );
+
+        this.sharedBy = event.sharedBy;
+        this.sharedByName = event.sharedByName;
+        this.blacklisted = event.blacklisted;
+        this.typeName = event.typeName;
+        this.typeColor = event.typeColor;
+        this.teacherFullName = event.teacherFullName;
+        this.subjectLongName = event.subjectLongName;
+        this.subjectShortName = event.subjectShortName;
+        this.teamName = event.teamName;
+        this.teamCode = event.teamCode;
+        this.seen = event.seen;
+        this.notified = event.notified;
+        this.addedDate = event.addedDate;
+    }
 
     public EventFull(Event event, Metadata metadata) {
         this(event);
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/FirebaseService.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/FirebaseService.kt
index a8f6e762..a7c9f656 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/FirebaseService.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/FirebaseService.kt
@@ -11,11 +11,14 @@ import android.content.Intent
 import android.util.Log
 import com.google.firebase.iid.zzaq
 import com.google.firebase.iid.zzv
-import com.google.firebase.messaging.MessagingAnalytics
 import com.google.firebase.messaging.zzc
 import com.google.gson.JsonObject
 import pl.szczodrzynski.edziennik.*
 import java.util.*
+import com.google.firebase.messaging.zzo.zza as logNotificationOpen
+import com.google.firebase.messaging.zzo.zza as logNotificationReceived
+import com.google.firebase.messaging.zzo.zzb as logNotificationDismiss
+import com.google.firebase.messaging.zzo.zzd as shouldUploadMetrics
 
 @SuppressLint("Registered")
 open class FirebaseService : zzc() {
@@ -45,8 +48,8 @@ open class FirebaseService : zzc() {
                 }
             }
 
-            if (MessagingAnalytics.shouldUploadMetrics(intent)) {
-                MessagingAnalytics.logNotificationOpen(intent)
+            if (shouldUploadMetrics(intent)) {
+                logNotificationOpen(intent)
             }
 
             return true
@@ -62,8 +65,8 @@ open class FirebaseService : zzc() {
 
         when (action) {
             "com.google.firebase.messaging.NOTIFICATION_DISMISS" -> {
-                if (MessagingAnalytics.shouldUploadMetrics(intent)) {
-                    MessagingAnalytics.logNotificationDismiss(intent)
+                if (shouldUploadMetrics(intent)) {
+                    logNotificationDismiss(intent)
                 }
             }
             "com.google.firebase.messaging.NEW_TOKEN" -> {
@@ -106,8 +109,8 @@ open class FirebaseService : zzc() {
         // get the message type
         when (val it = json.getString("message_type") ?: "gcm") {
             "gcm" -> { // 0
-                if (MessagingAnalytics.shouldUploadMetrics(intent)) {
-                    MessagingAnalytics.logNotificationReceived(intent)
+                if (shouldUploadMetrics(intent)) {
+                    logNotificationReceived(intent, null)
                 }
 
                 onMessageReceived(Message(messageId, json))
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/MyFirebaseMessagingService.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/MyFirebaseMessagingService.java
index ff4a99a2..2a9d52a8 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/MyFirebaseMessagingService.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/MyFirebaseMessagingService.java
@@ -5,36 +5,19 @@
 package pl.szczodrzynski.edziennik.data.firebase;
 
 import android.content.Context;
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
-import android.util.Log;
 
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
 
 import java.util.List;
 
 import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.BuildConfig;
-import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask;
-import pl.szczodrzynski.edziennik.data.db.entity.Event;
-import pl.szczodrzynski.edziennik.data.db.entity.EventType;
-import pl.szczodrzynski.edziennik.data.db.entity.FeedbackMessage;
+import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask;
 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.data.db.full.EventFull;
-import pl.szczodrzynski.edziennik.network.ServerRequest;
-import pl.szczodrzynski.edziennik.ui.modules.base.DebugFragment;
-import pl.szczodrzynski.edziennik.utils.models.Notification;
 
-import static pl.szczodrzynski.edziennik.App.APP_URL;
-import static pl.szczodrzynski.edziennik.data.db.entity.Event.TYPE_HOMEWORK;
 import static pl.szczodrzynski.edziennik.utils.Utils.d;
 import static pl.szczodrzynski.edziennik.utils.Utils.strToInt;
 
@@ -45,16 +28,16 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService {
     public void onNewToken(String s) {
         super.onNewToken(s);
 
-        Log.d(TAG, "New token: "+s);
+       /* Log.d(TAG, "New token: "+s);
         App app = (App)getApplicationContext();
         if (app.config.getSync().getTokenApp() == null || !app.config.getSync().getTokenApp().equals(s)) {
             app.config.getSync().setTokenApp(s);
-        }
+        }*/
     }
 
     @Override
     public void onMessageReceived(RemoteMessage remoteMessage) {
-        App app = ((App) getApplicationContext());
+        /*App app = ((App) getApplicationContext());
         // Not getting messages here? See why this may be: https://goo.gl/39bRNJ
 
         String from = remoteMessage.getFrom();
@@ -78,7 +61,7 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService {
                     processVulcanPush(app, remoteMessage);
                     break;
             }
-        }
+        }*/
     }
 
     private void processMobidziennikPush(App app, RemoteMessage remoteMessage) {
@@ -102,14 +85,7 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService {
 
                 if (profile != null) {
                     if (remoteMessage.getData().get("id_wiadomosci") != null) {
-                        /*app.notifier.add(new Notification(app.getContext(), remoteMessage.getData().get("message"))
-                                .withProfileData(profile.id, profile.name)
-                                .withTitle(remoteMessage.getData().get("title"))
-                                .withType(Notification.TYPE_NEW_MESSAGE)
-                                .withFragmentRedirect(MainActivity.DRAWER_ITEM_MESSAGES)
-                        );
-                        app.notifier.postAll(profile);
-                        app.saveConfig("notifications");*/
+
                         d(TAG, "Syncing profile " + profile.getId());
                         EdziennikTask.Companion.syncProfile(profile.getId(), null, null).enqueue(app);
                     } else {
@@ -141,7 +117,7 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService {
 
     private void processAppPush(App app, RemoteMessage remoteMessage) {
         // Check if message contains a data payload.
-        String type = remoteMessage.getData().get("type");
+        /*String type = remoteMessage.getData().get("type");
         if (remoteMessage.getData().size() > 0
             && type != null) {
             //Log.d(TAG, "Message data payload: " + remoteMessage.sync());
@@ -239,90 +215,8 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService {
                     break;
                 case "ping":
                     // just a ping
-                    break;
-            /*    ______               _                  _
-                 |  ____|             | |                | |
-                 | |____   _____ _ __ | |_   ______   ___| |__   __ _ _ __ ___
-                 |  __\ \ / / _ \ '_ \| __| |______| / __| '_ \ / _` | '__/ _ \
-                 | |___\ V /  __/ | | | |_           \__ \ | | | (_| | | |  __/
-                 |______\_/ \___|_| |_|\__|          |___/_| |_|\__,_|_|  \__*/
-                case "event":
-                case "event_removed":
-                    AsyncTask.execute(() -> {
-                        String teamCode = remoteMessage.getData().get("team");
-                        String teamUnshareCode = remoteMessage.getData().get("team_unshare");
-                        while (teamCode != null || teamUnshareCode != null) {
-                            d(TAG, "Got an event for teamCode " + teamCode + " and teamUnshareCode " + teamUnshareCode);
-                            // get the target Profile by the corresponding teamCode
-                            List<Profile> profiles = app.db.profileDao().getByTeamCodeNowWithRegistration(teamCode == null ? teamUnshareCode : teamCode);
-                            for (Profile profile : profiles) {
-                                d(TAG, "Matched profile " + profile.getName());
-                                if (teamCode != null) {
-                                    // SHARING
-                                    JsonObject jEvent = new JsonParser().parse(remoteMessage.getData().get("data")).getAsJsonObject();
-                                    d(TAG, "An event is there! " + jEvent.toString());
-                                    // get the target Team from teamCode
-                                    Team team = app.db.teamDao().getByCodeNow(profile.getId(), teamCode);
-                                    if (team != null) {
-                                        d(TAG, "The target team is " + team.name + ", ID " + team.id);
-                                        // create the event from Json. Add the missing teamId and !!profileId!!
-                                        Event event = app.gson.fromJson(jEvent.toString(), Event.class);
-                                        if (jEvent.get("colorDefault") != null) {
-                                            event.color = -1;
-                                        }
-                                        event.profileId = profile.getId();
-                                        event.teamId = team.id;
-                                        d(TAG, "Created the event! " + event);
-
-                                        // TODO? i guess
-                                        Event oldEvent = app.db.eventDao().getByIdNow(profile.getId(), event.id);
-                                        if (event.sharedBy != null && event.sharedBy.equals(profile.getUserCode())) {
-                                            d(TAG, "Shared by self! Changing name");
-                                            event.sharedBy = "self";
-                                            event.sharedByName = profile.getStudentNameLong();
-                                        }
-                                        d(TAG, "Old event found? " + oldEvent);
-                                        EventType eventType = app.db.eventTypeDao().getByIdNow(profile.getId(), event.type);
-                                        app.notifier.add(new Notification(app.getContext(), app.getString((oldEvent == null ? R.string.notification_shared_event_format : R.string.notification_shared_event_modified_format), event.sharedByName, eventType == null ? "wydarzenie" : eventType.name, event.eventDate.getFormattedString(), event.topic))
-                                                .withProfileData(profile.getId(), profile.getName())
-                                                .withType(event.type == TYPE_HOMEWORK ? pl.szczodrzynski.edziennik.data.db.entity.Notification.TYPE_NEW_SHARED_HOMEWORK : pl.szczodrzynski.edziennik.data.db.entity.Notification.TYPE_NEW_SHARED_EVENT)
-                                                .withFragmentRedirect(event.type == TYPE_HOMEWORK ? MainActivity.DRAWER_ITEM_HOMEWORK : MainActivity.DRAWER_ITEM_AGENDA)
-                                                .withLongExtra("eventDate", event.eventDate.getValue())
-                                        );
-                                        d(TAG, "Finishing adding event " + event);
-                                        app.db.eventDao().add(event);
-                                        try {
-                                            app.db.metadataDao().setBoth(profile.getId(), event, false, true, jEvent.get("addedDate").getAsLong());
-                                        } catch (Exception e) {
-                                            e.printStackTrace();
-                                        }
-                                    }
-                                } else {
-                                    // UNSHARING
-                                    long eventId = Long.parseLong(remoteMessage.getData().get("remove_id"));
-                                    EventFull oldEvent = app.db.eventDao().getByIdNow(profile.getId(), eventId);
-                                    if (oldEvent != null) {
-                                        app.notifier.add(new Notification(app.getContext(), app.getString(R.string.notification_shared_event_removed_format, oldEvent.sharedByName, oldEvent.typeName, oldEvent.eventDate.getFormattedString(), oldEvent.topic))
-                                                .withProfileData(profile.getId(), profile.getName())
-                                                .withType(oldEvent.type == TYPE_HOMEWORK ? pl.szczodrzynski.edziennik.data.db.entity.Notification.TYPE_NEW_SHARED_HOMEWORK : pl.szczodrzynski.edziennik.data.db.entity.Notification.TYPE_NEW_SHARED_EVENT)
-                                                .withFragmentRedirect(oldEvent.type == TYPE_HOMEWORK ? MainActivity.DRAWER_ITEM_HOMEWORK : MainActivity.DRAWER_ITEM_AGENDA)
-                                                .withLongExtra("eventDate", oldEvent.eventDate.getValue())
-                                        );
-                                        app.db.eventDao().remove(oldEvent);
-                                    }
-                                }
-                            }
-                            if (teamCode != null) {
-                                teamCode = null;
-                            } else {
-                                teamUnshareCode = null;
-                            }
-                        }
-                        app.notifier.postAll();
-                        app.saveConfig();
-                    });
-                    break;
+                    break
             }
-        }
+        }*/
     }
 }
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 8ac470b9..904be226 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
@@ -4,11 +4,129 @@
 
 package pl.szczodrzynski.edziennik.data.firebase
 
-import pl.szczodrzynski.edziennik.App
+import com.google.gson.JsonParser
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.task.PostNotifications
+import pl.szczodrzynski.edziennik.data.db.entity.Event
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.Notification
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
+import pl.szczodrzynski.edziennik.utils.models.Date
+import pl.szczodrzynski.edziennik.utils.models.Time
 
 class SzkolnyAppFirebase(val app: App, val profiles: List<Profile>, val message: FirebaseService.Message) {
     init {
-
+        run {
+            val type = message.data.getString("type") ?: return@run
+            when (type) {
+                "sharedEvent" -> sharedEvent(
+                        message.data.getString("shareTeamCode") ?: return@run,
+                        message.data.getString("event") ?: return@run,
+                        message.data.getString("message") ?: return@run
+                )
+                "unsharedEvent" -> unsharedEvent(
+                        message.data.getString("unshareTeamCode") ?: return@run,
+                        message.data.getLong("eventId") ?: return@run,
+                        message.data.getString("message") ?: return@run
+                )
+            }
+        }
     }
-}
+
+    private fun sharedEvent(teamCode: String, jsonStr: String, message: String) {
+        val json = JsonParser().parse(jsonStr).asJsonObject
+        val teams = app.db.teamDao().allNow
+        val eventTypes = app.db.eventTypeDao().allNow
+
+        val events = mutableListOf<Event>()
+        val metadataList = mutableListOf<Metadata>()
+        val notificationList = mutableListOf<Notification>()
+
+        teams.filter { it.code == teamCode }.distinctBy { it.profileId }.forEach { team ->
+            val profile = profiles.firstOrNull { it.id == team.profileId }
+            val event = Event(
+                    team.profileId,
+                    json.getLong("id") ?: return,
+                    json.getInt("eventDate")?.let { Date.fromValue(it) } ?: return,
+                    json.getInt("startTime")?.let { Time.fromValue(it) },
+                    json.getString("topic") ?: "",
+                    json.getInt("color") ?: -1,
+                    json.getLong("type") ?: 0,
+                    true,
+                    json.getLong("teacherId") ?: -1,
+                    json.getLong("subjectId") ?: -1,
+                    team.id
+            )
+
+            // TODO? i guess - this comment is here for like a year
+            //val oldEvent: Event? = app.db.eventDao().getByIdNow(profile?.id ?: -1, event.id)
+
+            event.sharedBy = json.getString("sharedBy")
+            event.sharedByName = json.getString("sharedByName")
+            if (profile?.userCode == event.sharedBy) event.sharedBy = "self"
+
+            val metadata = Metadata(
+                    event.profileId,
+                    if (event.type == Event.TYPE_HOMEWORK) Metadata.TYPE_HOMEWORK else Metadata.TYPE_EVENT,
+                    event.id,
+                    false,
+                    true,
+                    json.getLong("addedDate") ?: System.currentTimeMillis()
+            )
+
+            //val eventType = eventTypes.firstOrNull { it.profileId == profile?.id && it.id == event.type }
+
+            /*val text = app.getString(
+                    if (oldEvent == null)
+                        R.string.notification_shared_event_format
+                    else
+                        R.string.notification_shared_event_modified_format,
+                    event.sharedByName,
+                    eventType?.name ?: "wydarzenie",
+                    event.eventDate.formattedString,
+                    event.topic
+            )*/
+            val type = if (event.type == Event.TYPE_HOMEWORK) Notification.TYPE_NEW_SHARED_HOMEWORK else Notification.TYPE_NEW_SHARED_EVENT
+            val notification = Notification(
+                    id = Notification.buildId(event.profileId, type, event.id),
+                    title = app.getNotificationTitle(type),
+                    text = message,
+                    type = type,
+                    profileId = profile?.id,
+                    profileName = profile?.name,
+                    viewId = if (event.type == Event.TYPE_HOMEWORK) MainActivity.DRAWER_ITEM_HOMEWORK else MainActivity.DRAWER_ITEM_AGENDA,
+                    addedDate = metadata.addedDate
+            ).addExtra("eventId", event.id).addExtra("eventDate", event.eventDate.value.toLong())
+
+            events += event
+            metadataList += metadata
+            notificationList += notification
+        }
+        app.db.eventDao().addAll(events)
+        app.db.metadataDao().addAllReplace(metadataList)
+        app.db.notificationDao().addAll(notificationList)
+        PostNotifications(app, notificationList)
+    }
+
+    private fun unsharedEvent(teamCode: String, eventId: Long, message: String) {
+        val teams = app.db.teamDao().allNow
+        val notificationList = mutableListOf<Notification>()
+
+        teams.filter { it.code == teamCode }.distinctBy { it.profileId }.forEach { team ->
+            val profile = profiles.firstOrNull { it.id == team.profileId }
+            val notification = Notification(
+                    id = Notification.buildId(profile?.id ?: 0, Notification.TYPE_REMOVED_SHARED_EVENT, eventId),
+                    title = app.getNotificationTitle(Notification.TYPE_REMOVED_SHARED_EVENT),
+                    text = message,
+                    type = Notification.TYPE_REMOVED_SHARED_EVENT,
+                    profileId = profile?.id,
+                    profileName = profile?.name,
+                    viewId = MainActivity.DRAWER_ITEM_AGENDA
+            )
+            notificationList += notification
+            app.db.eventDao().remove(team.profileId, eventId)
+        }
+        app.db.notificationDao().addAll(notificationList)
+        PostNotifications(app, notificationList)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyLibrusFirebase.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyLibrusFirebase.kt
index 5bb6d1cf..b6baf2bd 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyLibrusFirebase.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyLibrusFirebase.kt
@@ -5,7 +5,7 @@
 package pl.szczodrzynski.edziennik.data.firebase
 
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask
+import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.data.api.task.IApiTask
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.getString
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyMobidziennikFirebase.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyMobidziennikFirebase.kt
index 970cf038..7b2bfd5f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyMobidziennikFirebase.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyMobidziennikFirebase.kt
@@ -9,7 +9,7 @@ import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_ATTENDANCE
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_BEHAVIOUR
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_GRADES
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES
-import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask
+import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.data.api.task.IApiTask
 import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_RECEIVED
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/network/NetworkUtils.java b/app/src/main/java/pl/szczodrzynski/edziennik/network/NetworkUtils.java
index 796925fd..dac636c6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/network/NetworkUtils.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/network/NetworkUtils.java
@@ -22,7 +22,7 @@ public class NetworkUtils {
     public boolean isOnline() {
         assert app != null;
         ConnectivityManager cm =
-                (ConnectivityManager) app.getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
+                (ConnectivityManager) app.getSystemService(Context.CONNECTIVITY_SERVICE);
         assert cm != null;
         NetworkInfo netInfo = cm.getActiveNetworkInfo();
         return netInfo != null && netInfo.isConnectedOrConnecting();
@@ -30,7 +30,7 @@ public class NetworkUtils {
 
     public int checkBackgroundDataRestricted() {
 
-        ConnectivityManager connMgr = (ConnectivityManager) app.getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
+        ConnectivityManager connMgr = (ConnectivityManager) app.getSystemService(Context.CONNECTIVITY_SERVICE);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             assert connMgr != null;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/network/ServerRequest.java b/app/src/main/java/pl/szczodrzynski/edziennik/network/ServerRequest.java
index 4996909a..1b96f175 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/network/ServerRequest.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/network/ServerRequest.java
@@ -29,7 +29,7 @@ public class ServerRequest {
     private String source = "";
 
     public ServerRequest(App app, String url, String source) {
-        this(app, url, source, app.profile);
+        this(app, url, source, App.Companion.getProfile());
     }
 
     public ServerRequest(App app, String url, String source, Profile profileFull) {
@@ -40,7 +40,7 @@ public class ServerRequest {
         this.app = app;
         this.url = url;
         this.params = new ArrayList<>();
-        this.username = (profile != null && profile.getRegistration() == REGISTRATION_ENABLED ? usernameId : app.deviceId);
+        this.username = (profile != null && profile.getRegistration() == REGISTRATION_ENABLED ? usernameId : app.getDeviceId());
         this.source = source;
         if (profile != null && profile.getRegistration() == REGISTRATION_ENABLED) {
             this.setBodyParameter("login_type", Integer.toString(loginStoreType));
@@ -51,7 +51,7 @@ public class ServerRequest {
                 this.setBodyParameter("team_ids", "UI_THREAD");
             }
             else {
-                this.setBodyParameter("team_ids", app.gson.toJson(app.db.teamDao().getAllCodesNow(profile.getId())));
+                this.setBodyParameter("team_ids", app.getGson().toJson(App.db.teamDao().getAllCodesNow(profile.getId())));
             }
         }
     }
@@ -86,15 +86,15 @@ public class ServerRequest {
                 .addParameter("app_version_build_type", BuildConfig.BUILD_TYPE)
                 .addParameter("app_version_code", Integer.toString(BuildConfig.VERSION_CODE))
                 .addParameter("app_version", BuildConfig.VERSION_NAME + " " + BuildConfig.BUILD_TYPE + " (" + BuildConfig.VERSION_CODE + ")")
-                .addParameter("device_id", Settings.Secure.getString(app.getContext().getContentResolver(), Settings.Secure.ANDROID_ID))
+                .addParameter("device_id", Settings.Secure.getString(app.getContentResolver(), Settings.Secure.ANDROID_ID))
                 .addParameter("device_model", Build.MANUFACTURER+" "+Build.MODEL)
                 .addParameter("device_os_version", Build.VERSION.RELEASE)
-                .addParameter("fcm_token", app.config.getSync().getTokenApp())
-                .addParameter("signature", sign(app.signature, timestamp))
+                .addParameter("fcm_token", app.getConfig().getSync().getTokenApp())
+                .addParameter("signature", "TODO")
                 .addParameter("signature_timestamp", timestamp)
                 .addParameter("package_name", "pl.szczodrzynski.edziennik")
                 .addParameter("source", source)
-                .addParameter("update_frequency", app.config.getSync().getEnabled() ? app.config.getSync().getInterval() : -1)
+                .addParameter("update_frequency", app.getConfig().getSync().getEnabled() ? app.getConfig().getSync().getInterval() : -1)
                 .post()
                 .callback(new JsonCallbackHandler() {
                     @Override
@@ -123,15 +123,15 @@ public class ServerRequest {
                 .addParameter("app_version_build_type", BuildConfig.BUILD_TYPE)
                 .addParameter("app_version_code", Integer.toString(BuildConfig.VERSION_CODE))
                 .addParameter("app_version", BuildConfig.VERSION_NAME + " " + BuildConfig.BUILD_TYPE + " (" + BuildConfig.VERSION_CODE + ")")
-                .addParameter("device_id", Settings.Secure.getString(app.getContext().getContentResolver(), Settings.Secure.ANDROID_ID))
+                .addParameter("device_id", Settings.Secure.getString(app.getContentResolver(), Settings.Secure.ANDROID_ID))
                 .addParameter("device_model", Build.MANUFACTURER+" "+Build.MODEL)
                 .addParameter("device_os_version", Build.VERSION.RELEASE)
-                .addParameter("fcm_token", app.config.getSync().getTokenApp())
-                .addParameter("signature", sign(app.signature, timestamp))
+                .addParameter("fcm_token", app.getConfig().getSync().getTokenApp())
+                .addParameter("signature", "TODO")
                 .addParameter("signature_timestamp", timestamp)
                 .addParameter("package_name", "pl.szczodrzynski.edziennik")
                 .addParameter("source", source)
-                .addParameter("update_frequency", app.config.getSync().getEnabled() ? app.config.getSync().getInterval() : -1)
+                .addParameter("update_frequency", app.getConfig().getSync().getEnabled() ? app.getConfig().getSync().getInterval() : -1)
                 .post()
                 .build()
                 .execute();
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/receivers/BootReceiver.java b/app/src/main/java/pl/szczodrzynski/edziennik/receivers/BootReceiver.java
deleted file mode 100644
index 018cd0fe..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/receivers/BootReceiver.java
+++ /dev/null
@@ -1,287 +0,0 @@
-package pl.szczodrzynski.edziennik.receivers;
-
-import android.app.AlarmManager;
-import android.app.DownloadManager;
-import android.app.IntentService;
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.net.Uri;
-import android.os.Build;
-import android.widget.Toast;
-
-import androidx.core.content.FileProvider;
-
-import java.io.File;
-import java.util.List;
-
-import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.network.ServerRequest;
-import pl.szczodrzynski.edziennik.sync.SyncWorker;
-import pl.szczodrzynski.edziennik.utils.Utils;
-
-import static android.content.Context.DOWNLOAD_SERVICE;
-import static pl.szczodrzynski.edziennik.App.APP_URL;
-import static pl.szczodrzynski.edziennik.App.UPDATES_ON_PLAY_STORE;
-
-public class BootReceiver extends BroadcastReceiver {
-
-    private static final int NO_INTERNET_RETRY_TIMEOUT = 60;
-    private static boolean alarmSet = false;
-    public static long update_download_id;
-    public static String update_url;
-    public static String update_filename;
-    private static final String TAG = "receivers.BootReceiver";
-    private App app;
-
-    @Override
-    public void onReceive(final Context context, final Intent intent) {
-        app = (App)context.getApplicationContext();
-        if (intent.getBooleanExtra("ExecutedByAlarm", false))
-        {
-            alarmSet = false;
-        }
-        if (intent.getAction() != null && intent.getAction().equals(DownloadManager.ACTION_DOWNLOAD_COMPLETE))
-        {
-            long referenceId = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1);
-            if(referenceId == update_download_id) {
-                Intent downloadIntent;
-                if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                        if (!app.permissionChecker.canRequestApkInstall()) {
-                            app.permissionChecker.requestApkInstall();
-                            return;
-                        }
-                    }
-                    File fileLocation = new File(app.getContext().getExternalFilesDir(null), update_filename);
-                    Uri apkUri = FileProvider.getUriForFile(app.getContext(), app.getContext().getApplicationContext().getPackageName() + ".provider", fileLocation);
-
-                    downloadIntent = new Intent(Intent.ACTION_VIEW);
-                    downloadIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-                    downloadIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    downloadIntent.setDataAndType(apkUri, "application/vnd.android.package-archive");
-
-                    List<ResolveInfo> resInfoList = app.getContext().getPackageManager().queryIntentActivities(downloadIntent, PackageManager.MATCH_DEFAULT_ONLY);
-                    for (ResolveInfo resolveInfo : resInfoList) {
-                        String packageName = resolveInfo.activityInfo.packageName;
-                        app.getContext().grantUriPermission(packageName, apkUri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION | Intent.FLAG_GRANT_READ_URI_PERMISSION);
-                    }
-
-                } else {
-                    File fileLocation = new File(app.getContext().getExternalFilesDir(null), update_filename);
-                    downloadIntent = new Intent(Intent.ACTION_VIEW);
-                    downloadIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    downloadIntent.setDataAndType(Uri.fromFile(fileLocation), "application/vnd.android.package-archive");
-                }
-                app.getContext().startActivity(downloadIntent);
-            }
-        }
-        else
-        {
-            SyncWorker.Companion.scheduleNext(app, false);
-            if (app.networkUtils.isOnline())
-            {
-                checkUpdate(context, intent);
-            }
-            else
-            {
-                //Toast.makeText(context, "No internet, retrying in "+NO_INTERNET_RETRY_TIMEOUT+" seconds", Toast.LENGTH_SHORT).show();
-                scheduleUpdateCheck(context, NO_INTERNET_RETRY_TIMEOUT);
-            }
-        }
-    }
-
-    private boolean scheduleUpdateCheck(Context context, int secondsLater)
-    {
-        Intent alarmIntent = new Intent(context, BootReceiver.class);
-        alarmIntent.putExtra("ExecutedByAlarm", true);
-        PendingIntent alarmPendingIntent = PendingIntent.getBroadcast(context, 234324243, alarmIntent, 0);
-        AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
-        if (alarmManager != null) {
-            alarmManager.set(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + (secondsLater * 1000), alarmPendingIntent);
-            return true;
-        }
-        return false;
-    }
-
-    private void checkUpdate(final Context context, final Intent intent)
-    {
-        if (!alarmSet) {
-            //Toast.makeText(context, "Update scheduled for 48 hours since now", Toast.LENGTH_SHORT).show();
-            alarmSet = scheduleUpdateCheck(context, 48 * 60 * 60);
-        }
-
-        //app.networkUtils.setSelfSignedSSL(app.getContext(), null);
-
-        new ServerRequest(app, app.requestScheme + APP_URL + "main.php?get_update", "BootReceiver/UPD")
-                .run(((e, result) -> {
-                    if (result != null) {
-                        if (result.get("update_available").getAsBoolean()) {
-                            String updateVersion = result.get("update_version").getAsString();
-                            String updateUrl = result.get("update_url").getAsString();
-                            String updateFilename = result.get("update_filename").getAsString();
-                            boolean updateMandatory = result.get("update_mandatory").getAsBoolean();
-                            boolean updateDirect = result.get("update_direct").getAsBoolean();
-
-                            if (app.appConfig.updateVersion == null || !app.appConfig.updateVersion.equals(updateVersion)) {
-                                app.appConfig.updateVersion = updateVersion;
-                                app.appConfig.updateUrl = updateUrl;
-                                app.appConfig.updateFilename = updateFilename;
-                                app.appConfig.updateMandatory = updateMandatory;
-                                app.appConfig.updateDirect = updateDirect;
-                                app.saveConfig();
-                            }
-                            if (!UPDATES_ON_PLAY_STORE || intent.getBooleanExtra("UserChecked", false)) {
-                                app.notifier.notificationUpdatesShow(
-                                        updateVersion,
-                                        updateUrl,
-                                        updateFilename,
-                                        updateDirect);
-                            }
-                        } else {
-                            if (app.appConfig.updateVersion == null || !app.appConfig.updateVersion.equals("")) {
-                                app.appConfig.updateVersion = "";
-                                app.appConfig.updateMandatory = false;
-                                app.saveConfig();
-                            }
-                            app.notifier.notificationUpdatesHide();
-
-                            if (intent.getBooleanExtra("UserChecked", false)) {
-                                Toast.makeText(context, context.getString(R.string.notification_no_update), Toast.LENGTH_LONG).show();
-                            }
-                        }
-                    }
-                    else
-                    {
-                        //Toast.makeText(context, "Server returned nothing, retrying in "+NO_INTERNET_RETRY_TIMEOUT+" seconds", Toast.LENGTH_SHORT).show();
-                        scheduleUpdateCheck(context, NO_INTERNET_RETRY_TIMEOUT);
-                    }
-                }));
-            /*Ion.with(app.getContext())
-                    .load(app.requestScheme + APP_URL + "main.php?get_update")
-                    .setBodyParameter("username", (app.profile.autoRegistrationAllowed ? app.profile.registrationUsername : app.appConfig.deviceId))
-                    .setBodyParameter("app_version_build_type", BuildConfig.BUILD_TYPE)
-                    .setBodyParameter("app_version_code", Integer.toString(BuildConfig.VERSION_CODE))
-                    .setBodyParameter("app_version", BuildConfig.VERSION_NAME + " " + BuildConfig.BUILD_TYPE + " (" + BuildConfig.VERSION_CODE + ")")
-                    .setBodyParameter("device_id", Settings.Secure.getString(app.getContext().getContentResolver(), Settings.Secure.ANDROID_ID))
-                    .setBodyParameter("device_model", Build.MANUFACTURER+" "+Build.MODEL)
-                    .setBodyParameter("device_os_version", Build.VERSION.RELEASE)
-                    .setBodyParameter("fcm_token", app.appConfig.fcmToken)
-                    .asJsonObject()
-                    .setCallback((e, result) -> {
-                        // do stuff with the result or error
-                        if (result != null) {
-                            if (result.get("update_available").getAsBoolean()) {
-                                String updateVersion = result.get("update_version").getAsString();
-                                String updateUrl = result.get("update_url").getAsString();
-                                String updateFilename = result.get("update_filename").getAsString();
-
-                                if (app.appConfig.updateVersion == null || !app.appConfig.updateVersion.equals(updateVersion)) {
-                                    app.appConfig.updateVersion = updateVersion;
-                                    app.appConfig.updateUrl = updateUrl;
-                                    app.appConfig.updateFilename = updateFilename;
-                                    app.saveConfig();
-                                }
-                                app.notifier.notificationUpdatesShow(
-                                        updateVersion,
-                                        updateUrl,
-                                        updateFilename);
-                            } else {
-                                if (app.appConfig.updateVersion == null || !app.appConfig.updateVersion.equals("")) {
-                                    app.appConfig.updateVersion = "";
-                                    app.saveConfig();
-                                }
-                                app.notifier.notificationUpdatesHide();
-
-                                if (intent.getBooleanExtra("UserChecked", false)) {
-                                    Toast.makeText(context, context.getString(R.string.notification_no_update), Toast.LENGTH_LONG).show();
-                                }
-                            }
-                        }
-                        else
-                        {
-                            //Toast.makeText(context, "Server returned nothing, retrying in "+NO_INTERNET_RETRY_TIMEOUT+" seconds", Toast.LENGTH_SHORT).show();
-                            scheduleUpdateCheck(context, NO_INTERNET_RETRY_TIMEOUT);
-                        }
-                    });*/
-    }
-
-    private static DownloadManager downloadManager;
-
-    public static long downloadFile(Context context) {
-        Toast.makeText(context, R.string.downloading, Toast.LENGTH_SHORT).show();
-        File dir = new File(context.getExternalFilesDir(null)+""/*, update_filename*/);
-        /*if (existingFile.exists())
-        {
-            existingFile.delete();
-        }*/
-        if (dir.isDirectory())
-        {
-            String[] children = dir.list();
-            for (int i = 0; i < children.length; i++)
-            {
-                new File(dir, children[i]).delete();
-            }
-        }
-
-        Uri uri = Uri.parse(update_url);
-        long downloadReference;
-        // Create request for android download manager
-        downloadManager = (DownloadManager)context.getSystemService(DOWNLOAD_SERVICE);
-        DownloadManager.Request request = new DownloadManager.Request(uri);
-        //Setting title of request
-        request.setTitle(context.getString(R.string.app_name));
-        //Setting description of request
-        request.setDescription(context.getString(R.string.notification_downloading_update));
-        //Set the local destination for the downloaded file to a path within the application's external files directory
-        try {
-            request.setDestinationInExternalFilesDir(context, null, update_filename);
-        }
-        catch (java.lang.IllegalStateException e)
-        {
-            e.printStackTrace();
-            Toast.makeText(context, "Failed to get external storage files directory", Toast.LENGTH_SHORT).show();
-        }
-        //Enqueue download and save into referenceId
-        downloadReference = downloadManager.enqueue(request);
-        return downloadReference;
-    }
-
-    public static class NotificationActionService extends IntentService {
-        private static final String TAG = "BootReceiver/NAS";
-
-        public NotificationActionService() {
-            super(NotificationActionService.class.getSimpleName());
-            //IntentFilter filter = new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE);
-            //registerReceiver(downloadReceiver, filter);
-        }
-
-        @Override
-        protected void onHandleIntent(Intent intent) {
-            if (UPDATES_ON_PLAY_STORE && !intent.getBooleanExtra("update_direct", false)) {
-                Utils.openGooglePlay(this, "pl.szczodrzynski.edziennik");
-                return;
-            }
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                App app = (App)getApplication();
-                if (!app.permissionChecker.canRequestApkInstall()) {
-                    app.permissionChecker.requestApkInstall();
-                    app.notifier.notificationUpdatesShow(
-                            intent.getStringExtra("update_version"),
-                            intent.getStringExtra("update_url"),
-                            intent.getStringExtra("update_filename"),
-                            intent.getBooleanExtra("update_direct", false));
-                    return;
-                }
-            }
-            update_url = intent.getStringExtra("update_url");
-            update_filename = intent.getStringExtra("update_filename");
-            //update_filename = "Edziennik_update.apk";
-            update_download_id = downloadFile(this);
-        }
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/receivers/SzkolnyReceiver.kt b/app/src/main/java/pl/szczodrzynski/edziennik/receivers/SzkolnyReceiver.kt
index c6a4cfec..f456bae3 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/receivers/SzkolnyReceiver.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/receivers/SzkolnyReceiver.kt
@@ -8,9 +8,9 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import pl.szczodrzynski.edziennik.data.api.ApiService
+import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.data.api.events.requests.ServiceCloseRequest
 import pl.szczodrzynski.edziennik.data.api.events.requests.TaskCancelRequest
-import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask
 
 class SzkolnyReceiver : BroadcastReceiver() {
     companion object {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/sync/SyncWorker.kt b/app/src/main/java/pl/szczodrzynski/edziennik/sync/SyncWorker.kt
index 65e46ce1..05a03fbc 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/sync/SyncWorker.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/sync/SyncWorker.kt
@@ -2,13 +2,9 @@ package pl.szczodrzynski.edziennik.sync
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.os.AsyncTask
 import androidx.work.*
-import androidx.work.impl.WorkManagerImpl
-import org.greenrobot.eventbus.EventBus
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.MINUTE
-import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask
+import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.formatDate
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import java.util.concurrent.TimeUnit
@@ -22,35 +18,8 @@ class SyncWorker(val context: Context, val params: WorkerParameters) : Worker(co
          */
         @SuppressLint("RestrictedApi")
         fun scheduleNext(app: App, rescheduleIfFailedFound: Boolean = true) {
-            AsyncTask.execute {
-                val workManager = WorkManager.getInstance(app) as WorkManagerImpl
-                val scheduledWork = workManager.workDatabase.workSpecDao().scheduledWork
-                scheduledWork.forEach {
-                    d(TAG, "Work: ${it.id} at ${(it.periodStartTime+it.initialDelay).formatDate()}. State = ${it.state} (finished = ${it.state.isFinished})")
-                }
-                // remove finished work and other than SyncWorker
-                scheduledWork.removeAll { it.workerClassName != SyncWorker::class.java.canonicalName || it.isPeriodic || it.state.isFinished }
-                d(TAG, "Found ${scheduledWork.size} unfinished work")
-                // remove all enqueued work that had to (but didn't) run at some point in the past (at least 1min ago)
-                val failedWork = scheduledWork.filter { it.state == WorkInfo.State.ENQUEUED && it.periodStartTime+it.initialDelay < System.currentTimeMillis() - 1*MINUTE*1000 }
-                d(TAG, "${failedWork.size} work requests failed to start (out of ${scheduledWork.size} requests)")
-                if (rescheduleIfFailedFound) {
-                    if (failedWork.isNotEmpty()) {
-                        d(TAG, "App Manager detected!")
-                        EventBus.getDefault().postSticky(AppManagerDetectedEvent(failedWork.map { it.periodStartTime + it.initialDelay }))
-                    }
-                    if (scheduledWork.size - failedWork.size < 1) {
-                        d(TAG, "No pending work found, scheduling next:")
-                        rescheduleNext(app)
-                    }
-                }
-                else {
-                    d(TAG, "NOT rescheduling: waiting to open the activity")
-                    if (scheduledWork.size < 1) {
-                        d(TAG, "No work found *at all*, scheduling next:")
-                        rescheduleNext(app)
-                    }
-                }
+            WorkerUtils.scheduleNext(app, rescheduleIfFailedFound) {
+                rescheduleNext(app)
             }
         }
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/sync/UpdateDownloaderService.kt b/app/src/main/java/pl/szczodrzynski/edziennik/sync/UpdateDownloaderService.kt
new file mode 100644
index 00000000..cce045d7
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/sync/UpdateDownloaderService.kt
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-1-18.
+ */
+
+package pl.szczodrzynski.edziennik.sync
+
+import android.app.DownloadManager
+import android.app.IntentService
+import android.app.NotificationManager
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Build
+import android.widget.Toast
+import androidx.core.content.FileProvider
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.data.api.szkolny.response.Update
+import pl.szczodrzynski.edziennik.utils.Utils
+import java.io.File
+
+class UpdateDownloaderService : IntentService(UpdateDownloaderService::class.java.simpleName) {
+    companion object {
+        private const val TAG = "UpdateDownloaderService"
+        private var downloadId = 0L
+        private var downloadFilename = ""
+    }
+
+    private fun tryUpdateWithGooglePlay(update: Update): Boolean {
+        if (!update.isOnGooglePlay)
+            return false
+        return try {
+            Utils.openGooglePlay(this, application.packageName)
+            true
+        }
+        catch (e: Exception) {
+            e.printStackTrace()
+            false
+        }
+    }
+
+    class DownloadProgressReceiver : BroadcastReceiver() {
+        override fun onReceive(context: Context, intent: Intent?) {
+            if (intent?.action != DownloadManager.ACTION_DOWNLOAD_COMPLETE)
+                return
+            if (intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) != downloadId)
+                return
+            val app = context.applicationContext as App
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !app.permissionChecker.canRequestApkInstall()) {
+                app.permissionChecker.requestApkInstall()
+                return
+            }
+
+            val file = File(app.getExternalFilesDir(null), downloadFilename)
+            val installIntent = Intent(Intent.ACTION_VIEW)
+            installIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            installIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            installIntent.setDataAndType(Uri.fromFile(file), "application/vnd.android.package-archive")
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                val apkUri = FileProvider.getUriForFile(app, "${app.packageName}.provider", file)
+                installIntent.setDataAndType(apkUri, "application/vnd.android.package-archive")
+
+                val resInfoList = app.packageManager.queryIntentActivities(installIntent, PackageManager.MATCH_DEFAULT_ONLY)
+                for (resolveInfo in resInfoList) {
+                    val packageName = resolveInfo.activityInfo.packageName
+                    app.grantUriPermission(packageName, apkUri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION or Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                }
+            }
+
+            app.startActivity(installIntent)
+        }
+    }
+
+    override fun onHandleIntent(intent: Intent?) {
+        val app = application as App
+        val update = App.config.update ?: return
+
+        if (tryUpdateWithGooglePlay(update))
+            return
+
+        if (update.downloadUrl == null) {
+            Toast.makeText(app, "Nie można pobrać tej aktualizacji. Pobierz ręcznie z Google Play.", Toast.LENGTH_LONG).show()
+            return
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !app.permissionChecker.canRequestApkInstall()) {
+            app.permissionChecker.requestApkInstall()
+            return
+        }
+
+        (app.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).cancel(app.notifications.updatesId)
+
+        val dir: File? = app.getExternalFilesDir(null)
+        if (dir?.isDirectory == true) {
+            dir.listFiles()?.forEach {
+                it.delete()
+            }
+        }
+
+        val uri = Uri.parse(update.downloadUrl)
+        downloadFilename = "${update.versionName}.apk"
+
+        val downloadManager = app.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
+        val request = DownloadManager.Request(uri)
+        request.setTitle(app.getString(R.string.app_name)+" "+update.versionName)
+        request.setDescription(app.getString(R.string.notification_downloading_update))
+        try {
+            request.setDestinationInExternalFilesDir(app, null, downloadFilename)
+        } catch (e: IllegalStateException) {
+            e.printStackTrace()
+            Toast.makeText(app, "Nie można znaleźć katalogu docelowego. Pobierz aktualizację ręcznie z Google Play.", Toast.LENGTH_LONG).show()
+            return
+        }
+        downloadId = downloadManager.enqueue(request)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/sync/UpdateWorker.kt b/app/src/main/java/pl/szczodrzynski/edziennik/sync/UpdateWorker.kt
new file mode 100644
index 00000000..bad9a7d3
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/sync/UpdateWorker.kt
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-1-18.
+ */
+
+package pl.szczodrzynski.edziennik.sync
+
+import android.annotation.SuppressLint
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.text.Html
+import androidx.core.app.NotificationCompat
+import androidx.work.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
+import pl.szczodrzynski.edziennik.utils.Utils
+import java.util.concurrent.TimeUnit
+import kotlin.coroutines.CoroutineContext
+
+class UpdateWorker(val context: Context, val params: WorkerParameters) : Worker(context, params), CoroutineScope {
+    companion object {
+        const val TAG = "UpdateWorker"
+
+        /**
+         * Schedule the sync job only if it's not already scheduled.
+         */
+        @SuppressLint("RestrictedApi")
+        fun scheduleNext(app: App, rescheduleIfFailedFound: Boolean = true) {
+            WorkerUtils.scheduleNext(app, rescheduleIfFailedFound) {
+                rescheduleNext(app)
+            }
+        }
+
+        /**
+         * Cancel any existing sync jobs and schedule a new one.
+         *
+         * If [ConfigSync.enabled] is not true, just cancel every job.
+         */
+        fun rescheduleNext(app: App) {
+            cancelNext(app)
+            if (!app.config.sync.notifyAboutUpdates) {
+                return
+            }
+            val syncInterval = 4 * DAY;
+
+            val syncAt = System.currentTimeMillis() + syncInterval*1000
+            Utils.d(TAG, "Scheduling work at ${syncAt.formatDate()}")
+
+            val constraints = Constraints.Builder()
+                    .setRequiredNetworkType(NetworkType.CONNECTED)
+                    .build()
+
+            val syncWorkRequest = OneTimeWorkRequestBuilder<UpdateWorker>()
+                    .setInitialDelay(syncInterval, TimeUnit.SECONDS)
+                    .setConstraints(constraints)
+                    .addTag(TAG)
+                    .build()
+
+            WorkManager.getInstance(app).enqueue(syncWorkRequest)
+        }
+
+        /**
+         * Cancel any scheduled sync job.
+         */
+        fun cancelNext(app: App) {
+            Utils.d(TAG, "Cancelling work by tag $TAG")
+            WorkManager.getInstance(app).cancelAllWorkByTag(TAG)
+        }
+
+        fun runNow(app: App) {
+            try {
+                val api = SzkolnyApi(app)
+                val response = api.getUpdate()
+                if (response?.success != true)
+                    return
+                val updates = response.data
+                if (updates?.isNotEmpty() != true)
+                    return
+                val update = updates[0]
+
+                app.config.update = update
+
+                val notificationIntent = Intent(app, UpdateDownloaderService::class.java)
+                val pendingIntent = PendingIntent.getService(app, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+                val notification = NotificationCompat.Builder(app, app.notifications.updatesKey)
+                        .setContentTitle(app.getString(R.string.notification_updates_title))
+                        .setContentText(app.getString(R.string.notification_updates_text, update.versionName))
+                        .setTicker(app.getString(R.string.notification_updates_summary))
+                        .setSmallIcon(R.drawable.ic_notification)
+                        .setStyle(NotificationCompat.BigTextStyle()
+                                .bigText(listOf(
+                                        app.getString(R.string.notification_updates_text, update.versionName),
+                                        update.releaseNotes?.let { Html.fromHtml(it) }
+                                ).concat("\n")))
+                        .setColor(0xff2196f3.toInt())
+                        .setLights(0xFF00FFFF.toInt(), 2000, 2000)
+                        .setPriority(NotificationCompat.PRIORITY_HIGH)
+                        .setDefaults(NotificationCompat.DEFAULT_ALL)
+                        .setGroup(app.notifications.updatesKey)
+                        .setContentIntent(pendingIntent)
+                        .setAutoCancel(false)
+                        .build()
+                (app.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).notify(app.notifications.updatesId, notification)
+
+            } catch (ignore: Exception) { }
+        }
+    }
+
+    private val job = Job()
+    override val coroutineContext: CoroutineContext
+        get() = job + Dispatchers.Default
+
+    override fun doWork(): Result {
+        Utils.d(TAG, "Running worker ID ${params.id}")
+        val app = context as App
+        if (!app.config.sync.notifyAboutUpdates) {
+            return Result.success()
+        }
+
+        launch {
+            runNow(app)
+        }
+
+        rescheduleNext(this.context)
+        return Result.success()
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/sync/WorkerUtils.kt b/app/src/main/java/pl/szczodrzynski/edziennik/sync/WorkerUtils.kt
new file mode 100644
index 00000000..0eaa65eb
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/sync/WorkerUtils.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-1-18.
+ */
+
+package pl.szczodrzynski.edziennik.sync
+
+import android.annotation.SuppressLint
+import android.os.AsyncTask
+import androidx.work.WorkInfo
+import androidx.work.WorkManager
+import androidx.work.impl.WorkManagerImpl
+import org.greenrobot.eventbus.EventBus
+import pl.szczodrzynski.edziennik.App
+import pl.szczodrzynski.edziennik.MINUTE
+import pl.szczodrzynski.edziennik.formatDate
+import pl.szczodrzynski.edziennik.utils.Utils
+
+object WorkerUtils {
+    /**
+     * Schedule the sync job only if it's not already scheduled.
+     */
+    @SuppressLint("RestrictedApi")
+    inline fun scheduleNext(app: App, rescheduleIfFailedFound: Boolean = true, crossinline onReschedule: () -> Unit) {
+        AsyncTask.execute {
+            val workManager = WorkManager.getInstance(app) as WorkManagerImpl
+            val scheduledWork = workManager.workDatabase.workSpecDao().scheduledWork
+            scheduledWork.forEach {
+                Utils.d("WorkerUtils", "Work: ${it.id} at ${(it.periodStartTime + it.initialDelay).formatDate()}. State = ${it.state} (finished = ${it.state.isFinished})")
+            }
+            // remove finished work and other than SyncWorker
+            scheduledWork.removeAll { it.workerClassName != SyncWorker::class.java.canonicalName || it.isPeriodic || it.state.isFinished }
+            Utils.d("WorkerUtils", "Found ${scheduledWork.size} unfinished work")
+            // remove all enqueued work that had to (but didn't) run at some point in the past (at least 1min ago)
+            val failedWork = scheduledWork.filter { it.state == WorkInfo.State.ENQUEUED && it.periodStartTime + it.initialDelay < System.currentTimeMillis() - 1 * MINUTE * 1000 }
+            Utils.d("WorkerUtils", "${failedWork.size} work requests failed to start (out of ${scheduledWork.size} requests)")
+            if (rescheduleIfFailedFound) {
+                if (failedWork.isNotEmpty()) {
+                    Utils.d("WorkerUtils", "App Manager detected!")
+                    EventBus.getDefault().postSticky(AppManagerDetectedEvent(failedWork.map { it.periodStartTime + it.initialDelay }))
+                }
+                if (scheduledWork.size - failedWork.size < 1) {
+                    Utils.d("WorkerUtils", "No pending work found, scheduling next:")
+                    onReschedule()
+                }
+            } else {
+                Utils.d("WorkerUtils", "NOT rescheduling: waiting to open the activity")
+                if (scheduledWork.size < 1) {
+                    Utils.d("WorkerUtils", "No work found *at all*, scheduling next:")
+                    onReschedule()
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/changelog/ChangelogDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/changelog/ChangelogDialog.kt
index 98991065..9137e882 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/changelog/ChangelogDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/changelog/ChangelogDialog.kt
@@ -44,7 +44,7 @@ class ChangelogDialog(
 
         val text = app.assets.open("pl-changelog.html").bufferedReader().use {
             it.readText()
-        }
+        }.replace("<li>", "<br><li> - ")
         textView.text = Html.fromHtml(text)
 
         val scrollView = ScrollView(activity)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialog.kt
index edabd09c..318fd8f9 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialog.kt
@@ -21,13 +21,8 @@ import kotlinx.coroutines.*
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_AGENDA
 import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
-import pl.szczodrzynski.edziennik.data.db.entity.Event
+import pl.szczodrzynski.edziennik.data.db.entity.*
 import pl.szczodrzynski.edziennik.data.db.full.EventFull
-import pl.szczodrzynski.edziennik.data.db.entity.EventType
-import pl.szczodrzynski.edziennik.data.db.entity.Metadata
-import pl.szczodrzynski.edziennik.data.db.entity.Subject
-import pl.szczodrzynski.edziennik.data.db.entity.Team
-import pl.szczodrzynski.edziennik.data.db.entity.Lesson
 import pl.szczodrzynski.edziennik.data.db.full.LessonFull
 import pl.szczodrzynski.edziennik.databinding.DialogEventManualV2Binding
 import pl.szczodrzynski.edziennik.utils.Anim
@@ -43,7 +38,7 @@ class EventManualDialog(
         val defaultLesson: LessonFull? = null,
         val defaultDate: Date? = null,
         val defaultTime: Time? = null,
-        val defaultType: Int? = null,
+        val defaultType: Long? = null,
         val editingEvent: EventFull? = null,
         val onShowListener: ((tag: String) -> Unit)? = null,
         val onDismissListener: ((tag: String) -> Unit)? = null
@@ -149,7 +144,7 @@ class EventManualDialog(
             else -> R.string.dialog_event_manual_share_first_notice
         }
 
-        b.shareDetails.setText(text)
+        b.shareDetails.setText(text, event.sharedByName ?: "")
     }
 
     private fun loadLists() { launch {
@@ -588,8 +583,7 @@ class EventManualDialog(
                 startTime,
                 topic,
                 customColor ?: -1,
-                type?.toInt()
-                        ?: Event.TYPE_DEFAULT,
+                type ?: Event.TYPE_DEFAULT,
                 true,
                 teacherId ?: -1,
                 subjectId ?: -1,
@@ -598,7 +592,7 @@ class EventManualDialog(
 
         val metadataObject = Metadata(
                 profileId,
-                when (type?.toInt()) {
+                when (type) {
                     Event.TYPE_HOMEWORK -> Metadata.TYPE_HOMEWORK
                     else -> Metadata.TYPE_EVENT
                 },
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradeDetailsDialog.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradeDetailsDialog.java
index 898e297d..0c05be7a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradeDetailsDialog.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradeDetailsDialog.java
@@ -32,7 +32,7 @@ public class GradeDetailsDialog {
 
     public GradeDetailsDialog(Context context) {
         this.context = context;
-        this.profileId = App.profileId;
+        this.profileId = App.Companion.getProfileId();
     }
     public GradeDetailsDialog(Context context, int profileId) {
         this.context = context;
@@ -74,7 +74,7 @@ public class GradeDetailsDialog {
         b.setGrade(grade);
 
         int gradeColor;
-        if (App.getConfig().getFor(profileId).getGrades().getColorMode() == COLOR_MODE_DEFAULT) {
+        if (App.Companion.getConfig().getFor(profileId).getGrades().getColorMode() == COLOR_MODE_DEFAULT) {
             gradeColor = grade.color;
         }
         else {
@@ -103,7 +103,7 @@ public class GradeDetailsDialog {
 
         b.setCommentVisible(false);
 
-        b.setDevMode(App.devMode);
+        b.setDevMode(App.Companion.getDevMode());
 
         b.gradeName.setTextColor(ColorUtils.calculateLuminance(gradeColor) > 0.25 ? 0xff000000 : 0xffffffff);
         b.gradeName.getBackground().setColorFilter(new PorterDuffColorFilter(gradeColor, PorterDuff.Mode.MULTIPLY));
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/lessonchange/LessonChangeDialog.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/lessonchange/LessonChangeDialog.java
index d3815fd4..e9fe7f21 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/lessonchange/LessonChangeDialog.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/lessonchange/LessonChangeDialog.java
@@ -19,7 +19,7 @@ public class LessonChangeDialog {
 
     public LessonChangeDialog(Context context) {
         this.context = context;
-        this.profileId = App.profileId;
+        this.profileId = App.Companion.getProfileId();
     }
     public LessonChangeDialog(Context context, int profileId) {
         this.context = context;
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 ae47d7a9..4edb5c58 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
@@ -12,8 +12,6 @@ import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.databinding.DialogLessonDetailsBinding
-import pl.szczodrzynski.edziennik.utils.models.Notification
-import java.util.*
 import kotlin.coroutines.CoroutineContext
 
 class ProfileRemoveDialog(
@@ -52,26 +50,35 @@ class ProfileRemoveDialog(
             val profileObject = app.db.profileDao().getByIdNow(profileId) ?: return@async
             app.db.announcementDao().clear(profileId)
             app.db.attendanceDao().clear(profileId)
-            app.db.eventDao().clear(profileId)
-            app.db.eventTypeDao().clear(profileId)
-            app.db.gradeDao().clear(profileId)
-            app.db.gradeCategoryDao().clear(profileId)
-            app.db.luckyNumberDao().clear(profileId)
-            app.db.noticeDao().clear(profileId)
-            app.db.subjectDao().clear(profileId)
-            app.db.teacherDao().clear(profileId)
-            app.db.teamDao().clear(profileId)
-            app.db.messageRecipientDao().clear(profileId)
-            app.db.messageDao().clear(profileId)
-            app.db.endpointTimerDao().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)
+            app.db.gradeCategoryDao().clear(profileId)
+            app.db.gradeDao().clear(profileId)
             app.db.lessonRangeDao().clear(profileId)
+            app.db.librusLessonDao().clear(profileId)
+            app.db.luckyNumberDao().clear(profileId)
+            app.db.messageDao().clear(profileId)
+            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)
 
+            val homeCards = app.config.ui.homeCards.toMutableList()
+            homeCards.removeAll { it.profileId == profileId }
+            app.config.ui.homeCards = homeCards
+
             val loginStoreId = profileObject.loginStoreId
             val profilesUsingLoginStore = app.db.profileDao().getIdsByLoginStoreIdNow(loginStoreId)
             if (profilesUsingLoginStore.size == 1) {
@@ -80,18 +87,9 @@ class ProfileRemoveDialog(
             app.db.profileDao().remove(profileId)
             app.db.metadataDao().deleteAll(profileId)
 
-            val toRemove = ArrayList<Notification>()
-            for (notification in app.appConfig.notifications) {
-                if (notification.profileId == profileId) {
-                    toRemove.add(notification)
-                }
+            if (App.profileId == profileId) {
+                app.profileLoadLast { }
             }
-            app.appConfig.notifications.removeAll(toRemove)
-
-            app.profile = null
-            App.profileId = -1
-
-            app.profileLoadById(app.profileLastId())
         }
         deferred.await()
         dialog.dismiss()
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncViewListDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncViewListDialog.kt
index c8c92407..b9cbd0a0 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncViewListDialog.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncViewListDialog.kt
@@ -12,7 +12,7 @@ import kotlinx.coroutines.Job
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask
+import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.databinding.DialogLessonDetailsBinding
 import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesFragment
 import kotlin.coroutines.CoroutineContext
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 c89fe688..dc50eafb 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
@@ -77,6 +77,9 @@ class LessonDetailsDialog(
             )
         }
 
+        if (App.devMode)
+            b.lessonId.visibility = View.VISIBLE
+
         update()
     }}
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.java
index e761d4cd..95dc1beb 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.java
@@ -78,10 +78,10 @@ public class AgendaFragment extends Fragment {
             return null;
         app = (App) activity.getApplication();
         getContext().getTheme().applyStyle(Themes.INSTANCE.getAppTheme(), true);
-        if (app.profile == null)
+        if (app.getProfile() == null)
             return inflater.inflate(R.layout.fragment_loading, container, false);
         // activity, context and profile is valid
-        viewType = app.config.getUi().getAgendaViewType();
+        viewType = app.getConfig().forProfile().getUi().getAgendaViewType();
         if (viewType == AGENDA_DEFAULT) {
             b_default = DataBindingUtil.inflate(inflater, R.layout.fragment_agenda_default, container, false);
             return b_default.getRoot();
@@ -94,7 +94,7 @@ public class AgendaFragment extends Fragment {
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        if (app == null || app.profile == null || activity == null || (b_default == null && b_calendar == null) || !isAdded())
+        if (app == null || activity == null || b_default == null && b_calendar == null || !isAdded())
             return;
 
         activity.getBottomSheet().prependItems(
@@ -106,7 +106,7 @@ public class AgendaFragment extends Fragment {
                             activity.getBottomSheet().close();
                             new EventManualDialog(
                                     activity,
-                                    App.profileId,
+                                    App.Companion.getProfileId(),
                                     null,
                                     actualDate,
                                     null,
@@ -122,7 +122,7 @@ public class AgendaFragment extends Fragment {
                         .withOnClickListener(v3 -> {
                             activity.getBottomSheet().close();
                             viewType = viewType == AGENDA_DEFAULT ? AGENDA_CALENDAR : AGENDA_DEFAULT;
-                            app.config.getUi().setAgendaViewType(viewType);
+                            app.getConfig().forProfile().getUi().setAgendaViewType(viewType);
                             activity.reloadTarget();
                         }),
                 new BottomSheetSeparatorItem(true),
@@ -131,7 +131,7 @@ public class AgendaFragment extends Fragment {
                         .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline)
                         .withOnClickListener(v3 -> {
                             activity.getBottomSheet().close();
-                            AsyncTask.execute(() -> app.db.metadataDao().setAllSeen(App.profileId, TYPE_EVENT, true));
+                            AsyncTask.execute(() -> App.db.metadataDao().setAllSeen(App.Companion.getProfileId(), TYPE_EVENT, true));
                             Toast.makeText(activity, R.string.main_menu_mark_as_read_success, Toast.LENGTH_SHORT).show();
                         })
         );
@@ -141,7 +141,7 @@ public class AgendaFragment extends Fragment {
         activity.getNavView().bottomBar.setFabIcon(CommunityMaterial.Icon2.cmd_plus);
         activity.getNavView().setFabOnClickListener(v -> new EventManualDialog(
                 activity,
-                App.profileId,
+                App.Companion.getProfileId(),
                 null,
                 actualDate,
                 null,
@@ -167,7 +167,7 @@ public class AgendaFragment extends Fragment {
 
         final Handler handler = new Handler();
         handler.postDelayed(() -> AsyncTask.execute(() -> {
-            if (app == null || app.profile == null || activity == null || b_default == null || !isAdded())
+            if (app == null || activity == null || b_default == null || !isAdded())
                 return;
 
             List<CalendarEvent> eventList = new ArrayList<>();
@@ -193,8 +193,8 @@ public class AgendaFragment extends Fragment {
                 ));
             } TODO: Implement new timetable lesson changes */
 
-            if (app.profile.getStudentData("showTeacherAbsences", true)) {
-                List<TeacherAbsenceFull> teacherAbsenceList = app.db.teacherAbsenceDao().getAllFullNow(App.profileId);
+            if (app.getProfile().getStudentData("showTeacherAbsences", true)) {
+                List<TeacherAbsenceFull> teacherAbsenceList = App.db.teacherAbsenceDao().getAllFullNow(App.Companion.getProfileId());
                 List<TeacherAbsenceCounter> teacherAbsenceCounters = new ArrayList<>();
 
                 for (TeacherAbsenceFull absence : teacherAbsenceList) {
@@ -226,7 +226,7 @@ public class AgendaFragment extends Fragment {
                             Colors.legibleTextColor(0xffff1744),
                             startTime,
                             endTime,
-                            App.profileId,
+                            App.Companion.getProfileId(),
                             date,
                             counter.getTeacherAbsenceCount()
                     ));
@@ -234,7 +234,7 @@ public class AgendaFragment extends Fragment {
             }
 
 
-            List<EventFull> events = app.db.eventDao().getAllNow(App.profileId);
+            List<EventFull> events = App.db.eventDao().getAllNow(App.Companion.getProfileId());
             for (EventFull event : events) {
                 Calendar startTime = Calendar.getInstance();
                 Calendar endTime = Calendar.getInstance();
@@ -321,7 +321,7 @@ public class AgendaFragment extends Fragment {
                         actualDate = Date.fromCalendar(calendar);
                         int scrolledDate = actualDate.getValue();
                         if (unreadEventDates.contains(scrolledDate)) {
-                            AsyncTask.execute(() -> app.db.eventDao().setSeenByDate(App.profileId, Date.fromYmd(intToStr(scrolledDate)), true));
+                            AsyncTask.execute(() -> App.db.eventDao().setSeenByDate(App.Companion.getProfileId(), Date.fromYmd(intToStr(scrolledDate)), true));
                             unreadEventDates.remove((Integer) scrolledDate);
                         }
                     }
@@ -342,7 +342,7 @@ public class AgendaFragment extends Fragment {
                                 // new EventListDialogOld(activity).show(app, Date.fromCalendar(calendarEvent.getInstanceDay()));
                             new DayDialog(
                                     activity,
-                                    App.profileId,
+                                    App.Companion.getProfileId(),
                                     Date.fromCalendar(calendarEvent.getInstanceDay()),
                                     null,
                                     null
@@ -373,7 +373,7 @@ public class AgendaFragment extends Fragment {
 
         final Handler handler = new Handler();
         handler.postDelayed(() -> AsyncTask.execute(() -> {
-            if (app == null || app.profile == null || activity == null || b_calendar == null || !isAdded())
+            if (app == null || activity == null || b_calendar == null || !isAdded())
                 return;
             Context c = getContext();
             Activity a = getActivity();
@@ -385,7 +385,7 @@ public class AgendaFragment extends Fragment {
 
             List<EventDay> eventList = new ArrayList<>();
 
-            List<EventFull> events = app.db.eventDao().getAllNow(App.profileId);
+            List<EventFull> events = App.db.eventDao().getAllNow(App.Companion.getProfileId());
             for (EventFull event : events) {
                 if (event.eventDate == null)
                     continue;
@@ -434,13 +434,13 @@ public class AgendaFragment extends Fragment {
                     Date dayDate = Date.fromCalendar(eventDay.getCalendar());
                     int scrolledDate = dayDate.getValue();
                     if (unreadEventDates.contains(scrolledDate)) {
-                        AsyncTask.execute(() -> app.db.eventDao().setSeenByDate(App.profileId, Date.fromYmd(intToStr(scrolledDate)), true));
+                        AsyncTask.execute(() -> App.db.eventDao().setSeenByDate(App.Companion.getProfileId(), Date.fromYmd(intToStr(scrolledDate)), true));
                         unreadEventDates.remove((Integer) scrolledDate);
                     }
 
                     new DayDialog(
                             activity,
-                            App.profileId,
+                            App.Companion.getProfileId(),
                             dayDate,
                             null,
                             null
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsFragment.java
index 513aaa95..c9e74c8d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsFragment.java
@@ -24,8 +24,8 @@ import org.greenrobot.eventbus.ThreadMode;
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.MainActivity;
 import pl.szczodrzynski.edziennik.R;
+import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask;
 import pl.szczodrzynski.edziennik.data.api.events.AnnouncementGetEvent;
-import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask;
 import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull;
 import pl.szczodrzynski.edziennik.databinding.DialogAnnouncementBinding;
 import pl.szczodrzynski.edziennik.databinding.FragmentAnnouncementsBinding;
@@ -49,8 +49,6 @@ public class AnnouncementsFragment extends Fragment {
             return null;
         app = (App) activity.getApplication();
         getContext().getTheme().applyStyle(Themes.INSTANCE.getAppTheme(), true);
-        if (app.profile == null)
-            return inflater.inflate(R.layout.fragment_loading, container, false);
         // activity, context and profile is valid
         b = DataBindingUtil.inflate(inflater, R.layout.fragment_announcements, container, false);
         b.refreshLayout.setParent(activity.getSwipeRefreshLayout());
@@ -61,7 +59,7 @@ public class AnnouncementsFragment extends Fragment {
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        if (app == null || app.profile == null || activity == null || b == null || !isAdded())
+        if (app == null || activity == null || b == null || !isAdded())
             return;
 
         activity.getBottomSheet().prependItems(
@@ -70,10 +68,10 @@ public class AnnouncementsFragment extends Fragment {
                         .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline)
                         .withOnClickListener(v3 -> {
                             activity.getBottomSheet().close();
-                            if (app.profile.getLoginStoreType() == LOGIN_TYPE_LIBRUS) {
-                                EdziennikTask.Companion.announcementsRead(App.profileId).enqueue(requireContext());
+                            if (app.getProfile().getLoginStoreType() == LOGIN_TYPE_LIBRUS) {
+                                EdziennikTask.Companion.announcementsRead(App.Companion.getProfileId()).enqueue(requireContext());
                             } else {
-                                AsyncTask.execute(() -> app.db.metadataDao().setAllSeen(App.profileId, TYPE_ANNOUNCEMENT, true));
+                                AsyncTask.execute(() -> App.db.metadataDao().setAllSeen(App.Companion.getProfileId(), TYPE_ANNOUNCEMENT, true));
                                 Toast.makeText(activity, R.string.main_menu_mark_as_read_success, Toast.LENGTH_SHORT).show();
                             }
                         })
@@ -92,8 +90,8 @@ public class AnnouncementsFragment extends Fragment {
         recyclerView.setLayoutManager(linearLayoutManager);
         recyclerView.addItemDecoration(new SimpleDividerItemDecoration(view.getContext()));
 
-        app.db.announcementDao().getAll(App.profileId).observe(this, announcements -> {
-            if (app == null || app.profile == null || activity == null || b == null || !isAdded())
+        app.db.announcementDao().getAll(App.Companion.getProfileId()).observe(this, announcements -> {
+            if (app == null || activity == null || b == null || !isAdded())
                 return;
 
             if (announcements == null) {
@@ -109,8 +107,8 @@ public class AnnouncementsFragment extends Fragment {
                     return;
                 }*/
                 AnnouncementsAdapter announcementsAdapter = new AnnouncementsAdapter(activity, announcements, (v, announcement) -> {
-                    if (announcement.text == null || (app.profile.getLoginStoreType() == LOGIN_TYPE_LIBRUS && !announcement.seen && app.networkUtils.isOnline())) {
-                        EdziennikTask.Companion.announcementGet(App.profileId, announcement).enqueue(requireContext());
+                    if (announcement.text == null || (app.getProfile().getLoginStoreType() == LOGIN_TYPE_LIBRUS && !announcement.seen && app.getNetworkUtils().isOnline())) {
+                        EdziennikTask.Companion.announcementGet(App.Companion.getProfileId(), announcement).enqueue(requireContext());
                     } else {
                         showAnnouncementDetailsDialog(announcement);
                     }
@@ -157,9 +155,9 @@ public class AnnouncementsFragment extends Fragment {
                 .show();
         DialogAnnouncementBinding b = DialogAnnouncementBinding.bind(dialog.getCustomView());
         b.text.setText(announcement.teacherFullName+"\n\n"+ (announcement.startDate != null ? announcement.startDate.getFormattedString() : "-") + (announcement.endDate != null ? " do " + announcement.endDate.getFormattedString() : "")+"\n\n" +announcement.text);
-        if (!announcement.seen && app.profile.getLoginStoreType() != LOGIN_TYPE_LIBRUS) {
+        if (!announcement.seen && app.getProfile().getLoginStoreType() != LOGIN_TYPE_LIBRUS) {
             announcement.seen = true;
-            AsyncTask.execute(() -> app.db.metadataDao().setSeen(App.profileId, announcement, true));
+            AsyncTask.execute(() -> App.db.metadataDao().setSeen(App.Companion.getProfileId(), announcement, true));
             if (recyclerView.getAdapter() != null)
                 recyclerView.getAdapter().notifyDataSetChanged();
         }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceAdapter.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceAdapter.java
index 0b208e8a..7b057395 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceAdapter.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceAdapter.java
@@ -97,7 +97,7 @@ public class AttendanceAdapter extends RecyclerView.Adapter<AttendanceAdapter.Vi
             holder.attendanceLessonTopic.getBackground().setColorFilter(new PorterDuffColorFilter(0x692196f3, PorterDuff.Mode.MULTIPLY));
             attendance.seen = true;
             AsyncTask.execute(() -> {
-                app.db.metadataDao().setSeen(App.profileId, attendance, true);
+                App.db.metadataDao().setSeen(App.Companion.getProfileId(), attendance, true);
                 //Intent i = new Intent("android.intent.action.MAIN").putExtra(MainActivity.ACTION_UPDATE_BADGES, "yes, sure");
                 //context.sendBroadcast(i);
             });
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.java
index 4ad01312..a149bcc1 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.java
@@ -33,8 +33,8 @@ import antonkozyriatskyi.circularprogressindicator.CircularProgressIndicator;
 import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.MainActivity;
 import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull;
 import pl.szczodrzynski.edziennik.data.db.entity.Subject;
+import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull;
 import pl.szczodrzynski.edziennik.databinding.FragmentAttendanceBinding;
 import pl.szczodrzynski.edziennik.utils.Themes;
 import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem;
@@ -73,8 +73,6 @@ public class AttendanceFragment extends Fragment {
             return null;
         app = (App) activity.getApplication();
         getContext().getTheme().applyStyle(Themes.INSTANCE.getAppTheme(), true);
-        if (app.profile == null)
-            return inflater.inflate(R.layout.fragment_loading, container, false);
         // activity, context and profile is valid
         b = DataBindingUtil.inflate(inflater, R.layout.fragment_attendance, container, false);
         b.refreshLayout.setParent(activity.getSwipeRefreshLayout());
@@ -83,7 +81,7 @@ public class AttendanceFragment extends Fragment {
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        if (app == null || app.profile == null || activity == null || b == null || !isAdded())
+        if (app == null || activity == null || b == null || !isAdded())
             return;
 
         activity.getBottomSheet().prependItems(
@@ -92,7 +90,7 @@ public class AttendanceFragment extends Fragment {
                         .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline)
                         .withOnClickListener(v3 -> {
                             activity.getBottomSheet().close();
-                            AsyncTask.execute(() -> app.db.metadataDao().setAllSeen(App.profileId, TYPE_ATTENDANCE, true));
+                            AsyncTask.execute(() -> App.db.metadataDao().setAllSeen(App.Companion.getProfileId(), TYPE_ATTENDANCE, true));
                             Toast.makeText(activity, R.string.main_menu_mark_as_read_success, Toast.LENGTH_SHORT).show();
                         })
         );
@@ -149,13 +147,13 @@ public class AttendanceFragment extends Fragment {
             }
         }*/
 
-        if (app.profile.getLoginStoreType() == LOGIN_TYPE_MOBIDZIENNIK) {
+        if (app.getProfile().getLoginStoreType() == LOGIN_TYPE_MOBIDZIENNIK) {
             b.attendanceSummarySubject.setVisibility(View.GONE);
         }
         else {
             b.attendanceSummarySubject.setOnClickListener((v -> {
                 AsyncTask.execute(() -> {
-                    List<Subject> subjectList = app.db.subjectDao().getAllNow(App.profileId);
+                    List<Subject> subjectList = App.db.subjectDao().getAllNow(App.Companion.getProfileId());
                     PopupMenu popupMenu = new PopupMenu(activity, b.attendanceSummarySubject, Gravity.END);
                     popupMenu.getMenu().add(0, -1, 0, R.string.subject_filter_disabled);
                     int index = 0;
@@ -187,8 +185,8 @@ public class AttendanceFragment extends Fragment {
         b.attendanceView.setHasFixedSize(true);
         b.attendanceView.setLayoutManager(linearLayoutManager);
 
-        app.db.attendanceDao().getAll(App.profileId).observe(this, attendance -> {
-            if (app == null || app.profile == null || activity == null || b == null || !isAdded())
+        App.db.attendanceDao().getAll(App.Companion.getProfileId()).observe(this, attendance -> {
+            if (app == null || activity == null || b == null || !isAdded())
                 return;
 
             if (attendance == null) {
@@ -209,7 +207,7 @@ public class AttendanceFragment extends Fragment {
         subjectTotalCount = new LongSparseArray<>();
         subjectAbsentCount = new LongSparseArray<>();
         for (AttendanceFull attendance: attendanceList) {
-            if (app.profile.getLoginStoreType() == LOGIN_TYPE_VULCAN && attendance.type == TYPE_RELEASED)
+            if (app.getProfile().getLoginStoreType() == LOGIN_TYPE_VULCAN && attendance.type == TYPE_RELEASED)
                 continue;
             int[] subjectTotal = subjectTotalCount.get(attendance.subjectId, new int[3]);
             int[] subjectAbsent = subjectAbsentCount.get(attendance.subjectId, new int[3]);
@@ -228,7 +226,7 @@ public class AttendanceFragment extends Fragment {
     }
 
     private void updateList() {
-        if (app == null || app.profile == null || activity == null || b == null || !isAdded())
+        if (app == null || activity == null || b == null || !isAdded())
             return;
 
         int presentCount = 0;
@@ -306,7 +304,7 @@ public class AttendanceFragment extends Fragment {
         float attendancePercentage;
 
         // in Mobidziennik there are no TYPE_PRESENT records so we cannot calculate the percentage
-        if (app.profile.getLoginStoreType() == LOGIN_TYPE_VULCAN) {
+        if (app.getProfile().getLoginStoreType() == LOGIN_TYPE_VULCAN) {
             float allCount = presentCount + absentCount + belatedCount; // do not count releases
             float present = allCount - absentCount;
             attendancePercentage = present / allCount * 100.0f;
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/CrashGtfoActivity.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/CrashGtfoActivity.java
index c5b54d03..b2aa0174 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/CrashGtfoActivity.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/CrashGtfoActivity.java
@@ -2,9 +2,9 @@ package pl.szczodrzynski.edziennik.ui.modules.base;
 
 import android.content.Context;
 import android.os.Bundle;
+
 import androidx.appcompat.app.AppCompatActivity;
 
-import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.R;
 
 public class CrashGtfoActivity extends AppCompatActivity {
@@ -12,7 +12,7 @@ public class CrashGtfoActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setTheme((((App)getApplication()).getContext()
+        setTheme((getApplication()
                 .getSharedPreferences(getString(R.string.preference_file_global), Context.MODE_PRIVATE)
                 .getBoolean("dark_theme", false) ? R.style.AppTheme_Dark : R.style.AppTheme));
         setContentView(R.layout.activity_gtfo);
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/DebugFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/DebugFragment.java
index 0e606126..57a4e00f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/DebugFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/DebugFragment.java
@@ -1,15 +1,15 @@
 package pl.szczodrzynski.edziennik.ui.modules.base;
 
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.gson.Gson;
@@ -100,7 +100,7 @@ public class DebugFragment extends Fragment {
                             forceType = "i";
                             parameter = parameter.substring(0, parameter.length()-1);
                         }
-                        SimpleObj obj = app.gson.fromJson("{\"value\":"+parameter+"}", SimpleObj.class);
+                        SimpleObj obj = app.getGson().fromJson("{\"value\":"+parameter+"}", SimpleObj.class);
                         Class type = obj.value.getClass();
                         Object value = obj.value;
                         if ("d".equals(forceType)) {
@@ -180,7 +180,7 @@ public class DebugFragment extends Fragment {
                 getByPath(app, target, path, true);
                 // set the value if specified
                 if (valueToSet != null) {
-                    targetField.set(target, app.gson.fromJson(valueToSet, targetField.getGenericType()));
+                    targetField.set(target, app.getGson().fromJson(valueToSet, targetField.getGenericType()));
                     targetField = null;
                 }
                 if (targetField != null) {
@@ -194,7 +194,7 @@ public class DebugFragment extends Fragment {
                 return Log.getStackTraceString(e);
             }
         }
-        return app.gson.toJson(target);
+        return app.getGson().toJson(target);
     }
 
     @Override
@@ -218,13 +218,13 @@ public class DebugFragment extends Fragment {
         getView().findViewById(R.id.debugAppconfig).setOnClickListener(v -> {
             JsonRecyclerView mRecyclerView = getView().findViewById(R.id.rv_json);
             // bind json
-            mRecyclerView.bindJson(new Gson().toJson(app.appConfig));
+            mRecyclerView.bindJson(new Gson().toJson(app.getConfig()));
             mRecyclerView.setTextSize(20);
         });
         getView().findViewById(R.id.debugAppprofile).setOnClickListener(v -> {
             JsonRecyclerView mRecyclerView = getView().findViewById(R.id.rv_json);
             // bind json
-            mRecyclerView.bindJson(new Gson().toJson(app.profile));
+            mRecyclerView.bindJson(new Gson().toJson(app.getProfile()));
             mRecyclerView.setTextSize(20);
         });
     }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/BehaviourFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/BehaviourFragment.java
index 1c616980..ea95989d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/BehaviourFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/behaviour/BehaviourFragment.java
@@ -53,8 +53,6 @@ public class BehaviourFragment extends Fragment {
             return null;
         app = (App) activity.getApplication();
         getContext().getTheme().applyStyle(Themes.INSTANCE.getAppTheme(), true);
-        if (app.profile == null)
-            return inflater.inflate(R.layout.fragment_loading, container, false);
         // activity, context and profile is valid
         b = DataBindingUtil.inflate(inflater, R.layout.fragment_behaviour, container, false);
         b.refreshLayout.setParent(activity.getSwipeRefreshLayout());
@@ -63,7 +61,7 @@ public class BehaviourFragment extends Fragment {
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        if (app == null || app.profile == null || activity == null || b == null || !isAdded())
+        if (app == null || activity == null || b == null || !isAdded())
             return;
 
         activity.getBottomSheet().prependItems(
@@ -72,7 +70,7 @@ public class BehaviourFragment extends Fragment {
                         .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline)
                         .withOnClickListener(v3 -> {
                             activity.getBottomSheet().close();
-                            AsyncTask.execute(() -> app.db.metadataDao().setAllSeen(App.profileId, TYPE_NOTICE, true));
+                            AsyncTask.execute(() -> App.db.metadataDao().setAllSeen(App.Companion.getProfileId(), TYPE_NOTICE, true));
                             Toast.makeText(activity, R.string.main_menu_mark_as_read_success, Toast.LENGTH_SHORT).show();
                         })
         );
@@ -99,8 +97,8 @@ public class BehaviourFragment extends Fragment {
         b.noticesView.setHasFixedSize(true);
         b.noticesView.setLayoutManager(linearLayoutManager);
 
-        app.db.noticeDao().getAll(App.profileId).observe(this, notices -> {
-            if (app == null || app.profile == null || activity == null || b == null || !isAdded())
+        app.db.noticeDao().getAll(App.Companion.getProfileId()).observe(this, notices -> {
+            if (app == null || activity == null || b == null || !isAdded())
                 return;
 
             if (notices == null) {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/feedback/FeedbackActivity.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/feedback/FeedbackActivity.java
index e5fa67b2..c3704ce9 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/feedback/FeedbackActivity.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/feedback/FeedbackActivity.java
@@ -1,18 +1,5 @@
 package pl.szczodrzynski.edziennik.ui.modules.feedback;
 
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.databinding.DataBindingUtil;
-
-import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.databinding.ActivityFeedbackBinding;
-import pl.szczodrzynski.edziennik.data.db.entity.FeedbackMessage;
-import pl.szczodrzynski.edziennik.data.db.full.FeedbackMessageWithCount;
-import pl.szczodrzynski.edziennik.network.ServerRequest;
-import pl.szczodrzynski.edziennik.utils.Anim;
-import pl.szczodrzynski.edziennik.utils.Themes;
-import pl.szczodrzynski.edziennik.utils.Utils;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -28,6 +15,9 @@ import android.view.animation.Animation;
 import android.widget.PopupMenu;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.databinding.DataBindingUtil;
+
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.github.bassaer.chatmessageview.model.IChatUser;
 import com.github.bassaer.chatmessageview.model.Message;
@@ -36,7 +26,16 @@ import com.github.bassaer.chatmessageview.view.ChatView;
 import java.util.Calendar;
 import java.util.List;
 
-import static pl.szczodrzynski.edziennik.App.APP_URL;
+import pl.szczodrzynski.edziennik.App;
+import pl.szczodrzynski.edziennik.R;
+import pl.szczodrzynski.edziennik.data.db.entity.FeedbackMessage;
+import pl.szczodrzynski.edziennik.data.db.full.FeedbackMessageWithCount;
+import pl.szczodrzynski.edziennik.databinding.ActivityFeedbackBinding;
+import pl.szczodrzynski.edziennik.network.ServerRequest;
+import pl.szczodrzynski.edziennik.utils.Anim;
+import pl.szczodrzynski.edziennik.utils.Themes;
+import pl.szczodrzynski.edziennik.utils.Utils;
+
 import static pl.szczodrzynski.edziennik.utils.Utils.crc16;
 import static pl.szczodrzynski.edziennik.utils.Utils.openUrl;
 
@@ -101,7 +100,7 @@ public class FeedbackActivity extends AppCompatActivity {
                 .content(R.string.sending_message)
                 .negativeText(R.string.cancel)
                 .show();
-        new ServerRequest(app, app.requestScheme + APP_URL + "main.php?feedback_message", "FeedbackSend")
+        new ServerRequest(app, "https://edziennik.szczodrzynski.pl/app/main.php?feedback_message", "FeedbackSend")
                 .setBodyParameter("message_text", text)
                 .setBodyParameter("target_device", deviceToSend == null ? "null" : deviceToSend)
                 .run(((e, result) -> {
@@ -199,7 +198,7 @@ public class FeedbackActivity extends AppCompatActivity {
         receiver = new BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
-                FeedbackMessage message = app.gson.fromJson(intent.getStringExtra("message"), FeedbackMessage.class);
+                FeedbackMessage message = app.getGson().fromJson(intent.getStringExtra("message"), FeedbackMessage.class);
                 Calendar c = Calendar.getInstance();
                 c.setTimeInMillis(message.sentTime);
                 Message chatMessage = new Message.Builder()
@@ -238,7 +237,7 @@ public class FeedbackActivity extends AppCompatActivity {
         mChatView.setMessageMarginTop(5);
         mChatView.setMessageMarginBottom(5);
 
-        if (App.devMode && app.deviceId.equals("f054761fbdb6a238")) {
+        if (App.Companion.getDevMode() && app.getDeviceId().equals("f054761fbdb6a238")) {
             b.targetDeviceLayout.setVisibility(View.VISIBLE);
             b.targetDeviceDropDown.setOnClickListener((v -> {
                 AsyncTask.execute(() -> {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/feedback/FeedbackFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/feedback/FeedbackFragment.kt
index d8a69dba..ddba893e 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/feedback/FeedbackFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/feedback/FeedbackFragment.kt
@@ -21,11 +21,10 @@ import com.github.bassaer.chatmessageview.model.IChatUser
 import com.github.bassaer.chatmessageview.model.Message
 import com.github.bassaer.chatmessageview.view.ChatView
 import pl.szczodrzynski.edziennik.App
-import pl.szczodrzynski.edziennik.App.APP_URL
-import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.MainActivity
-import pl.szczodrzynski.edziennik.databinding.FragmentFeedbackBinding
+import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.db.entity.FeedbackMessage
+import pl.szczodrzynski.edziennik.databinding.FragmentFeedbackBinding
 import pl.szczodrzynski.edziennik.network.ServerRequest
 import pl.szczodrzynski.edziennik.utils.Anim
 import pl.szczodrzynski.edziennik.utils.Themes
@@ -248,7 +247,7 @@ class FeedbackFragment : Fragment() {
                 .content(R.string.sending_message)
                 .negativeText(R.string.cancel)
                 .show()
-        ServerRequest(app, app.requestScheme + APP_URL + "main.php?feedback_message", "FeedbackSend")
+        ServerRequest(app, "https://edziennik.szczodrzynski.pl/app/main.php?feedback_message", "FeedbackSend")
                 .setBodyParameter("message_text", text)
                 .setBodyParameter("target_device", if (deviceToSend == null) "null" else deviceToSend)
                 .run { e, result ->
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesFragment.java
index 874b9fa4..19a360e4 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesFragment.java
@@ -16,7 +16,6 @@ import androidx.fragment.app.Fragment;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial;
 
-import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -25,8 +24,8 @@ import pl.szczodrzynski.edziennik.MainActivity;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.config.ProfileConfigGrades;
 import pl.szczodrzynski.edziennik.data.db.entity.Grade;
-import pl.szczodrzynski.edziennik.data.db.full.GradeFull;
 import pl.szczodrzynski.edziennik.data.db.entity.Subject;
+import pl.szczodrzynski.edziennik.data.db.full.GradeFull;
 import pl.szczodrzynski.edziennik.databinding.FragmentGradesBinding;
 import pl.szczodrzynski.edziennik.utils.Themes;
 import pl.szczodrzynski.edziennik.utils.models.ItemGradesSubjectModel;
@@ -56,8 +55,6 @@ public class GradesFragment extends Fragment {
             return null;
         app = (App) activity.getApplication();
         getContext().getTheme().applyStyle(Themes.INSTANCE.getAppTheme(), true);
-        if (app.profile == null)
-            return inflater.inflate(R.layout.fragment_loading, container, false);
         // activity, context and profile is valid
         b = DataBindingUtil.inflate(inflater, R.layout.fragment_grades, container, false);
         b.refreshLayout.setParent(activity.getSwipeRefreshLayout());
@@ -68,10 +65,8 @@ public class GradesFragment extends Fragment {
     ListView listView;
     List<ItemGradesSubjectModel> subjectList;
 
-    private boolean sortModeChanged = false;
-
     private String getRegisterCardAverageModeSubText() {
-        switch (App.getConfig().forProfile().getGrades().getYearAverageMode()) {
+        switch (App.Companion.getConfig().forProfile().getGrades().getYearAverageMode()) {
             default:
             case YEAR_1_AVG_2_AVG:
                 return getString(R.string.settings_register_avg_mode_0_short);
@@ -88,7 +83,7 @@ public class GradesFragment extends Fragment {
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        if (app == null || app.profile == null || activity == null || b == null || !isAdded())
+        if (app == null || activity == null || b == null || !isAdded())
             return;
 
         /*activity.getBottomSheet().setToggleGroupEnabled(true);
@@ -136,7 +131,7 @@ public class GradesFragment extends Fragment {
                         .withIcon(CommunityMaterial.Icon2.cmd_palette_outline)
                         .withOnClickListener(v3 -> {
                             activity.getBottomSheet().close();
-                            ProfileConfigGrades config = app.config.getFor(App.profileId).getGrades();
+                            ProfileConfigGrades config = app.getConfig().getFor(App.Companion.getProfileId()).getGrades();
                             new MaterialDialog.Builder(activity)
                                     .title(R.string.dialog_grades_color_mode_title)
                                     .items(R.array.dialog_grades_color_modes)
@@ -155,8 +150,8 @@ public class GradesFragment extends Fragment {
                             new MaterialDialog.Builder(activity)
                                     .title(R.string.dialog_grades_sort_title)
                                     .items(R.array.dialog_grades_sort_modes)
-                                    .itemsCallbackSingleChoice(app.config.getGrades().getOrderBy(), (dialog, view1, which, text) -> {
-                                        app.config.getGrades().setOrderBy(which);
+                                    .itemsCallbackSingleChoice(app.getConfig().getGrades().getOrderBy(), (dialog, view1, which, text) -> {
+                                        app.getConfig().getGrades().setOrderBy(which);
                                         activity.reloadTarget();
                                         return true;
                                     })
@@ -184,8 +179,8 @@ public class GradesFragment extends Fragment {
                                     .title(getString(R.string.settings_register_avg_mode_dialog_title))
                                     .content(getString(R.string.settings_register_avg_mode_dialog_text))
                                     .items(modeNames)
-                                    .itemsCallbackSingleChoice(modeIds.indexOf(App.getConfig().forProfile().getGrades().getYearAverageMode()), (dialog, itemView, which, text) -> {
-                                        App.getConfig().forProfile().getGrades().setYearAverageMode(modeIds.get(which));
+                                    .itemsCallbackSingleChoice(modeIds.indexOf(App.Companion.getConfig().forProfile().getGrades().getYearAverageMode()), (dialog, itemView, which, text) -> {
+                                        App.Companion.getConfig().forProfile().getGrades().setYearAverageMode(modeIds.get(which));
                                         activity.reloadTarget();
                                         return true;
                                     })
@@ -197,7 +192,7 @@ public class GradesFragment extends Fragment {
                         .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline)
                         .withOnClickListener(v3 -> {
                             activity.getBottomSheet().close();
-                            AsyncTask.execute(() -> app.db.metadataDao().setAllSeen(App.profileId, TYPE_GRADE, true));
+                            AsyncTask.execute(() -> App.db.metadataDao().setAllSeen(App.Companion.getProfileId(), TYPE_GRADE, true));
                             Toast.makeText(activity, R.string.main_menu_mark_as_read_success, Toast.LENGTH_SHORT).show();
                         })
         );
@@ -227,41 +222,41 @@ public class GradesFragment extends Fragment {
 
         long finalExpandSubjectId = expandSubjectId;
         String orderBy;
-        if (app.config.getGrades().getOrderBy() == ORDER_BY_SUBJECT_ASC) {
+        if (app.getConfig().getGrades().getOrderBy() == ORDER_BY_SUBJECT_ASC) {
             orderBy = "subjectLongName ASC, addedDate DESC";
         }
-        else if (app.config.getGrades().getOrderBy() == ORDER_BY_DATE_DESC) {
+        else if (app.getConfig().getGrades().getOrderBy() == ORDER_BY_DATE_DESC) {
             orderBy = "addedDate DESC";
         }
-        else if (app.config.getGrades().getOrderBy() == ORDER_BY_DATE_ASC) {
+        else if (app.getConfig().getGrades().getOrderBy() == ORDER_BY_DATE_ASC) {
             orderBy = "addedDate ASC";
         }
         else {
             orderBy = "subjectLongName DESC, addedDate DESC";
         }
 
-        app.db.gradeDao().getAllOrderBy(App.profileId, orderBy).observe(this, grades -> {
-            if (app == null || app.profile == null || activity == null || b == null || !isAdded())
+        App.db.gradeDao().getAllOrderBy(App.Companion.getProfileId(), orderBy).observe(this, grades -> {
+            if (app == null || activity == null || b == null || !isAdded())
                 return;
 
             subjectList = new ArrayList<>();
 
-            ProfileConfigGrades config = app.config.getFor(App.profileId).getGrades();
+            ProfileConfigGrades config = app.getConfig().getFor(App.Companion.getProfileId()).getGrades();
 
             // now we have all grades from the newest to the oldest
             for (GradeFull grade: grades) {
                 ItemGradesSubjectModel model = ItemGradesSubjectModel.searchModelBySubjectId(subjectList, grade.subjectId);
                 if (model == null) {
-                    model = new ItemGradesSubjectModel(app.profile,
-                            new Subject(App.profileId, grade.subjectId, grade.subjectLongName, grade.subjectShortName),
+                    model = new ItemGradesSubjectModel(app.getProfile(),
+                            new Subject(App.Companion.getProfileId(), grade.subjectId, grade.subjectLongName, grade.subjectShortName),
                             new ArrayList<>(),
                             new ArrayList<>());
                     subjectList.add(model);
                     if (model.subject != null && model.subject.id == finalExpandSubjectId) {
                         model.expandView = true;
                     }
-                    model.colorMode = App.getConfig().forProfile().getGrades().getColorMode();
-                    model.yearAverageMode = App.getConfig().forProfile().getGrades().getYearAverageMode();
+                    model.colorMode = App.Companion.getConfig().forProfile().getGrades().getColorMode();
+                    model.yearAverageMode = App.Companion.getConfig().forProfile().getGrades().getYearAverageMode();
                 }
                 if (!grade.seen && grade.semester == 1) {
                     model.semester1Unread++;
@@ -380,7 +375,7 @@ public class GradesFragment extends Fragment {
                 else if (!model.isBehaviourSubject && model.isNormalSubject) {
                     // applies for normal grades & normal+descriptive grades
                     // calculate the normal grade average based on the user's setting
-                    switch (App.getConfig().forProfile().getGrades().getYearAverageMode()) {
+                    switch (App.Companion.getConfig().forProfile().getGrades().getYearAverageMode()) {
                         case YEAR_1_AVG_2_AVG:
                             model.yearAverage = (model.semester1Average + model.semester2Average) / 2;
                             break;
@@ -433,7 +428,7 @@ public class GradesFragment extends Fragment {
     }
 
     public void showAverages() {
-        if (app == null || app.profile == null || activity == null || b == null || !isAdded() || subjectList == null)
+        if (app == null || activity == null || b == null || !isAdded() || subjectList == null)
             return;
 
         float semester1Sum = 0;
@@ -529,8 +524,6 @@ public class GradesFragment extends Fragment {
             }
         }
 
-        DecimalFormat df = new DecimalFormat("0.00");
-
         String semester1ExpectedAverageStr = semester1Count > semester1ProposedCount || semester1Count > semester1FinalCount ? getString(R.string.dialog_averages_expected_format, 1, semester1Sum / semester1Count) : "";
         String semester1ProposedAverageStr = semester1ProposedCount > 0 ? getString(R.string.dialog_averages_proposed_format, 1, semester1ProposedSum / semester1ProposedCount) : "";
         String semester1FinalAverageStr = semester1FinalCount > 0 ? getString(R.string.dialog_averages_final_format, 1, semester1FinalSum / semester1FinalCount) : "";
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesListAdapter.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesListAdapter.java
index 064b66c7..debe586c 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesListAdapter.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesListAdapter.java
@@ -52,11 +52,11 @@ public class GradesListAdapter extends RecyclerView.Adapter<GradesListAdapter.Vi
         GradeFull grade = gradeList.get(position);
 
         holder.root.setOnClickListener((v -> {
-            new GradeDetailsDialog(v.getContext(), App.profileId).show(app, grade);
+            new GradeDetailsDialog(v.getContext(), App.Companion.getProfileId()).show(app, grade);
         }));
 
         int gradeColor;
-        if (App.getConfig().forProfile().getGrades().getColorMode() == COLOR_MODE_DEFAULT) {
+        if (App.Companion.getConfig().forProfile().getGrades().getColorMode() == COLOR_MODE_DEFAULT) {
             gradeColor = grade.color;
         }
         else {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesSubjectAdapter.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesSubjectAdapter.java
index 2dd52f40..905fdb89 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesSubjectAdapter.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradesSubjectAdapter.java
@@ -31,8 +31,8 @@ import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.MainActivity;
 import pl.szczodrzynski.edziennik.R;
 import pl.szczodrzynski.edziennik.data.db.AppDb;
-import pl.szczodrzynski.edziennik.data.db.full.GradeFull;
 import pl.szczodrzynski.edziennik.data.db.entity.Subject;
+import pl.szczodrzynski.edziennik.data.db.full.GradeFull;
 import pl.szczodrzynski.edziennik.utils.Anim;
 import pl.szczodrzynski.edziennik.utils.Colors;
 import pl.szczodrzynski.edziennik.utils.Utils;
@@ -86,34 +86,34 @@ public class GradesSubjectAdapter extends ArrayAdapter<ItemGradesSubjectModel> i
 
     private boolean gradesSetAsRead(ViewHolder holder, ItemGradesSubjectModel model, int semester) {
         boolean somethingChanged = false;
-        AppDb db = AppDb.getDatabase(null);
+        AppDb db = App.Companion.getDb();
         if (semester == 1) {
             model.semester1Unread = 0;
             for (GradeFull grade : model.grades1) {
                 if (!grade.seen) {
-                    db.metadataDao().setSeen(App.profileId, grade, somethingChanged = true);
+                    db.metadataDao().setSeen(App.Companion.getProfileId(), grade, somethingChanged = true);
                 }
             }
             if (model.semester1Proposed != null && !model.semester1Proposed.seen)
-                db.metadataDao().setSeen(App.profileId, model.semester1Proposed, somethingChanged = true);
+                db.metadataDao().setSeen(App.Companion.getProfileId(), model.semester1Proposed, somethingChanged = true);
             if (model.semester1Final != null && !model.semester1Final.seen)
-                db.metadataDao().setSeen(App.profileId, model.semester1Final, somethingChanged = true);
+                db.metadataDao().setSeen(App.Companion.getProfileId(), model.semester1Final, somethingChanged = true);
         }
         else if (semester == 2) {
             model.semester2Unread = 0;
             for (GradeFull grade : model.grades2) {
                 if (!grade.seen) {
-                    db.metadataDao().setSeen(App.profileId, grade, somethingChanged = true);
+                    db.metadataDao().setSeen(App.Companion.getProfileId(), grade, somethingChanged = true);
                 }
             }
             if (model.semester2Proposed != null && !model.semester2Proposed.seen)
-                db.metadataDao().setSeen(App.profileId, model.semester2Proposed, somethingChanged = true);
+                db.metadataDao().setSeen(App.Companion.getProfileId(), model.semester2Proposed, somethingChanged = true);
             if (model.semester2Final != null && !model.semester2Final.seen)
-                db.metadataDao().setSeen(App.profileId, model.semester2Final, somethingChanged = true);
+                db.metadataDao().setSeen(App.Companion.getProfileId(), model.semester2Final, somethingChanged = true);
             if (model.yearProposed != null && !model.yearProposed.seen)
-                db.metadataDao().setSeen(App.profileId, model.yearProposed, somethingChanged = true);
+                db.metadataDao().setSeen(App.Companion.getProfileId(), model.yearProposed, somethingChanged = true);
             if (model.yearFinal != null && !model.yearFinal.seen)
-                db.metadataDao().setSeen(App.profileId, model.yearFinal, somethingChanged = true);
+                db.metadataDao().setSeen(App.Companion.getProfileId(), model.yearFinal, somethingChanged = true);
         }
         if (somethingChanged) updateSubjectSemesterBadges(holder, model);
         return somethingChanged;
@@ -219,7 +219,7 @@ public class GradesSubjectAdapter extends ArrayAdapter<ItemGradesSubjectModel> i
                 layoutParams.setMargins(0, 0, _5dp, 0);
 
                 DisplayMetrics displayMetrics = getContext().getResources().getDisplayMetrics();
-                int maxWidthPx = displayMetrics.widthPixels - Utils.dpToPx((app.config.getUi().getMiniMenuVisible() ? 72 : 0)/*miniDrawer size*/ + 8 + 8/*left and right offsets*/ + 24/*ellipsize width*/);
+                int maxWidthPx = displayMetrics.widthPixels - Utils.dpToPx((app.getConfig().getUi().getMiniMenuVisible() ? 72 : 0)/*miniDrawer size*/ + 8 + 8/*left and right offsets*/ + 24/*ellipsize width*/);
                 int totalWidthPx = 0;
                 boolean ellipsized = false;
 
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 bd2564a5..65fad773 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
@@ -40,11 +40,11 @@ class HomeFragment : Fragment(), CoroutineScope {
         private const val TAG = "HomeFragment"
 
         fun swapCards(fromPosition: Int, toPosition: Int, cardAdapter: HomeCardAdapter) {
-            val homeCards = App.getConfig().ui.homeCards.toMutableList()
+            val homeCards = App.config.ui.homeCards.toMutableList()
             val fromPair = homeCards[fromPosition]
             homeCards[fromPosition] = homeCards[toPosition]
             homeCards[toPosition] = fromPair
-            App.getConfig().ui.homeCards = homeCards
+            App.config.ui.homeCards = homeCards
 
             val fromCard = cardAdapter.items[fromPosition]
             cardAdapter.items[fromPosition] = cardAdapter.items[toPosition]
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeDebugCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeDebugCard.kt
index 781eabc5..10485b4d 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeDebugCard.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeDebugCard.kt
@@ -20,7 +20,7 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
-import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask
+import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.databinding.CardHomeDebugBinding
 import pl.szczodrzynski.edziennik.dp
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeGradesCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeGradesCard.kt
index 2f32a2c2..51c9d208 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeGradesCard.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeGradesCard.kt
@@ -29,9 +29,9 @@ import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.MainActivity
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.db.entity.Grade.*
-import pl.szczodrzynski.edziennik.data.db.full.GradeFull
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.entity.Subject
+import pl.szczodrzynski.edziennik.data.db.full.GradeFull
 import pl.szczodrzynski.edziennik.databinding.CardHomeGradesBinding
 import pl.szczodrzynski.edziennik.dp
 import pl.szczodrzynski.edziennik.ui.modules.home.HomeCard
@@ -121,7 +121,7 @@ class HomeGradesCard(
                             16 /*ellipsize width*/)) / 1.5f
 
             subject.grades1.onEach { grade ->
-                val gradeColor = when (App.getConfig().forProfile().grades.colorMode) {
+                val gradeColor = when (App.config.forProfile().grades.colorMode) {
                     Profile.COLOR_MODE_DEFAULT -> grade.color
                     else -> Colors.gradeToColor(grade)
                 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeLuckyNumberCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeLuckyNumberCard.kt
index aaccf000..31aed704 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeLuckyNumberCard.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeLuckyNumberCard.kt
@@ -94,7 +94,7 @@ class HomeLuckyNumberCard(
 
         holder.root.onClick {
             StudentNumberDialog(activity, profile, onDismissListener = {
-                app.profileSaveAsync(profile)
+                app.profileSave(profile)
                 val newSubTextRes = if (profile.studentNumber == -1)
                     R.string.home_lucky_number_details_click_to_set
                 else
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTimetableCard.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTimetableCard.kt
index 96b8e02a..7585f1a8 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTimetableCard.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/cards/HomeTimetableCard.kt
@@ -22,11 +22,11 @@ import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.data.api.events.ApiTaskAllFinishedEvent
-import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask
 import pl.szczodrzynski.edziennik.data.db.entity.Event
-import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.entity.Lesson
+import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.full.LessonFull
 import pl.szczodrzynski.edziennik.databinding.CardHomeTimetableBinding
 import pl.szczodrzynski.edziennik.ui.dialogs.bell.BellSyncTimeChooseDialog
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkAdapter.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkAdapter.java
index 95fee76a..3460dd6b 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkAdapter.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/homework/HomeworkAdapter.java
@@ -85,7 +85,7 @@ public class HomeworkAdapter extends RecyclerView.Adapter<HomeworkAdapter.ViewHo
             holder.homeworkItemTopic.getBackground().setColorFilter(new PorterDuffColorFilter(0x692196f3, PorterDuff.Mode.MULTIPLY));
             homework.seen = true;
             AsyncTask.execute(() -> {
-                app.db.metadataDao().setSeen(App.profileId, homework, true);
+                App.db.metadataDao().setSeen(App.Companion.getProfileId(), homework, true);
             });
         }
         else {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/intro/ChangelogIntroActivity.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/intro/ChangelogIntroActivity.java
index 9878ff03..0c60efbd 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/intro/ChangelogIntroActivity.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/intro/ChangelogIntroActivity.java
@@ -78,6 +78,6 @@ public class ChangelogIntroActivity extends IntroActivity {
                     .build());
         }*/
 
-        app.config.setAppVersion(BuildConfig.VERSION_CODE);
+        app.getConfig().setAppVersion(BuildConfig.VERSION_CODE);
     }
 }
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 a1fdcf0a..ef5f0099 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
@@ -56,7 +56,7 @@ class LoginChooserFragment : Fragment() {
                 }
             }
             else -> {
-                // there is no profiles
+                // there are no profiles
                 b.cancelButton.visibility = View.GONE
             }
         }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginFinishFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginFinishFragment.kt
index d2ab5df4..8f52b41a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginFinishFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginFinishFragment.kt
@@ -5,7 +5,6 @@
 package pl.szczodrzynski.edziennik.ui.modules.login
 
 import android.app.Activity
-import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -14,11 +13,8 @@ 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.MainActivity
-import pl.szczodrzynski.edziennik.R
+import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.databinding.FragmentLoginFinishBinding
-import pl.szczodrzynski.edziennik.onClick
 import kotlin.coroutines.CoroutineContext
 
 class LoginFinishFragment : Fragment(), CoroutineScope {
@@ -44,20 +40,38 @@ class LoginFinishFragment : Fragment(), CoroutineScope {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        val firstRun = arguments?.getBoolean("firstRun", true) ?: true
+        val firstRun = !App.config.loginFinished
+        App.config.loginFinished = true
+
         if (!firstRun) {
             b.loginFinishSubtitle.setText(R.string.login_finish_subtitle_not_first_run)
         }
 
         b.finishButton.onClick {
-            val firstProfileId = arguments?.getInt("firstProfileId", -1) ?: -1
-            if (firstProfileId != -1) {
-                val intent = Intent()
-                intent.putExtra("profileId", firstProfileId)
-                intent.putExtra("fragmentId", MainActivity.DRAWER_ITEM_HOME)
-                activity.setResult(Activity.RESULT_OK, intent)
+            val firstProfileId = arguments?.getInt("firstProfileId") ?: 0
+            if (firstProfileId == 0) {
+                activity.finish()
+                return@onClick
+            }
+
+            app.profileLoad(firstProfileId) {
+                if (firstRun) {
+                    activity.startActivity(Intent(
+                            activity,
+                            MainActivity::class.java,
+                            "profileId" to firstProfileId,
+                            "fragmentId" to MainActivity.DRAWER_ITEM_HOME
+                    ))
+                }
+                else {
+                    activity.setResult(Activity.RESULT_OK, Intent(
+                            null,
+                            "profileId" to firstProfileId,
+                            "fragmentId" to MainActivity.DRAWER_ITEM_HOME
+                    ))
+                }
+                activity.finish()
             }
-            activity.finish()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginProgressFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginProgressFragment.kt
index 8edca140..a9ece7e0 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginProgressFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginProgressFragment.kt
@@ -20,10 +20,10 @@ import org.greenrobot.eventbus.ThreadMode
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.R
 import pl.szczodrzynski.edziennik.data.api.LOGIN_NO_ARGUMENTS
+import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.data.api.events.ApiTaskErrorEvent
 import pl.szczodrzynski.edziennik.data.api.events.FirstLoginFinishedEvent
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.databinding.FragmentLoginProgressBinding
 import kotlin.coroutines.CoroutineContext
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncFragment.kt
index 0acaaf85..572008ab 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginSyncFragment.kt
@@ -14,11 +14,11 @@ import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.data.api.events.ApiTaskAllFinishedEvent
 import pl.szczodrzynski.edziennik.data.api.events.ApiTaskErrorEvent
 import pl.szczodrzynski.edziennik.data.api.events.ApiTaskProgressEvent
 import pl.szczodrzynski.edziennik.data.api.events.ApiTaskStartedEvent
-import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask
 import pl.szczodrzynski.edziennik.data.db.entity.Event.*
 import pl.szczodrzynski.edziennik.data.db.entity.EventType
 import pl.szczodrzynski.edziennik.data.db.entity.Profile.Companion.REGISTRATION_DISABLED
@@ -63,17 +63,17 @@ class LoginSyncFragment : Fragment(), CoroutineScope {
                 REGISTRATION_DISABLED
 
             val typeList = listOf(
-                    EventType(it.id, TYPE_HOMEWORK.toLong(), getString(R.string.event_type_homework), COLOR_HOMEWORK),
-                    EventType(it.id, TYPE_DEFAULT.toLong(), getString(R.string.event_other), COLOR_DEFAULT),
-                    EventType(it.id, TYPE_EXAM.toLong(), getString(R.string.event_exam), COLOR_EXAM),
-                    EventType(it.id, TYPE_SHORT_QUIZ.toLong(), getString(R.string.event_short_quiz), COLOR_SHORT_QUIZ),
-                    EventType(it.id, TYPE_ESSAY.toLong(), getString(R.string.event_essay), COLOR_SHORT_QUIZ),
-                    EventType(it.id, TYPE_PROJECT.toLong(), getString(R.string.event_project), COLOR_PROJECT),
-                    EventType(it.id, TYPE_PT_MEETING.toLong(), getString(R.string.event_pt_meeting), COLOR_PT_MEETING),
-                    EventType(it.id, TYPE_EXCURSION.toLong(), getString(R.string.event_excursion), COLOR_EXCURSION),
-                    EventType(it.id, TYPE_READING.toLong(), getString(R.string.event_reading), COLOR_READING),
-                    EventType(it.id, TYPE_CLASS_EVENT.toLong(), getString(R.string.event_class_event), COLOR_CLASS_EVENT),
-                    EventType(it.id, TYPE_INFORMATION.toLong(), getString(R.string.event_information), COLOR_INFORMATION)
+                    EventType(it.id, TYPE_HOMEWORK, getString(R.string.event_type_homework), COLOR_HOMEWORK),
+                    EventType(it.id, TYPE_DEFAULT, getString(R.string.event_other), COLOR_DEFAULT),
+                    EventType(it.id, TYPE_EXAM, getString(R.string.event_exam), COLOR_EXAM),
+                    EventType(it.id, TYPE_SHORT_QUIZ, getString(R.string.event_short_quiz), COLOR_SHORT_QUIZ),
+                    EventType(it.id, TYPE_ESSAY, getString(R.string.event_essay), COLOR_SHORT_QUIZ),
+                    EventType(it.id, TYPE_PROJECT, getString(R.string.event_project), COLOR_PROJECT),
+                    EventType(it.id, TYPE_PT_MEETING, getString(R.string.event_pt_meeting), COLOR_PT_MEETING),
+                    EventType(it.id, TYPE_EXCURSION, getString(R.string.event_excursion), COLOR_EXCURSION),
+                    EventType(it.id, TYPE_READING, getString(R.string.event_reading), COLOR_READING),
+                    EventType(it.id, TYPE_CLASS_EVENT, getString(R.string.event_class_event), COLOR_CLASS_EVENT),
+                    EventType(it.id, TYPE_INFORMATION, getString(R.string.event_information), COLOR_INFORMATION)
             )
             app.db.eventTypeDao().addAll(typeList)
         }
@@ -82,10 +82,8 @@ class LoginSyncFragment : Fragment(), CoroutineScope {
         app.db.loginStoreDao().addAll(loginStores)
 
         finishArguments = Bundle(
-                "firstProfileId" to profiles.firstOrNull()?.id,
-                "firstRun" to !app.config.loginFinished
+                "firstProfileId" to profiles.firstOrNull()?.id
         )
-        app.config.loginFinished = true
 
         val profileIds = profiles.map { it.id }
         EdziennikTask.syncProfileList(profileIds).enqueue(activity)
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 7815b0f0..eab68d6b 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
@@ -29,11 +29,11 @@ import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import pl.szczodrzynski.edziennik.*
+import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent
 import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent.Companion.TYPE_FINISHED
 import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent.Companion.TYPE_PROGRESS
 import pl.szczodrzynski.edziennik.data.api.events.MessageGetEvent
-import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore.Companion.LOGIN_TYPE_IDZIENNIK
 import pl.szczodrzynski.edziennik.data.db.entity.Message.TYPE_RECEIVED
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesComposeFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesComposeFragment.kt
index 29b6b51a..b0956257 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesComposeFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesComposeFragment.kt
@@ -34,13 +34,13 @@ import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.ERROR_MESSAGE_NOT_SENT
+import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.data.api.events.MessageSentEvent
 import pl.szczodrzynski.edziennik.data.api.events.RecipientListGetEvent
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
-import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore
-import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
+import pl.szczodrzynski.edziennik.data.db.full.MessageFull
 import pl.szczodrzynski.edziennik.databinding.MessagesComposeFragmentBinding
 import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesUtils.getProfileImage
 import pl.szczodrzynski.edziennik.utils.Colors
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesListFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesListFragment.java
index 6278a782..a7237f19 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesListFragment.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesListFragment.java
@@ -59,8 +59,6 @@ public class MessagesListFragment extends Fragment {
             return null;
         app = (App) activity.getApplication();
         getContext().getTheme().applyStyle(Themes.INSTANCE.getAppTheme(), true);
-        if (app.profile == null)
-            return inflater.inflate(R.layout.fragment_loading, container, false);
         // activity, context and profile is valid
         b = DataBindingUtil.inflate(inflater, R.layout.messages_list, container, false);
         return b.getRoot();
@@ -68,7 +66,7 @@ public class MessagesListFragment extends Fragment {
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        if (app == null || app.profile == null || activity == null || b == null || !isAdded())
+        if (app == null || activity == null || b == null || !isAdded())
             return;
 
         long messageId = -1;
@@ -170,19 +168,19 @@ public class MessagesListFragment extends Fragment {
         b.emailList.setAdapter(messagesAdapter);
 
         if (messageType == Message.TYPE_RECEIVED) {
-            app.db.messageDao().getReceived(App.profileId).observe(this, messageFulls -> {
+            App.db.messageDao().getReceived(App.Companion.getProfileId()).observe(this, messageFulls -> {
                 createMessageList(messageFulls);
             });
         }
         else if (messageType == Message.TYPE_DELETED) {
-            app.db.messageDao().getDeleted(App.profileId).observe(this, messageFulls -> {
+            App.db.messageDao().getDeleted(App.Companion.getProfileId()).observe(this, messageFulls -> {
                 createMessageList(messageFulls);
             });
         }
         else if (messageType == Message.TYPE_SENT) {
-            app.db.messageDao().getSent(App.profileId).observe(this, messageFulls -> {
+            App.db.messageDao().getSent(App.Companion.getProfileId()).observe(this, messageFulls -> {
                 AsyncTask.execute(() -> {
-                    List<MessageRecipientFull> messageRecipients = app.db.messageRecipientDao().getAll(App.profileId);
+                    List<MessageRecipientFull> messageRecipients = App.db.messageRecipientDao().getAll(App.Companion.getProfileId());
                     List<Long> messageIds = new ArrayList<>();
                     for (MessageFull messageFull: messageFulls) {
                         messageIds.add(messageFull.id);
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 57695a66..0ef6b2d3 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
@@ -9,6 +9,7 @@ import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.media.MediaPlayer;
 import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.Build;
 import android.provider.Settings;
 import android.widget.Toast;
@@ -44,13 +45,12 @@ import pl.szczodrzynski.edziennik.App;
 import pl.szczodrzynski.edziennik.BuildConfig;
 import pl.szczodrzynski.edziennik.ExtensionsKt;
 import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.Notifier;
 import pl.szczodrzynski.edziennik.R;
+import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi;
 import pl.szczodrzynski.edziennik.data.db.entity.LoginStore;
 import pl.szczodrzynski.edziennik.network.NetworkUtils;
-import pl.szczodrzynski.edziennik.network.ServerRequest;
-import pl.szczodrzynski.edziennik.receivers.BootReceiver;
 import pl.szczodrzynski.edziennik.sync.SyncWorker;
+import pl.szczodrzynski.edziennik.sync.UpdateWorker;
 import pl.szczodrzynski.edziennik.ui.dialogs.changelog.ChangelogDialog;
 import pl.szczodrzynski.edziennik.ui.dialogs.settings.ProfileRemoveDialog;
 import pl.szczodrzynski.edziennik.utils.Themes;
@@ -59,7 +59,6 @@ import pl.szczodrzynski.edziennik.utils.models.Date;
 import pl.szczodrzynski.edziennik.utils.models.Time;
 
 import static android.app.Activity.RESULT_OK;
-import static pl.szczodrzynski.edziennik.App.APP_URL;
 import static pl.szczodrzynski.edziennik.ExtensionsKt.initDefaultLocale;
 import static pl.szczodrzynski.edziennik.data.db.entity.Profile.REGISTRATION_DISABLED;
 import static pl.szczodrzynski.edziennik.data.db.entity.Profile.REGISTRATION_ENABLED;
@@ -134,11 +133,11 @@ public class SettingsNewFragment extends MaterialAboutFragment {
          | |   | | | (_) | | | | |  __/
          |_|   |_|  \___/|_| |_|_|\__*/
     private Drawable getProfileDrawable() {
-        return app.profile.getImageDrawable(activity);
+        return app.getProfile().getImageDrawable(activity);
 
         /*Bitmap profileImage = null;
-        if (app.profile.getImage() != null && !app.profile.getImage().equals("")) {
-            profileImage = BitmapFactory.decodeFile(app.profile.getImage());
+        if (app.getProfile().getImage() != null && !app.getProfile().getImage().equals("")) {
+            profileImage = BitmapFactory.decodeFile(app.getProfile().getImage());
             RoundedBitmapDrawable roundDrawable = RoundedBitmapDrawableFactory.create(getResources(), profileImage);
             roundDrawable.setCircular(true);
             return roundDrawable;
@@ -159,8 +158,8 @@ public class SettingsNewFragment extends MaterialAboutFragment {
         if (!expandedOnly) {
 
             profileCardTitleItem = new MaterialAboutProfileItem(
-                    app.profile.getName(),
-                    getString(R.string.settings_profile_subtitle_format, app.profile.getSubname()),
+                    app.getProfile().getName(),
+                    getString(R.string.settings_profile_subtitle_format, app.getProfile().getSubname()),
                     getProfileDrawable()
             );
             profileCardTitleItem.setOnClickAction(() -> {
@@ -169,19 +168,19 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                         .items(
                                 getString(R.string.settings_profile_change_name),
                                 getString(R.string.settings_profile_change_image),
-                                app.profile.getImage() == null ? null : getString(R.string.settings_profile_remove_image)
+                                app.getProfile().getImage() == null ? null : getString(R.string.settings_profile_remove_image)
                         )
                         .itemsCallback((dialog, itemView, position, text) -> {
                             switch (position) {
                                 case 0:
                                     new MaterialDialog.Builder(activity)
                                             .title(getString(R.string.settings_profile_change_name_dialog_title))
-                                            .input(getString(R.string.settings_profile_change_name_dialog_text), app.profile.getName(), (dialog1, input) -> {
-                                                app.profile.setName(input.toString());
+                                            .input(getString(R.string.settings_profile_change_name_dialog_text), app.getProfile().getName(), (dialog1, input) -> {
+                                                app.getProfile().setName(input.toString());
                                                 profileCardTitleItem.setText(input);
                                                 profileCardTitleItem.setIcon(getProfileDrawable());
                                                 refreshMaterialAboutList();
-                                                app.profileSaveAsync();
+                                                app.profileSave();
                                             })
                                             .positiveText(R.string.ok)
                                             .negativeText(R.string.cancel)
@@ -191,10 +190,10 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                     startActivityForResult(CropImage.getPickImageChooserIntent(activity), 21);
                                     break;
                                 case 2:
-                                    app.profile.setImage(null);
+                                    app.getProfile().setImage(null);
                                     profileCardTitleItem.setIcon(getProfileDrawable());
                                     refreshMaterialAboutList();
-                                    app.profileSaveAsync();
+                                    app.profileSave();
                                     break;
                             }
                         })
@@ -226,10 +225,10 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                     .size(IconicsSize.dp(iconSizeDp))
                                     .color(IconicsColor.colorInt(iconColor))
                     )
-                    .setChecked(app.profile.getSyncEnabled())
+                    .setChecked(app.getProfile().getSyncEnabled())
                     .setOnChangeAction(((isChecked, tag) -> {
-                        app.profile.setSyncEnabled(isChecked);
-                        app.profileSaveAsync();
+                        app.getProfile().setSyncEnabled(isChecked);
+                        app.profileSave();
                         return true;
                     }))
             );
@@ -247,10 +246,10 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                     .size(IconicsSize.dp(iconSizeDp))
                                     .color(IconicsColor.colorInt(iconColor))
                     )
-                    .setChecked(app.profile.getSyncNotifications())
+                    .setChecked(app.getProfile().getSyncNotifications())
                     .setOnChangeAction(((isChecked, tag) -> {
-                        app.profile.setSyncNotifications(isChecked);
-                        app.profileSaveAsync();
+                        app.getProfile().setSyncNotifications(isChecked);
+                        app.profileSave();
                         return true;
                     }))
             );*/
@@ -265,7 +264,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                     .color(IconicsColor.colorInt(iconColor))
                     )
                     .setOnClickAction(() -> {
-                        new ProfileRemoveDialog(activity, app.profile.getId(), app.profile.getName());
+                        new ProfileRemoveDialog(activity, app.getProfile().getId(), app.getProfile().getName());
                     })
             );
 
@@ -294,9 +293,9 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                         .size(IconicsSize.dp(iconSizeDp))
                                         .color(IconicsColor.colorInt(iconColor))
                         )
-                        .setChecked(app.config.getUi().getSnowfall())
+                        .setChecked(app.getConfig().getUi().getSnowfall())
                         .setOnChangeAction((isChecked, tag) -> {
-                            app.config.getUi().setSnowfall(isChecked);
+                            app.getConfig().getUi().setSnowfall(isChecked);
                             activity.recreate();
                             return true;
                         })
@@ -316,11 +315,11 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                         new MaterialDialog.Builder(activity)
                                 .title(R.string.settings_theme_theme_text)
                                 .items(Themes.INSTANCE.getThemeNames(activity))
-                                .itemsCallbackSingleChoice(app.config.getUi().getTheme(), (dialog, itemView, which, text) -> {
-                                    if (app.config.getUi().getTheme() == which)
+                                .itemsCallbackSingleChoice(app.getConfig().getUi().getTheme(), (dialog, itemView, which, text) -> {
+                                    if (app.getConfig().getUi().getTheme() == which)
                                         return true;
-                                    app.config.getUi().setTheme(which);
-                                    Themes.INSTANCE.setThemeInt(app.config.getUi().getTheme());
+                                    app.getConfig().getUi().setTheme(which);
+                                    Themes.INSTANCE.setThemeInt(app.getConfig().getUi().getTheme());
                                     activity.recreate();
                                     return true;
                                 })
@@ -337,13 +336,13 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                     .size(IconicsSize.dp(iconSizeDp))
                                     .color(IconicsColor.colorInt(iconColor))
                     )
-                    .setChecked(app.config.getUi().getMiniMenuVisible())
+                    .setChecked(app.getConfig().getUi().getMiniMenuVisible())
                     .setOnChangeAction((isChecked, tag) -> {
                         // 0,1  1
                         // 0,0  0
                         // 1,1  0
                         // 1,0  1
-                        app.config.getUi().setMiniMenuVisible(isChecked);
+                        app.getConfig().getUi().setMiniMenuVisible(isChecked);
                         activity.getNavView().drawer.setMiniDrawerVisiblePortrait(isChecked);
                         return true;
                     })
@@ -390,7 +389,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                         buttonCaptions.add(getString(R.string.menu_settings));
                         //buttonCaptions.add(getString(R.string.title_debugging));
                         List<Integer> selectedIds = new ArrayList<>();
-                        for (int id: app.config.getUi().getMiniMenuButtons()) {
+                        for (int id: app.getConfig().getUi().getMiniMenuButtons()) {
                             selectedIds.add(buttonIds.indexOf(id));
                         }
                         new MaterialDialog.Builder(activity)
@@ -407,7 +406,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                         int id = buttonIds.get(index);
                                         list.add(id);
                                     }
-                                    app.config.getUi().setMiniMenuButtons(list);
+                                    app.getConfig().getUi().setMiniMenuButtons(list);
                                     activity.setDrawerItems();
                                     activity.getDrawer().updateBadges();
                                     return true;
@@ -427,7 +426,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                     .color(IconicsColor.colorInt(iconColor))
                     )
                     .setOnClickAction(() -> {
-                        if (app.config.getUi().getHeaderBackground() != null) {
+                        if (app.getConfig().getUi().getHeaderBackground() != null) {
                             new MaterialDialog.Builder(activity)
                                     .title(R.string.what_do_you_want_to_do)
                                     .items(getString(R.string.settings_theme_drawer_header_dialog_set), getString(R.string.settings_theme_drawer_header_dialog_restore))
@@ -436,7 +435,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                             startActivityForResult(CropImage.getPickImageChooserIntent(activity), 22);
                                         } else {
                                             MainActivity ac = (MainActivity) getActivity();
-                                            app.config.getUi().setHeaderBackground(null);
+                                            app.getConfig().getUi().setHeaderBackground(null);
                                             if (ac != null) {
                                                 ac.getDrawer().setAccountHeaderBackground(null);
                                                 ac.getDrawer().open();
@@ -461,7 +460,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                     .color(IconicsColor.colorInt(iconColor))
                     )
                     .setOnClickAction(() -> {
-                        if (app.config.getUi().getAppBackground() != null) {
+                        if (app.getConfig().getUi().getAppBackground() != null) {
                             new MaterialDialog.Builder(activity)
                                     .title(R.string.what_do_you_want_to_do)
                                     .items(getString(R.string.settings_theme_app_background_dialog_set), getString(R.string.settings_theme_app_background_dialog_restore))
@@ -469,7 +468,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                         if (position == 0) {
                                             startActivityForResult(CropImage.getPickImageChooserIntent(activity), 23);
                                         } else {
-                                            app.config.getUi().setAppBackground(null);
+                                            app.getConfig().getUi().setAppBackground(null);
                                             activity.recreate();
                                         }
                                     })
@@ -490,9 +489,9 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                     .size(IconicsSize.dp(iconSizeDp))
                                     .color(IconicsColor.colorInt(iconColor))
                     )
-                            .setChecked(app.config.getUi().getOpenDrawerOnBackPressed())
+                            .setChecked(app.getConfig().getUi().getOpenDrawerOnBackPressed())
                             .setOnChangeAction((isChecked, tag) -> {
-                                app.config.getUi().setOpenDrawerOnBackPressed(isChecked);
+                                app.getConfig().getUi().setOpenDrawerOnBackPressed(isChecked);
                                 return true;
                             })
             );
@@ -510,25 +509,25 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                  |__*/
     private String getSyncCardIntervalSubText() {
 
-        if (app.config.getSync().getInterval() < 60 * 60)
+        if (app.getConfig().getSync().getInterval() < 60 * 60)
             return getString(
                     R.string.settings_sync_sync_interval_subtext_format,
-                    ExtensionsKt.plural(activity, R.plurals.time_till_minutes, app.config.getSync().getInterval() / 60)
+                    ExtensionsKt.plural(activity, R.plurals.time_till_minutes, app.getConfig().getSync().getInterval() / 60)
             );
         return getString(
                 R.string.settings_sync_sync_interval_subtext_format,
-                ExtensionsKt.plural(activity, R.plurals.time_till_hours, app.config.getSync().getInterval() / 60 / 60) +
-                (app.config.getSync().getInterval() / 60 % 60 == 0 ?
+                ExtensionsKt.plural(activity, R.plurals.time_till_hours, app.getConfig().getSync().getInterval() / 60 / 60) +
+                (app.getConfig().getSync().getInterval() / 60 % 60 == 0 ?
                         "" :
-                        " " + ExtensionsKt.plural(activity, R.plurals.time_till_minutes, app.config.getSync().getInterval() / 60 % 60)
+                        " " + ExtensionsKt.plural(activity, R.plurals.time_till_minutes, app.getConfig().getSync().getInterval() / 60 % 60)
                 )
         );
     }
     private String getSyncCardQuietHoursSubText() {
         return getString(
-                app.config.getSync().getQuietHoursStart() >= app.config.getSync().getQuietHoursEnd() ? R.string.settings_sync_quiet_hours_subtext_next_day_format : R.string.settings_sync_quiet_hours_subtext_format,
-                Time.fromMillis(Math.abs(app.config.getSync().getQuietHoursStart())).getStringHM(),
-                Time.fromMillis(app.config.getSync().getQuietHoursEnd()).getStringHM()
+                app.getConfig().getSync().getQuietHoursStart() >= app.getConfig().getSync().getQuietHoursEnd() ? R.string.settings_sync_quiet_hours_subtext_next_day_format : R.string.settings_sync_quiet_hours_subtext_format,
+                Time.fromMillis(Math.abs(app.getConfig().getSync().getQuietHoursStart())).getStringHM(),
+                Time.fromMillis(app.getConfig().getSync().getQuietHoursEnd()).getStringHM()
         );
     }
     private MaterialAboutItem getSyncCardWifiItem() {
@@ -540,9 +539,9 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                         .size(IconicsSize.dp(iconSizeDp))
                         .color(IconicsColor.colorInt(iconColor))
         )
-        .setChecked(app.config.getSync().getOnlyWifi())
+        .setChecked(app.getConfig().getSync().getOnlyWifi())
         .setOnChangeAction((isChecked, tag) -> {
-            app.config.getSync().setOnlyWifi(isChecked);
+            app.getConfig().getSync().setOnlyWifi(isChecked);
             SyncWorker.Companion.rescheduleNext(app);
             return true;
         });
@@ -562,10 +561,10 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                             .color(IconicsColor.colorInt(iconColor))
             );
             syncCardIntervalItem.setSubTextChecked(getSyncCardIntervalSubText());
-            syncCardIntervalItem.setChecked(app.config.getSync().getEnabled());
+            syncCardIntervalItem.setChecked(app.getConfig().getSync().getEnabled());
             syncCardIntervalItem.setOnClickAction(() -> {
                 List<CharSequence> intervalNames = new ArrayList<>();
-                if (App.devMode && false) {
+                if (App.Companion.getDevMode() && false) {
                     intervalNames.add(ExtensionsKt.plural(activity, R.plurals.time_till_seconds, 30));
                     intervalNames.add(ExtensionsKt.plural(activity, R.plurals.time_till_minutes, 2));
                 }
@@ -577,7 +576,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.devMode && false) {
+                if (App.Companion.getDevMode() && false) {
                     intervals.add(30);
                     intervals.add(2 * 60);
                 }
@@ -592,17 +591,17 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                         .title(getString(R.string.settings_sync_sync_interval_dialog_title))
                         .content(getString(R.string.settings_sync_sync_interval_dialog_text))
                         .items(intervalNames)
-                        .itemsCallbackSingleChoice(intervals.indexOf(app.config.getSync().getInterval()), (dialog, itemView, which, text) -> {
-                            app.config.getSync().setInterval(intervals.get(which));
+                        .itemsCallbackSingleChoice(intervals.indexOf(app.getConfig().getSync().getInterval()), (dialog, itemView, which, text) -> {
+                            app.getConfig().getSync().setInterval(intervals.get(which));
                             syncCardIntervalItem.setSubTextChecked(getSyncCardIntervalSubText());
                             syncCardIntervalItem.setChecked(true);
-                            if (!app.config.getSync().getEnabled()) {
+                            if (!app.getConfig().getSync().getEnabled()) {
                                 addCardItem(CARD_SYNC, 1, getSyncCardWifiItem());
                             }
                             else {
                                 refreshMaterialAboutList();
                             }
-                            app.config.getSync().setEnabled(true);
+                            app.getConfig().getSync().setEnabled(true);
                             // app.appConfig modifications have to surround syncCardIntervalItem and those ifs
                             SyncWorker.Companion.rescheduleNext(app);
                             return true;
@@ -610,19 +609,19 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                         .show();
             });
             syncCardIntervalItem.setOnChangeAction((isChecked, tag) -> {
-                if (isChecked && !app.config.getSync().getEnabled()) {
+                if (isChecked && !app.getConfig().getSync().getEnabled()) {
                     addCardItem(CARD_SYNC, 1, getSyncCardWifiItem());
                 }
                 else if (!isChecked) {
                     removeCardItem(CARD_SYNC, 1);
                 }
-                app.config.getSync().setEnabled(isChecked);
+                app.getConfig().getSync().setEnabled(isChecked);
                 SyncWorker.Companion.rescheduleNext(app);
                 return true;
             });
             items.add(syncCardIntervalItem);
 
-            if (app.config.getSync().getEnabled()) {
+            if (app.getConfig().getSync().getEnabled()) {
                 items.add(getSyncCardWifiItem());
             }
 
@@ -652,7 +651,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                             .size(IconicsSize.dp(iconSizeDp))
                             .color(IconicsColor.colorInt(iconColor))
             );
-            syncCardQuietHoursItem.setChecked(app.config.getSync().getQuietHoursStart() > 0);
+            syncCardQuietHoursItem.setChecked(app.getConfig().getSync().getQuietHoursStart() > 0);
             syncCardQuietHoursItem.setSubTextChecked(getSyncCardQuietHoursSubText());
             syncCardQuietHoursItem.setOnClickAction(() -> {
                 new MaterialDialog.Builder(activity)
@@ -664,10 +663,10 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                         .itemsCallback((dialog, itemView, position, text) -> {
                             if (position == 0) {
                                 // set beginning
-                                Time time = Time.fromMillis(Math.abs(app.config.getSync().getQuietHoursStart()));
+                                Time time = Time.fromMillis(Math.abs(app.getConfig().getSync().getQuietHoursStart()));
                                 TimePickerDialog.newInstance((v2, hourOfDay, minute, second) -> {
                                     // if it's disabled, it'll be enabled automatically
-                                    app.config.getSync().setQuietHoursStart(new Time(hourOfDay, minute, second).getInMillis());
+                                    app.getConfig().getSync().setQuietHoursStart(new Time(hourOfDay, minute, second).getInMillis());
                                     syncCardQuietHoursItem.setChecked(true);
                                     syncCardQuietHoursItem.setSubTextChecked(getSyncCardQuietHoursSubText());
                                     refreshMaterialAboutList();
@@ -675,13 +674,13 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                             }
                             else {
                                 // set end
-                                Time time = Time.fromMillis(app.config.getSync().getQuietHoursEnd());
+                                Time time = Time.fromMillis(app.getConfig().getSync().getQuietHoursEnd());
                                 TimePickerDialog.newInstance((v2, hourOfDay, minute, second) -> {
-                                    if (app.config.getSync().getQuietHoursStart() < 0) {
+                                    if (app.getConfig().getSync().getQuietHoursStart() < 0) {
                                         // if it's disabled, enable
-                                        app.config.getSync().setQuietHoursStart(-1 * app.config.getSync().getQuietHoursStart());
+                                        app.getConfig().getSync().setQuietHoursStart(-1 * app.getConfig().getSync().getQuietHoursStart());
                                     }
-                                    app.config.getSync().setQuietHoursEnd(new Time(hourOfDay, minute, second).getInMillis());
+                                    app.getConfig().getSync().setQuietHoursEnd(new Time(hourOfDay, minute, second).getInMillis());
                                     syncCardQuietHoursItem.setChecked(true);
                                     syncCardQuietHoursItem.setSubTextChecked(getSyncCardQuietHoursSubText());
                                     refreshMaterialAboutList();
@@ -691,15 +690,15 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                         .show();
             });
             syncCardQuietHoursItem.setOnChangeAction((isChecked, tag) -> {
-                if (isChecked && app.config.getSync().getQuietHoursStart() < 0) {
-                    app.config.getSync().setQuietHoursStart(app.config.getSync().getQuietHoursStart() * -1);
+                if (isChecked && app.getConfig().getSync().getQuietHoursStart() < 0) {
+                    app.getConfig().getSync().setQuietHoursStart(app.getConfig().getSync().getQuietHoursStart() * -1);
                 }
-                else if (!isChecked && app.config.getSync().getQuietHoursStart() > 0) {
-                    app.config.getSync().setQuietHoursStart(app.config.getSync().getQuietHoursStart() * -1);
+                else if (!isChecked && app.getConfig().getSync().getQuietHoursStart() > 0) {
+                    app.getConfig().getSync().setQuietHoursStart(app.getConfig().getSync().getQuietHoursStart() * -1);
                 }
-                else if (isChecked && app.config.getSync().getQuietHoursStart() == 0) {
-                    app.config.getSync().setQuietHoursStart(new Time(22, 30, 0).getInMillis());
-                    app.config.getSync().setQuietHoursEnd(new Time(5, 30, 0).getInMillis());
+                else if (isChecked && app.getConfig().getSync().getQuietHoursStart() == 0) {
+                    app.getConfig().getSync().setQuietHoursStart(new Time(22, 30, 0).getInMillis());
+                    app.getConfig().getSync().setQuietHoursEnd(new Time(5, 30, 0).getInMillis());
                     syncCardQuietHoursItem.setSubTextChecked(getSyncCardQuietHoursSubText());
                     refreshMaterialAboutList();
                 }
@@ -748,9 +747,10 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                     .size(IconicsSize.dp(iconSizeDp))
                                     .color(IconicsColor.colorInt(iconColor))
                     )
-                    .setChecked(app.config.getSync().getNotifyAboutUpdates())
+                    .setChecked(app.getConfig().getSync().getNotifyAboutUpdates())
                     .setOnChangeAction((isChecked, tag) -> {
-                        app.config.getSync().setNotifyAboutUpdates(isChecked);
+                        app.getConfig().getSync().setNotifyAboutUpdates(isChecked);
+                        UpdateWorker.Companion.rescheduleNext(app);
                         return true;
                     })
             );
@@ -766,16 +766,12 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                         .color(IconicsColor.colorInt(iconColor))
                         )
                         .setOnClickAction(() -> {
-                            String channel = Notifier.GROUP_KEY_NOTIFICATIONS;
+                            String channel = app.getNotifications().getDataKey();
                             Intent intent = new Intent();
                             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
                                 intent.addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK);
-                                if (channel != null) {
-                                    intent.setAction(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS);
-                                    intent.putExtra(Settings.EXTRA_CHANNEL_ID, channel);
-                                } else {
-                                    intent.setAction(Settings.ACTION_APP_NOTIFICATION_SETTINGS);
-                                }
+                                intent.setAction(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS);
+                                intent.putExtra(Settings.EXTRA_CHANNEL_ID, channel);
                                 intent.putExtra(Settings.EXTRA_APP_PACKAGE, activity.getPackageName());
                             } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                                 if (channel != null) {
@@ -814,7 +810,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                       __/ |
                      |__*/
     private String getRegisterCardAverageModeSubText() {
-        switch (App.getConfig().forProfile().getGrades().getYearAverageMode()) {
+        switch (app.getConfig().forProfile().getGrades().getYearAverageMode()) {
             default:
             case YEAR_1_AVG_2_AVG:
                 return getString(R.string.settings_register_avg_mode_0_short);
@@ -829,11 +825,11 @@ public class SettingsNewFragment extends MaterialAboutFragment {
         }
     }
     private String getRegisterCardBellSyncSubText() {
-        if (app.config.getTimetable().getBellSyncDiff() == null)
+        if (app.getConfig().getTimetable().getBellSyncDiff() == null)
             return getString(R.string.settings_register_bell_sync_subtext_disabled);
         return getString(
                 R.string.settings_register_bell_sync_subtext_format,
-                (app.config.getTimetable().getBellSyncMultiplier() == -1 ? "-" : "+") + app.config.getTimetable().getBellSyncDiff().getStringHMS()
+                (app.getConfig().getTimetable().getBellSyncMultiplier() == -1 ? "-" : "+") + app.getConfig().getTimetable().getBellSyncDiff().getStringHMS()
         );
     }
     private MaterialAboutItem getRegisterCardSharedEventsItem() {
@@ -845,10 +841,10 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                         .size(IconicsSize.dp(iconSizeDp))
                         .color(IconicsColor.colorInt(iconColor))
         )
-        .setChecked(app.profile.getEnableSharedEvents())
+        .setChecked(app.getProfile().getEnableSharedEvents())
         .setOnChangeAction((isChecked, tag) -> {
-            app.profile.setEnableSharedEvents(isChecked);
-            app.profileSaveAsync();
+            app.getProfile().setEnableSharedEvents(isChecked);
+            app.profileSave();
             if (isChecked) new MaterialDialog.Builder(activity)
                     .title(R.string.event_sharing)
                     .content(getString(R.string.settings_register_shared_events_dialog_enabled_text))
@@ -894,8 +890,8 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                         .title(getString(R.string.settings_register_avg_mode_dialog_title))
                         .content(getString(R.string.settings_register_avg_mode_dialog_text))
                         .items(modeNames)
-                        .itemsCallbackSingleChoice(modeIds.indexOf(App.getConfig().forProfile().getGrades().getYearAverageMode()), (dialog, itemView, which, text) -> {
-                            App.getConfig().forProfile().getGrades().setYearAverageMode(modeIds.get(which));
+                        .itemsCallbackSingleChoice(modeIds.indexOf(app.getConfig().forProfile().getGrades().getYearAverageMode()), (dialog, itemView, which, text) -> {
+                            app.getConfig().forProfile().getGrades().setYearAverageMode(modeIds.get(which));
                             registerCardAverageModeItem.setSubText(getRegisterCardAverageModeSubText());
                             refreshMaterialAboutList();
                             return true;
@@ -912,7 +908,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                             .size(IconicsSize.dp(iconSizeDp))
                             .color(IconicsColor.colorInt(iconColor))
             );
-            registerCardAllowRegistrationItem.setChecked(app.profile.getRegistration() == REGISTRATION_ENABLED);
+            registerCardAllowRegistrationItem.setChecked(app.getProfile().getRegistration() == REGISTRATION_ENABLED);
             registerCardAllowRegistrationItem.setOnChangeAction((isChecked, tag) -> {
                 if (isChecked) new MaterialDialog.Builder(activity)
                             .title(getString(R.string.settings_register_allow_registration_dialog_enabled_title))
@@ -921,8 +917,8 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                             .negativeText(R.string.not_now)
                             .onPositive(((dialog, which) -> {
                                 registerCardAllowRegistrationItem.setChecked(true);
-                                app.profile.setRegistration(REGISTRATION_ENABLED);
-                                app.profileSaveAsync();
+                                app.getProfile().setRegistration(REGISTRATION_ENABLED);
+                                app.profileSave();
                                 addCardItem(CARD_REGISTER, 2, getRegisterCardSharedEventsItem());
                                 refreshMaterialAboutList();
                             }))
@@ -934,8 +930,8 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                             .negativeText(R.string.cancel)
                             .onPositive(((dialog, which) -> {
                                 registerCardAllowRegistrationItem.setChecked(false);
-                                app.profile.setRegistration(REGISTRATION_DISABLED);
-                                app.profileSaveAsync();
+                                app.getProfile().setRegistration(REGISTRATION_DISABLED);
+                                app.profileSave();
                                 removeCardItem(CARD_REGISTER, 2);
                                 refreshMaterialAboutList();
                                 MaterialDialog progressDialog = new MaterialDialog.Builder(activity)
@@ -944,29 +940,20 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                         .positiveText(R.string.ok)
                                         .negativeText(R.string.abort)
                                         .show();
-                                new ServerRequest(app, app.requestScheme + APP_URL + "main.php?unregister", "Edziennik/UREG", app.profile)
-                                        .withUsername(app.profile.getUserCode())
-                                        .run((e, result) -> {
-                                            progressDialog.dismiss();
-                                            if (result == null || !result.get("success").getAsString().equals("true")) {
-                                                new MaterialDialog.Builder(activity)
-                                                        .title(R.string.error)
-                                                        .content(getString(R.string.settings_register_allow_registration_dialog_disabling_error_text))
-                                                        .positiveText(R.string.ok)
-                                                        .show();
-                                            }
-                                            else {
-                                                Toast.makeText(activity, getString(R.string.settings_register_allow_registration_dialog_disabling_finished), Toast.LENGTH_SHORT).show();
-                                            }
-                                        });
-
+                                AsyncTask.execute(() -> {
+                                    new SzkolnyApi(app).unregisterAppUser(app.getProfile().getUserCode());
+                                    activity.runOnUiThread(() -> {
+                                        progressDialog.dismiss();
+                                        Toast.makeText(activity, getString(R.string.settings_register_allow_registration_dialog_disabling_finished), Toast.LENGTH_SHORT).show();
+                                    });
+                                });
                             }))
                             .show();
                 return false;
             });
             items.add(registerCardAllowRegistrationItem);
 
-            if (app.profile.getRegistration() == REGISTRATION_ENABLED) {
+            if (app.getProfile().getRegistration() == REGISTRATION_ENABLED) {
                 items.add(getRegisterCardSharedEventsItem());
             }
 
@@ -991,8 +978,8 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                         .neutralText(R.string.reset)
                         .inputRangeRes(8, 8, R.color.md_red_500)
                         .input("±H:MM:SS",
-                                (app.config.getTimetable().getBellSyncDiff() != null
-                                        ? (app.config.getTimetable().getBellSyncMultiplier() == -1 ? "-" : "+") + app.config.getTimetable().getBellSyncDiff().getStringHMS()
+                                (app.getConfig().getTimetable().getBellSyncDiff() != null
+                                        ? (app.getConfig().getTimetable().getBellSyncMultiplier() == -1 ? "-" : "+") + app.getConfig().getTimetable().getBellSyncDiff().getStringHMS()
                                         : ""), (dialog, input) -> {
                                     if (input == null)
                                         return;
@@ -1005,10 +992,10 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                         return;
                                     }
                                     if (input.charAt(0) == '+') {
-                                        app.config.getTimetable().setBellSyncMultiplier(1);
+                                        app.getConfig().getTimetable().setBellSyncMultiplier(1);
                                     }
                                     else if (input.charAt(0) == '-') {
-                                        app.config.getTimetable().setBellSyncMultiplier(-1);
+                                        app.getConfig().getTimetable().setBellSyncMultiplier(-1);
                                     }
                                     else {
                                         Toast.makeText(activity, R.string.bell_sync_adjust_error, Toast.LENGTH_SHORT).show();
@@ -1029,13 +1016,13 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                         return;
                                     }
 
-                                    app.config.getTimetable().setBellSyncDiff(new Time(hour, minute, second));
+                                    app.getConfig().getTimetable().setBellSyncDiff(new Time(hour, minute, second));
                                     registerCardBellSyncItem.setSubText(getRegisterCardBellSyncSubText());
                                     refreshMaterialAboutList();
                                 })
                         .onNeutral(((dialog, which) -> {
-                            app.config.getTimetable().setBellSyncDiff(null);
-                            app.config.getTimetable().setBellSyncMultiplier(0);
+                            app.getConfig().getTimetable().setBellSyncDiff(null);
+                            app.getConfig().getTimetable().setBellSyncMultiplier(0);
                             registerCardBellSyncItem.setSubText(getRegisterCardBellSyncSubText());
                             refreshMaterialAboutList();
                         }))
@@ -1052,10 +1039,9 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                     .size(IconicsSize.dp(iconSizeDp))
                                     .color(IconicsColor.colorInt(iconColor))
                     )
-                            .setChecked(!app.config.getFor(App.profileId).getGrades().getCountZeroToAvg())
+                            .setChecked(!app.getConfig().getFor(app.getProfileId()).getGrades().getCountZeroToAvg())
                             .setOnChangeAction((isChecked, tag) -> {
-                                app.config.getFor(App.profileId).getGrades().setCountZeroToAvg(!isChecked);
-                                app.saveConfig("dontCountZeroToAverage");
+                                app.getConfig().getFor(app.getProfileId()).getGrades().setCountZeroToAvg(!isChecked);
                                 return true;
                             })
             );
@@ -1069,14 +1055,14 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                     .size(IconicsSize.dp(iconSizeDp))
                                     .color(IconicsColor.colorInt(iconColor))
                     )
-                    .setChecked(app.config.getTimetable().getCountInSeconds())
+                    .setChecked(app.getConfig().getTimetable().getCountInSeconds())
                     .setOnChangeAction((isChecked, tag) -> {
-                        app.config.getTimetable().setCountInSeconds(isChecked);
+                        app.getConfig().getTimetable().setCountInSeconds(isChecked);
                         return true;
                     })
             );
 
-            if (app.profile.getLoginStoreType() == LoginStore.LOGIN_TYPE_LIBRUS) {
+            if (app.getProfile().getLoginStoreType() == LoginStore.LOGIN_TYPE_LIBRUS) {
                 items.add(
                         new MaterialAboutSwitchItem(
                                 getString(R.string.settings_register_show_teacher_absences_text),
@@ -1086,10 +1072,10 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                         .size(IconicsSize.dp(iconSizeDp))
                                         .color(IconicsColor.colorInt(iconColor))
                         )
-                        .setChecked(app.profile.getStudentData("showTeacherAbsences", true))
+                        .setChecked(app.getProfile().getStudentData("showTeacherAbsences", true))
                         .setOnChangeAction((isChecked, tag) -> {
-                            app.profile.putStudentData("showTeacherAbsences", isChecked);
-                            app.profileSaveAsync();
+                            app.getProfile().putStudentData("showTeacherAbsences", isChecked);
+                            app.profileSave();
                             return true;
                         })
                 );
@@ -1182,20 +1168,19 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                 .title(getString(R.string.settings_about_language_dialog_title))
                                 .content(getString(R.string.settings_about_language_dialog_text))
                                 .items(getString(R.string.language_system), getString(R.string.language_polish), getString(R.string.language_english))
-                                .itemsCallbackSingleChoice(app.config.getUi().getLanguage() == null ? 0 : app.config.getUi().getLanguage().equals("pl") ? 1 : 2, (dialog, itemView, which, text) -> {
+                                .itemsCallbackSingleChoice(app.getConfig().getUi().getLanguage() == null ? 0 : app.getConfig().getUi().getLanguage().equals("pl") ? 1 : 2, (dialog, itemView, which, text) -> {
                                     switch (which) {
                                         case 0:
-                                            app.config.getUi().setLanguage(null);
+                                            app.getConfig().getUi().setLanguage(null);
                                             initDefaultLocale();
                                             break;
                                         case 1:
-                                            app.config.getUi().setLanguage("pl");
+                                            app.getConfig().getUi().setLanguage("pl");
                                             break;
                                         case 2:
-                                            app.config.getUi().setLanguage("en");
+                                            app.getConfig().getUi().setLanguage("en");
                                             break;
                                     }
-                                    app.saveConfig("language");
                                     activity.recreate(MainActivity.DRAWER_ITEM_SETTINGS);
                                     return true;
                                 })
@@ -1225,10 +1210,9 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                                     .positiveText(R.string.ok)
                                     .show();
                         } else {
-                            BootReceiver br = new BootReceiver();
-                            Intent i = new Intent();
-                            i.putExtra("UserChecked", true);
-                            br.onReceive(getContext(), i);
+                            AsyncTask.execute(() -> {
+                                UpdateWorker.Companion.runNow(app);
+                            });
                         }
                     })
                     .build());
@@ -1280,7 +1264,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                 })
                 .build());*/
 
-            if (App.devMode) {
+            if (App.Companion.getDevMode()) {
                 items.add(new MaterialAboutActionItem.Builder()
                         .text(R.string.settings_about_crash_text)
                         .subText(R.string.settings_about_crash_subtext)
@@ -1306,7 +1290,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
         this.activity = (MainActivity) activityContext;
         this.app = (App) activity.getApplication();
         iconColor = Themes.INSTANCE.getPrimaryTextColor(activityContext);
-        if (app.profile == null)
+        if (app.getProfile() == null)
             return new MaterialAboutList.Builder().build();
 
         MaterialAboutList materialAboutList = new MaterialAboutList();
@@ -1347,10 +1331,10 @@ public class SettingsNewFragment extends MaterialAboutFragment {
             Uri uri = result.getUri();
 
             File photoFile = new File(uri.getPath());
-            File destFile = new File(getContext().getFilesDir(),"profile"+ app.profile.getId() +".jpg");
+            File destFile = new File(getContext().getFilesDir(),"profile"+ app.getProfile().getId() +".jpg");
             if (destFile.exists()) {
                 destFile.delete();
-                destFile = new File(getContext().getFilesDir(),"profile"+ app.profile.getId() +".jpg");
+                destFile = new File(getContext().getFilesDir(),"profile"+ app.getProfile().getId() +".jpg");
             }
 
             d(TAG, "Source file: "+photoFile.getAbsolutePath());
@@ -1362,8 +1346,8 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                 try (FileOutputStream out = new FileOutputStream(destFile)) {
                     smallImage.compress(Bitmap.CompressFormat.JPEG, 80, out); // bmp is your Bitmap instance
                     // PNG is a lossless format, the compression factor (100) is ignored
-                    app.profile.setImage(destFile.getAbsolutePath());
-                    app.profileSaveAsync();
+                    app.getProfile().setImage(destFile.getAbsolutePath());
+                    app.profileSave();
                     profileCardTitleItem.setIcon(getProfileDrawable());
                     refreshMaterialAboutList();
                     if (photoFile.exists()) {
@@ -1377,8 +1361,8 @@ public class SettingsNewFragment extends MaterialAboutFragment {
             else {
                 if (photoFile.renameTo(destFile)) {
                     // success
-                    app.profile.setImage(destFile.getAbsolutePath());
-                    app.profileSaveAsync();
+                    app.getProfile().setImage(destFile.getAbsolutePath());
+                    app.profileSave();
                     profileCardTitleItem.setIcon(getProfileDrawable());
                     refreshMaterialAboutList();
                     //((MainActivity)getActivity()).recreateWithTransition(); // TODO somehow update miniDrawer profile picture
@@ -1394,8 +1378,8 @@ public class SettingsNewFragment extends MaterialAboutFragment {
             if (uri != null) {
                 String path = getRealPathFromURI(activity, uri);
                 if (path.toLowerCase().endsWith(".gif")) {
-                    app.profile.setImage(path);
-                    app.profileSaveAsync();
+                    app.getProfile().setImage(path);
+                    app.profileSave();
                     profileCardTitleItem.setIcon(getProfileDrawable());
                     refreshMaterialAboutList();
                 }
@@ -1413,9 +1397,9 @@ public class SettingsNewFragment extends MaterialAboutFragment {
         else if (requestCode == 22 && resultCode == Activity.RESULT_OK) {
             Uri uri = data.getData();
             if (uri != null) {
-                app.config.getUi().setHeaderBackground(getRealPathFromURI(getContext(), uri));
+                app.getConfig().getUi().setHeaderBackground(getRealPathFromURI(getContext(), uri));
                 if (activity != null) {
-                    activity.getDrawer().setAccountHeaderBackground(app.config.getUi().getHeaderBackground());
+                    activity.getDrawer().setAccountHeaderBackground(app.getConfig().getUi().getHeaderBackground());
                     activity.getDrawer().open();
                 }
             }
@@ -1423,7 +1407,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
         else if (requestCode == 23 && resultCode == Activity.RESULT_OK) {
             Uri uri = data.getData();
             if (uri != null) {
-                app.config.getUi().setAppBackground(getRealPathFromURI(getContext(), uri));
+                app.getConfig().getUi().setAppBackground(getRealPathFromURI(getContext(), uri));
                 if (activity != null) {
                     activity.recreate();
                 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableDayFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableDayFragment.kt
index dc34408c..702f09a3 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableDayFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableDayFragment.kt
@@ -22,9 +22,9 @@ import com.linkedin.android.tachyon.DayViewConfig
 import kotlinx.coroutines.*
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_TIMETABLE
-import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask
-import pl.szczodrzynski.edziennik.data.db.full.EventFull
+import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.data.db.entity.Lesson
+import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.data.db.full.LessonFull
 import pl.szczodrzynski.edziennik.databinding.TimetableLessonBinding
 import pl.szczodrzynski.edziennik.databinding.TimetableNoTimetableBinding
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/webpush/WebPushConfigActivity.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/webpush/WebPushConfigActivity.java
deleted file mode 100644
index 2c6651f0..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/webpush/WebPushConfigActivity.java
+++ /dev/null
@@ -1,299 +0,0 @@
-package pl.szczodrzynski.edziennik.ui.modules.webpush;
-
-import android.Manifest;
-import android.content.pm.PackageManager;
-import androidx.databinding.DataBindingUtil;
-import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-
-import android.os.Handler;
-import android.os.Looper;
-import android.view.Gravity;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.TableRow;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.afollestad.materialdialogs.MaterialDialog;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.Result;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import me.dm7.barcodescanner.zxing.ZXingScannerView;
-import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.databinding.ActivityWebPushConfigBinding;
-import pl.szczodrzynski.edziennik.network.ServerRequest;
-import pl.szczodrzynski.edziennik.utils.Anim;
-import pl.szczodrzynski.edziennik.utils.Themes;
-import pl.szczodrzynski.edziennik.utils.Utils;
-
-import static pl.szczodrzynski.edziennik.App.APP_URL;
-import static pl.szczodrzynski.edziennik.data.db.entity.Profile.REGISTRATION_ENABLED;
-
-public class WebPushConfigActivity extends AppCompatActivity implements ZXingScannerView.ResultHandler {
-    private static final String TAG = "WebPushConfigActivity";
-    private ZXingScannerView mScannerView;
-
-    ActivityWebPushConfigBinding b;
-
-    boolean cameraRunning = false;
-
-    private void showCamera() {
-        cameraRunning = true;
-        Anim.fadeIn(b.qrCodeScanner, 500, null);
-        b.webPushConfig.setVisibility(View.GONE);
-        b.qrCodeScanner.startCamera();
-        b.qrCodeScanner.setResultHandler(this);
-    }
-
-    private App app;
-
-    private void hideCamera() {
-        cameraRunning = false;
-        Anim.fadeOut(b.qrCodeScanner, 500, null);
-        b.webPushConfig.setVisibility(View.VISIBLE);
-        b.qrCodeScanner.stopCamera();
-    }
-
-    private void getPairedBrowsers(@NonNull String newFcm, int removeId) {
-        Anim.fadeIn(b.browserListProgressBar, 500, null);
-        Anim.fadeOut(b.browserList, 500, null);
-        Anim.fadeOut(b.browserListErrorText, 500, null);
-        new ServerRequest(app, app.requestScheme + APP_URL + "main.php?web_push_list"+(!newFcm.equals("") ? "&web_push_pair" : "") + (removeId != -1 ? "&web_push_unpair" : ""), "WebPushConfigActivity", app.profile)
-                .setBodyParameter((removeId != -1 ? "id" : "browser_fcm"), (removeId != -1 ? Integer.toString(removeId) : newFcm))
-                .run(((e, result) -> {
-                    new Handler(Looper.getMainLooper()).post(() -> {
-                        Anim.fadeOut(b.browserListProgressBar, 500, null);
-                        if (result == null || result.get("browser_count") == null) {
-                            b.browserListErrorText.setText(R.string.web_push_connection_error);
-                            Anim.fadeIn(b.browserListErrorText, 500, null);
-                            return;
-                        }
-                        if (result.get("browser_count").getAsInt() == 0) {
-                            b.browserListErrorText.setText(R.string.web_push_no_browsers);
-                            Anim.fadeIn(b.browserListErrorText, 500, null);
-                            if (app.appConfig.webPushEnabled) {
-                                app.appConfig.webPushEnabled = false;
-                                app.appConfig.savePending = true;
-                            }
-                            return;
-                        }
-
-                        b.browserList.removeAllViews();
-
-                        LinearLayout.LayoutParams textViewParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
-                        textViewParams.setMargins(0, 0, Utils.dpToPx(8), 0);
-                        LinearLayout.LayoutParams buttonParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-                        LinearLayout.LayoutParams tableRowParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
-
-                        JsonArray browsers = result.get("browsers").getAsJsonArray();
-                        for (JsonElement browserEl: browsers) {
-                            JsonObject browser = browserEl.getAsJsonObject();
-                            if (browser != null) {
-                                //Log.d(TAG, browser.toString());
-                                String browserDescription = "(error)";
-                                if (browser.get("description") != null) {
-                                    browserDescription = browser.get("description").getAsString();
-                                }
-                                int browserId = -1;
-                                if (browser.get("id") != null) {
-                                    browserId = browser.get("id").getAsInt();
-                                }
-
-                                TableRow browserRow = new TableRow(this);
-                                browserRow.setLayoutParams(tableRowParams);
-
-                                TextView browserDescriptionText = new TextView(this);
-                                //browserDescriptionText.setLayoutParams(textViewParams);
-                                browserDescriptionText.setText(browserDescription);
-                                browserDescriptionText.setGravity(Gravity.CENTER_VERTICAL);
-                                browserRow.addView(browserDescriptionText);
-
-                                Button browserRemoveButton = new Button(this, null, android.R.attr.buttonStyleSmall);
-                                browserRemoveButton.setMinHeight(0);
-                                browserRemoveButton.setText(R.string.remove);
-                                int finalBrowserId = browserId;
-                                browserRemoveButton.setOnClickListener((v -> {
-                                    new MaterialDialog.Builder(this)
-                                            .title(R.string.are_you_sure)
-                                            .content(R.string.web_push_really_remove)
-                                            .positiveText(R.string.yes)
-                                            .negativeText(R.string.no)
-                                            .onPositive(((dialog, which) -> getPairedBrowsers("", finalBrowserId)))
-                                            .show();
-                                }));
-                                browserRow.addView(browserRemoveButton/*, buttonParams*/);
-
-                                b.browserList.addView(browserRow);
-                            }
-                        }
-                        if (!app.appConfig.webPushEnabled) {
-                            app.appConfig.webPushEnabled = true;
-                            app.appConfig.savePending = true;
-                        }
-                        Anim.fadeIn(b.browserList, 500, null);
-                    });
-                }));
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
-        switch (requestCode) {
-            case 1: {
-                // If request is cancelled, the result arrays are empty.
-                if (grantResults.length > 0
-                        && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    showCamera();
-                } else {
-                    // permission denied, boo! Disable the
-                    // functionality that depends on this permission.
-                    Toast.makeText(this, R.string.no_permissions, Toast.LENGTH_SHORT).show();
-                }
-            }
-            // other 'case' lines to check for other
-            // permissions this app might request
-        }
-    }
-
-    @Override
-    public void onCreate(Bundle state) {
-        super.onCreate(state);
-
-        app = (App) getApplicationContext();
-
-        getTheme().applyStyle(Themes.INSTANCE.getAppTheme(), true);
-
-        b = DataBindingUtil.inflate(getLayoutInflater(), R.layout.activity_web_push_config, null, false);
-        setContentView(b.getRoot());
-
-        Toolbar toolbar = b.toolbar;
-        toolbar.setTitle(R.string.settings_notification_web_push);
-        setSupportActionBar(toolbar);
-        ActionBar actionbar = getSupportActionBar();
-        actionbar.setDisplayHomeAsUpEnabled(true);
-
-        mScannerView = b.qrCodeScanner;
-        List<BarcodeFormat> formats = new ArrayList<>();
-        formats.add(BarcodeFormat.QR_CODE);
-        mScannerView.setFormats(formats);
-        mScannerView.setAspectTolerance(0.5f);
-
-        b.webPushScanNewButton.setOnClickListener((v -> {
-            int result = ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA);
-            if (result == PackageManager.PERMISSION_GRANTED) {
-                showCamera();
-            } else {
-                ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.CAMERA}, 1);
-            }
-        }));
-
-        if (app.profile.getRegistration() != REGISTRATION_ENABLED) {
-            new MaterialDialog.Builder(this)
-                    .title(R.string.web_push_unavailable)
-                    .content(R.string.web_push_you_need_to_register)
-                    .positiveText(R.string.ok)
-                    .negativeText(R.string.what_is_this)
-                    .onPositive(((dialog, which) -> {
-                        dialog.dismiss();
-                        finish();
-                    }))
-                    .onNegative(((dialog, which) -> {
-                        new MaterialDialog.Builder(this)
-                                .title(R.string.help)
-                                .content(R.string.help_notification_web_push)
-                                .positiveText(R.string.ok)
-                                .show();
-                    }))
-                    .dismissListener((dialog -> finish()))
-                    .autoDismiss(false)
-                    .canceledOnTouchOutside(false)
-                    .show();
-            b.webPushScanNewButton.setEnabled(false);
-        }
-        else {
-            getPairedBrowsers("", -1);
-        }
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        // Register ourselves as a handler for scan results.
-        //mScannerView.startCamera();          // Start camera on resume
-        //showCamera();
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        hideCamera();
-    }
-
-    @Override
-    public void handleResult(Result rawResult) {
-        // Do something with the result here
-        //Log.v(TAG, rawResult.getText()); // Prints scan results
-        //Log.v(TAG, rawResult.getBarcodeFormat().toString()); // Prints the scan format (qrcode, pdf417 etc.)
-
-        //Toast.makeText(this, rawResult.getText(), Toast.LENGTH_SHORT).show();
-
-        getPairedBrowsers(rawResult.getText(), -1);
-
-        /*Ion.with(app.getContext())
-                .load(app.requestScheme + APP_URL + "main.php?web_push_pair")
-                .setBodyParameter("username", (app.profile.autoRegistrationAllowed ? app.profile.registrationUsername : app.appConfig.deviceId))
-                .setBodyParameter("app_version_build_type", BuildConfig.BUILD_TYPE)
-                .setBodyParameter("app_version_code", Integer.toString(BuildConfig.VERSION_CODE))
-                .setBodyParameter("app_version", BuildConfig.VERSION_NAME + " " + BuildConfig.BUILD_TYPE + " (" + BuildConfig.VERSION_CODE + ")")
-                .setBodyParameter("device_id", Settings.Secure.getString(app.getContext().getContentResolver(), Settings.Secure.ANDROID_ID))
-                .setBodyParameter("device_model", Build.MANUFACTURER+" "+Build.MODEL)
-                .setBodyParameter("device_os_version", Build.VERSION.RELEASE)
-                .setBodyParameter("fcm_token", app.appConfig.fcmToken)
-                .setBodyParameter("browser_fcm", rawResult.getText())
-                .asJsonObject()
-                .setCallback((e, result) -> {
-                    getPairedBrowsers(-1);
-                });*/
-
-        hideCamera();
-
-        // If you would like to resume scanning, call this method below:
-        //mScannerView.resumeCameraPreview(this);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            if (cameraRunning) {
-                hideCamera();
-                return super.onOptionsItemSelected(item);
-            }
-            finish();
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public void onBackPressed() {
-        if (cameraRunning) {
-            hideCamera();
-            return;
-        }
-        super.onBackPressed();
-    }
-}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/LessonDialogActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/LessonDialogActivity.kt
index 891e44ea..1767c206 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/LessonDialogActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/LessonDialogActivity.kt
@@ -5,6 +5,7 @@
 package pl.szczodrzynski.edziennik.ui.widgets
 
 import android.content.Intent
+import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.content.Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
 import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
@@ -46,7 +47,7 @@ class LessonDialogActivity : AppCompatActivity(), CoroutineScope {
                     val i = Intent(app, MainActivity::class.java)
                             .putExtra("fragmentId", MainActivity.DRAWER_ITEM_TIMETABLE)
                             .putExtra("profileId", profileId)
-                            .addFlags(FLAG_ACTIVITY_REORDER_TO_FRONT)
+                            .addFlags(FLAG_ACTIVITY_REORDER_TO_FRONT or FLAG_ACTIVITY_NEW_TASK)
                     app.startActivity(i)
                     finish()
                     return@async null
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/WidgetConfigActivity.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/WidgetConfigActivity.java
index 6de0d280..2a35b1b2 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/WidgetConfigActivity.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/WidgetConfigActivity.java
@@ -82,7 +82,7 @@ public class WidgetConfigActivity extends Activity {
                 opacity = 0.8f;
 
             AsyncTask.execute(() -> {
-                profileList = app.db.profileDao().getAllNow();
+                profileList = App.db.profileDao().getAllNow();
                 profileList = filterOutArchived(profileList);
 
                 if (widgetType == WIDGET_NOTIFICATIONS)
@@ -136,21 +136,21 @@ public class WidgetConfigActivity extends Activity {
                 .negativeText(R.string.cancel)
                 .onPositive(((dialog1, which) -> {
                     WidgetConfig config = new WidgetConfig(profileId, bigStyle, darkTheme, opacity);
-                    JsonObject configs = app.config.getWidgetConfigs();
-                    configs.add(Integer.toString(mAppWidgetId), app.gson.toJsonTree(config));
-                    app.config.setWidgetConfigs(configs);
+                    JsonObject configs = app.getConfig().getWidgetConfigs();
+                    configs.add(Integer.toString(mAppWidgetId), app.getGson().toJsonTree(config));
+                    app.getConfig().setWidgetConfigs(configs);
 
                     Intent refreshIntent;
                     switch (widgetType) {
                         default:
                         case WIDGET_TIMETABLE:
-                            refreshIntent = new Intent(app.getContext(), WidgetTimetableProvider.class);
+                            refreshIntent = new Intent(app, WidgetTimetableProvider.class);
                             break;
                         case WIDGET_NOTIFICATIONS:
-                            refreshIntent = new Intent(app.getContext(), WidgetNotificationsProvider.class);
+                            refreshIntent = new Intent(app, WidgetNotificationsProvider.class);
                             break;
                         case WIDGET_LUCKY_NUMBER:
-                            refreshIntent = new Intent(app.getContext(), WidgetLuckyNumberProvider.class);
+                            refreshIntent = new Intent(app, WidgetLuckyNumberProvider.class);
                             break;
                     }
                     refreshIntent.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/notifications/WidgetNotificationsFactory.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/notifications/WidgetNotificationsFactory.kt
index 2386a438..b5207300 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/notifications/WidgetNotificationsFactory.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/notifications/WidgetNotificationsFactory.kt
@@ -42,7 +42,7 @@ class WidgetNotificationsFactory(val app: App, val config: WidgetConfig) : Remot
 
         val notification = cursor?.run {
             Notification(
-                    getInt("id") ?: 0,
+                    getLong("id") ?: 0,
                     getString("title") ?: "",
                     getString("text") ?: "",
                     getInt("type") ?: 0,
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/timetable/WidgetTimetableProvider.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/timetable/WidgetTimetableProvider.kt
index 4f81356b..35338225 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/timetable/WidgetTimetableProvider.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/widgets/timetable/WidgetTimetableProvider.kt
@@ -26,7 +26,7 @@ import com.mikepenz.iconics.typeface.library.community.material.CommunityMateria
 import com.mikepenz.iconics.utils.colorInt
 import com.mikepenz.iconics.utils.sizeDp
 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask
+import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask
 import pl.szczodrzynski.edziennik.data.db.entity.Event.TYPE_HOMEWORK
 import pl.szczodrzynski.edziennik.data.db.entity.Lesson
 import pl.szczodrzynski.edziennik.ui.widgets.LessonDialogActivity
@@ -383,7 +383,7 @@ class WidgetTimetableProvider : AppWidgetProvider() {
 
         // create an intent used to display the lesson details dialog
         val itemIntent = Intent(app, LessonDialogActivity::class.java)
-        itemIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK /*or Intent.FLAG_ACTIVITY_CLEAR_TASK*/)
+        itemIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK/* or Intent.FLAG_ACTIVITY_CLEAR_TASK*/)
         val itemPendingIntent = PendingIntent.getActivity(app, appWidgetId, itemIntent, 0)
         views.setPendingIntentTemplate(R.id.widgetTimetableListView, itemPendingIntent)
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/MutableLazy.kt b/app/src/main/java/pl/szczodrzynski/edziennik/utils/MutableLazy.kt
new file mode 100644
index 00000000..cf000e1f
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/MutableLazy.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2020-1-18.
+ */
+
+@file:Suppress("UNCHECKED_CAST")
+
+package pl.szczodrzynski.edziennik.utils
+
+internal object UNINITIALIZED_VALUE
+class MutableLazyImpl<T>(initializer: () -> T, lock: Any? = null) {
+    private var initializer: (() -> T)? = initializer
+    @Volatile private var _value: Any? = UNINITIALIZED_VALUE
+    private val lock = lock ?: this
+
+    operator fun getValue(thisRef: Any?, property: kotlin.reflect.KProperty<*>): T {
+        if (_value !== UNINITIALIZED_VALUE)
+            return _value as T;
+
+        return synchronized(lock) {
+            val typedValue = initializer!!()
+            _value = typedValue
+            initializer = null
+            typedValue
+        }
+    }
+    operator fun setValue(thisRef: Any?, property: kotlin.reflect.KProperty<*>, value: T) {
+        _value = value
+    }
+
+    fun isInitialized() = _value !== UNINITIALIZED_VALUE
+
+    override fun toString() = if (isInitialized()) _value.toString() else "ChangeableLazy value not initialized yet."
+}
+
+fun <T> mutableLazy(initializer: () -> T): MutableLazyImpl<T> = MutableLazyImpl(initializer)
\ No newline at end of file
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 df78e3a1..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.devMode) {
+        if (App.Companion.getDevMode()) {
             HyperLog.d("Szkolny/"+TAG, message);
             //debugLog.add(TAG+": "+message);
         }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/widgets/luckynumber/WidgetLuckyNumber.java b/app/src/main/java/pl/szczodrzynski/edziennik/widgets/luckynumber/WidgetLuckyNumber.java
deleted file mode 100644
index 50993daf..00000000
--- a/app/src/main/java/pl/szczodrzynski/edziennik/widgets/luckynumber/WidgetLuckyNumber.java
+++ /dev/null
@@ -1,234 +0,0 @@
-package pl.szczodrzynski.edziennik.widgets.luckynumber;
-
-import android.app.PendingIntent;
-import android.appwidget.AppWidgetManager;
-import android.appwidget.AppWidgetProvider;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.PorterDuff;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.RemoteViews;
-
-import com.mikepenz.iconics.IconicsColor;
-import com.mikepenz.iconics.IconicsDrawable;
-import com.mikepenz.iconics.IconicsSize;
-import com.mikepenz.iconics.typeface.IIcon;
-import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import pl.szczodrzynski.edziennik.App;
-import pl.szczodrzynski.edziennik.MainActivity;
-import pl.szczodrzynski.edziennik.R;
-import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask;
-import pl.szczodrzynski.edziennik.data.db.entity.Profile;
-import pl.szczodrzynski.edziennik.ui.widgets.WidgetConfig;
-
-import static pl.szczodrzynski.edziennik.utils.Utils.getCellsForSize;
-
-public class WidgetLuckyNumber extends AppWidgetProvider {
-
-    public static final String ACTION_SYNC_DATA = "ACTION_SYNC_DATA";
-    private static final String TAG = "WidgetLuckyNumber";
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if (ACTION_SYNC_DATA.equals(intent.getAction())){
-            EdziennikTask.Companion.sync().enqueue(context);
-        }
-        super.onReceive(context, intent);
-    }
-
-    public static PendingIntent getPendingSelfIntent(Context context, String action) {
-        Intent intent = new Intent(context, WidgetLuckyNumber.class);
-        intent.setAction(action);
-        return getPendingSelfIntent(context, intent);
-    }
-    public static PendingIntent getPendingSelfIntent(Context context, Intent intent) {
-        return PendingIntent.getBroadcast(context, 0, intent, 0);
-    }
-
-    @Override
-    public void onAppWidgetOptionsChanged(Context context, AppWidgetManager appWidgetManager, int appWidgetId, Bundle newOptions) {
-        App app = (App) context.getApplicationContext();
-
-        WidgetConfig widgetConfig = app.appConfig.widgetTimetableConfigs.get(appWidgetId);
-        if (widgetConfig == null) {
-            widgetConfig = new WidgetConfig(-1);
-            app.appConfig.widgetTimetableConfigs.put(appWidgetId, widgetConfig);
-            app.appConfig.savePending = true;
-        }
-        RemoteViews views = getRemoteViews(context, widgetConfig);
-        updateLayout(widgetConfig, views, appWidgetManager, appWidgetId);
-        appWidgetManager.updateAppWidget(appWidgetId, views);
-
-        super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions);
-    }
-
-    private RemoteViews getRemoteViews(Context context, WidgetConfig widgetConfig) {
-        RemoteViews views;
-        views = new RemoteViews(context.getPackageName(), R.layout.widget_lucky_number);
-        if (widgetConfig.bigStyle) {
-            views = new RemoteViews(context.getPackageName(), widgetConfig.darkTheme ? R.layout.widget_lucky_number_dark_big : R.layout.widget_lucky_number_big);
-        }
-        else {
-            views = new RemoteViews(context.getPackageName(), widgetConfig.darkTheme ? R.layout.widget_lucky_number_dark : R.layout.widget_lucky_number);
-        }
-        return views;
-    }
-
-    private void updateLayout(WidgetConfig widgetConfig, RemoteViews views, AppWidgetManager appWidgetManager, int appWidgetId) {
-        Bundle options = appWidgetManager.getAppWidgetOptions(appWidgetId);
-
-        int minWidth = options.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH);
-        int minHeight = options.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT);
-
-        int width = getCellsForSize(minWidth);
-        int height = getCellsForSize(minHeight);
-
-        if (width == 1) {
-            views.setViewVisibility(R.id.widgetLuckyNumberProfileRight, View.GONE);
-            views.setViewVisibility(R.id.widgetLuckyNumberProfileBottom, View.GONE);
-            views.setViewVisibility(R.id.widgetLuckyNumberTextRight, View.GONE);
-            views.setViewVisibility(R.id.widgetLuckyNumberTextBottom, View.VISIBLE);
-        }
-        else if (width == 2) {
-            views.setViewVisibility(R.id.widgetLuckyNumberProfileRight, View.GONE);
-            views.setViewVisibility(R.id.widgetLuckyNumberProfileBottom, View.VISIBLE);
-            views.setViewVisibility(R.id.widgetLuckyNumberTextRight, View.VISIBLE);
-            views.setViewVisibility(R.id.widgetLuckyNumberTextBottom, View.GONE);
-        }
-        else {
-            views.setViewVisibility(R.id.widgetLuckyNumberProfileRight, widgetConfig.bigStyle ? View.GONE : View.VISIBLE);
-            views.setViewVisibility(R.id.widgetLuckyNumberProfileBottom, widgetConfig.bigStyle ? View.VISIBLE : View.GONE);
-            views.setViewVisibility(R.id.widgetLuckyNumberTextRight, View.VISIBLE);
-            views.setViewVisibility(R.id.widgetLuckyNumberTextBottom, View.GONE);
-        }
-    }
-
-    @Override
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        ComponentName thisWidget = new ComponentName(context, WidgetLuckyNumber.class);
-
-        App app = (App)context.getApplicationContext();
-
-        int[] allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
-        // There may be multiple widgets active, so update all of them
-        for (int appWidgetId : allWidgetIds) {
-
-            WidgetConfig widgetConfig = app.appConfig.widgetTimetableConfigs.get(appWidgetId);
-            if (widgetConfig == null) {
-                widgetConfig = new WidgetConfig(-1);
-                app.appConfig.widgetTimetableConfigs.put(appWidgetId, widgetConfig);
-                app.appConfig.savePending = true;
-            }
-
-            RemoteViews views = getRemoteViews(context, widgetConfig);
-
-            PorterDuff.Mode mode = PorterDuff.Mode.DST_IN;
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
-                // this code seems to crash the launcher on >= P
-                float transparency = widgetConfig.opacity;  //0...1
-                long colorFilter = 0x01000000L * (long) (255f * transparency);
-                try {
-                    final Method[] declaredMethods = Class.forName("android.widget.RemoteViews").getDeclaredMethods();
-                    final int len = declaredMethods.length;
-                    if (len > 0) {
-                        for (int m = 0; m < len; m++) {
-                            final Method method = declaredMethods[m];
-                            if (method.getName().equals("setDrawableParameters")) {
-                                method.setAccessible(true);
-                                method.invoke(views, R.id.widgetLuckyNumberRoot, true, -1, (int) colorFilter, mode, -1);
-                                break;
-                            }
-                        }
-                    }
-                } catch (ClassNotFoundException e) {
-                    e.printStackTrace();
-                } catch (InvocationTargetException e) {
-                    e.printStackTrace();
-                } catch (IllegalAccessException e) {
-                    e.printStackTrace();
-                } catch (IllegalArgumentException e) {
-                    e.printStackTrace();
-                }
-            }
-
-            Profile profile = app.db.profileDao().getByIdNow(widgetConfig.profileId);
-            IIcon icon = CommunityMaterial.Icon.cmd_emoticon_dead_outline;
-            boolean noNumberText = false;
-            if (profile == null) {
-                // profile is not available, show error
-                noNumberText = true;
-                views.setTextViewText(R.id.widgetLuckyNumberTextRight, null);
-                views.setTextViewText(R.id.widgetLuckyNumberTextBottom, null);
-                views.setTextViewText(R.id.widgetLuckyNumberProfileRight, app.getString(R.string.widget_lucky_number_no_profile));
-                views.setTextViewText(R.id.widgetLuckyNumberProfileBottom, app.getString(R.string.widget_lucky_number_no_profile));
-            }
-            else {
-                // profile is available, show its name
-                views.setTextViewText(R.id.widgetLuckyNumberProfileRight, profile.getName());
-                views.setTextViewText(R.id.widgetLuckyNumberProfileBottom, profile.getName());
-                 // TODO !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-                /*if (profile.getLuckyNumberEnabled()
-                        && profile.getLuckyNumber() != -1
-                        && profile.getLuckyNumberDate() != null
-                        && profile.getLuckyNumberDate().getValue() == Date.getToday().getValue()) {
-                    // lucky number for today is set
-                    views.setTextViewText(R.id.widgetLuckyNumberTextRight, String.valueOf(profile.getLuckyNumber()));
-                    views.setTextViewText(R.id.widgetLuckyNumberTextBottom, String.valueOf(profile.getLuckyNumber()));
-                    if (profile.getLuckyNumber() == profile.getStudentNumber()) {
-                        // the lucky number is student's number
-                        icon = CommunityMaterial.Icon.cmd_emoticon_cool_outline;
-                    }
-                    else {
-                        // the lucky number is set
-                        icon = CommunityMaterial.Icon.cmd_emoticon_excited_outline;
-                    }
-                }
-                else {
-                    // lucky number for today isn't set
-                    noNumberText = true;
-                    views.setTextViewText(R.id.widgetLuckyNumberTextRight, null);
-                    views.setTextViewText(R.id.widgetLuckyNumberTextBottom, null);
-                    icon = CommunityMaterial.Icon.cmd_emoticon_sad_outline;
-                }*/
-            }
-
-            views.setViewVisibility(R.id.widgetLuckyNumberTextRightLayout, noNumberText ? View.GONE : View.VISIBLE);
-            views.setViewVisibility(R.id.widgetLuckyNumberTextBottomLayout, noNumberText ? View.GONE : View.VISIBLE);
-
-            views.setImageViewBitmap(R.id.widgetLuckyNumberIcon, new IconicsDrawable(context, icon)
-                    .color(IconicsColor.colorInt(widgetConfig.darkTheme ? 0xfff3f3f3 : 0xff101010))
-                    .size(IconicsSize.dp(widgetConfig.bigStyle ? 60 : 40)).toBitmap());
-
-            updateLayout(widgetConfig, views, appWidgetManager, appWidgetId);
-
-            Intent openIntent = new Intent(context, MainActivity.class);
-            openIntent.setAction("android.intent.action.MAIN");
-            openIntent.putExtra("fragmentId", MainActivity.DRAWER_ITEM_HOME);
-            if (profile != null) {
-                openIntent.putExtra("profileId", profile.getId());
-            }
-            PendingIntent pendingOpenIntent = PendingIntent.getActivity(context,
-                    appWidgetId, openIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-            views.setOnClickPendingIntent(R.id.widgetLuckyNumberRoot, pendingOpenIntent);
-
-            appWidgetManager.updateAppWidget(appWidgetId, views);
-        }
-        //modeInt++;
-    }
-
-    @Override
-    public void onDeleted(Context context, int[] appWidgetIds) {
-        App app = (App) context.getApplicationContext();
-        for (int appWidgetId: appWidgetIds) {
-            app.appConfig.widgetTimetableConfigs.remove(appWidgetId);
-        }
-        app.saveConfig("widgetTimetableConfigs");
-    }
-}
diff --git a/app/src/main/res/layout/dialog_day.xml b/app/src/main/res/layout/dialog_day.xml
index 9a3dbaaa..355e1c92 100644
--- a/app/src/main/res/layout/dialog_day.xml
+++ b/app/src/main/res/layout/dialog_day.xml
@@ -81,6 +81,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/dialog_no_events_hint"
+                    android:layout_gravity="center"
                     android:gravity="center"
                     android:textStyle="italic"/>
 
diff --git a/app/src/main/res/layout/dialog_lesson_details.xml b/app/src/main/res/layout/dialog_lesson_details.xml
index 1e3263ea..5efe53fc 100644
--- a/app/src/main/res/layout/dialog_lesson_details.xml
+++ b/app/src/main/res/layout/dialog_lesson_details.xml
@@ -250,11 +250,13 @@
                 </LinearLayout>
 
                 <LinearLayout
+                    android:id="@+id/lessonId"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:orientation="vertical"
-                    android:visibility="@{App.devMode ? View.VISIBLE : View.GONE}">
+                    android:visibility="gone"
+                    tools:visibility="visible">
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -300,6 +302,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/dialog_no_events_hint"
+                    android:layout_gravity="center"
                     android:gravity="center"
                     android:textStyle="italic"/>
 
diff --git a/app/src/main/res/layout/messages_compose_fragment.xml b/app/src/main/res/layout/messages_compose_fragment.xml
index f7b6b6d7..00806f69 100644
--- a/app/src/main/res/layout/messages_compose_fragment.xml
+++ b/app/src/main/res/layout/messages_compose_fragment.xml
@@ -124,7 +124,8 @@
                 style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                 android:layout_marginStart="8dp"
                 android:layout_marginEnd="8dp"
-                android:text="Breakpoints!"/>
+                android:text="Breakpoints!"
+                android:visibility="gone"/>
 
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/web_push_fragment.xml b/app/src/main/res/layout/web_push_fragment.xml
index e3cc08c6..ca953e3a 100644
--- a/app/src/main/res/layout/web_push_fragment.xml
+++ b/app/src/main/res/layout/web_push_fragment.xml
@@ -4,7 +4,8 @@
   -->
 
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -85,13 +86,13 @@
                 android:text="Połączone przeglądarki"
                 android:textSize="24sp" />
 
-            <TextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/browsersNoData"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginTop="8dp"
-                android:drawableTop="@drawable/ic_web_push_no_browsers"
+                app:drawableTopCompat="@drawable/ic_web_push_no_browsers"
                 android:drawablePadding="16dp"
                 android:fontFamily="sans-serif-light"
                 android:text="Brak połączonych przeglądarek"
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index ff4ede11..88120fc6 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -449,17 +449,17 @@
     <string name="notification">Notification</string>
     <string name="notification_absence">Absence</string>
     <string name="notification_absence_excused">Excused absence</string>
-    <string name="notification_announcement_format">School announcement: %s</string>
+    <string name="notification_announcement_format">School announcement from %s: %s</string>
     <string name="notification_attendance_format">%1$s on lesson %2$s on day %3$s</string>
     <string name="notification_attendance_no_lesson_format">%1$s on day %3$s</string>
     <string name="notification_belated">Late</string>
     <string name="notification_belated_excused">Excused late</string>
-    <string name="notification_channel_get_data_desc">Notification about data downloading</string>
-    <string name="notification_channel_get_data_name">Downloading data</string>
-    <string name="notification_channel_notifications_desc">Notification about new data in the e-register</string>
+    <string name="notification_channel_get_data_desc">Notification about data sync progress</string>
+    <string name="notification_channel_get_data_name">Synchronisation</string>
+    <string name="notification_channel_notifications_desc">Notifications about new data in the e-register</string>
     <string name="notification_channel_notifications_name">Notifications</string>
-    <string name="notification_channel_notifications_quiet_desc">Notification about new data in the e-register (no sound)</string>
-    <string name="notification_channel_notifications_quiet_name">Notifications (quiet)</string>
+    <string name="notification_channel_notifications_quiet_desc">Notifications about new data in the e-register (no sound - during quiet hours)</string>
+    <string name="notification_channel_notifications_quiet_name">Notifications (quiet hours)</string>
     <string name="notification_channel_updates_desc">Notifications about new versions of the app</string>
     <string name="notification_channel_updates_name">App updates</string>
     <string name="notification_downloading_update">Downloading update…</string>
@@ -476,12 +476,12 @@
     <string name="notification_grade_format">New grade (%s) from %s</string>
     <string name="notification_homework_format">Homework from %s for %s</string>
     <string name="notification_homework_no_subject_format">Homework for %s</string>
-    <string name="notification_lucky_number_format">Today %d is the lucky number.</string>
-    <string name="notification_lucky_number_later_format">The lucky number for %s is %d.</string>
-    <string name="notification_lucky_number_tomorrow_format">The lucky number for tomorrow is %d.</string>
-    <string name="notification_lucky_number_yours_format">You are the Lucky number today! (%d)</string>
-    <string name="notification_lucky_number_yours_later_format">%s you will have the Lucky number! (%d)</string>
-    <string name="notification_lucky_number_yours_tomorrow_format">Tomorrow it\'s your Lucky number! (%d)</string>
+    <string name="notification_lucky_number_format">Today %2$d is the lucky number.</string>
+    <string name="notification_lucky_number_later_format">The lucky number for %1$s is %2$d.</string>
+    <string name="notification_lucky_number_tomorrow_format">The lucky number for tomorrow is %2$d.</string>
+    <string name="notification_lucky_number_yours_format">You are the lucky number today! (%2$d)</string>
+    <string name="notification_lucky_number_yours_later_format">%1$s you will have the lucky number! (%2$d)</string>
+    <string name="notification_lucky_number_yours_tomorrow_format">Tomorrow it\'s your lucky number! (%2$d)</string>
     <string name="notification_message_format">Unread message from %s: %s</string>
     <string name="notification_new_notification_title_format">New notifications: %d</string>
     <string name="notification_no_update">No update available</string>
diff --git a/app/src/main/res/values/plurals.xml b/app/src/main/res/values/plurals.xml
index 8e7275b2..83845ec9 100644
--- a/app/src/main/res/values/plurals.xml
+++ b/app/src/main/res/values/plurals.xml
@@ -81,4 +81,76 @@
         <item quantity="many">%d błędów</item>
         <item quantity="other">%d błędów</item>
     </plurals>
+
+    <plurals name="notification_count_format">
+        <item quantity="one">Szkolny.eu: %d nowe powiadomienie</item> <!-- 1 -->
+        <item quantity="few">Szkolny.eu: %d nowe powiadomienia</item> <!-- 2, 3, 4, 32, 33, 34 -->
+        <item quantity="other">Szkolny.eu: %d nowych powiadomień</item> <!-- 5, 10, 12, 13, 21, 25 -->
+    </plurals>
+    <plurals name="notification_count_short_format">
+        <item quantity="one">%d nowe powiadomienie</item> <!-- 1 -->
+        <item quantity="few">%d nowe powiadomienia</item> <!-- 2, 3, 4, 32, 33, 34 -->
+        <item quantity="other">%d nowych powiadomień</item> <!-- 5, 10, 12, 13, 21, 25 -->
+    </plurals>
+
+    <plurals name="notification_new_timetable_change_format">
+        <item quantity="one">%d zmiana planu lekcji</item> <!-- 1 -->
+        <item quantity="few">%d zmiany planu lekcji</item> <!-- 2, 3, 4, 32, 33, 34 -->
+        <item quantity="other">%d zmian planu lekcji</item> <!-- 5, 10, 12, 13, 21, 25 -->
+    </plurals>
+    <plurals name="notification_new_grades_format">
+        <item quantity="one">%d nowa ocena</item> <!-- 1 -->
+        <item quantity="few">%d nowe oceny</item> <!-- 2, 3, 4, 32, 33, 34 -->
+        <item quantity="other">%d nowych ocen</item> <!-- 5, 10, 12, 13, 21, 25 -->
+    </plurals>
+    <plurals name="notification_new_events_format">
+        <item quantity="one">%d nowe wydarzenie</item> <!-- 1 -->
+        <item quantity="few">%d nowe wydarzenia</item> <!-- 2, 3, 4, 32, 33, 34 -->
+        <item quantity="other">%d nowych wydarzeń</item> <!-- 5, 10, 12, 13, 21, 25 -->
+    </plurals>
+    <plurals name="notification_new_homework_format">
+        <item quantity="one">%d nowe zadanie domowe</item> <!-- 1 -->
+        <item quantity="few">%d nowe zadania domowe</item> <!-- 2, 3, 4, 32, 33, 34 -->
+        <item quantity="other">%d nowych zadań domowych</item> <!-- 5, 10, 12, 13, 21, 25 -->
+    </plurals>
+    <plurals name="notification_new_shared_events_format">
+        <item quantity="one">%d udostępnione wydarzenie</item> <!-- 1 -->
+        <item quantity="few">%d udostępnione wydarzenia</item> <!-- 2, 3, 4, 32, 33, 34 -->
+        <item quantity="other">%d udostępnionych wydarzeń</item> <!-- 5, 10, 12, 13, 21, 25 -->
+    </plurals>
+    <plurals name="notification_new_shared_homework_format">
+        <item quantity="one">%d udostępnione zadanie domowe</item> <!-- 1 -->
+        <item quantity="few">%d udostępnione zadania domowe</item> <!-- 2, 3, 4, 32, 33, 34 -->
+        <item quantity="other">%d udostępnionych zadań domowych</item> <!-- 5, 10, 12, 13, 21, 25 -->
+    </plurals>
+    <plurals name="notification_new_messages_format">
+        <item quantity="one">%d nowa wiadomość</item> <!-- 1 -->
+        <item quantity="few">%d nowe wiadomości</item> <!-- 2, 3, 4, 32, 33, 34 -->
+        <item quantity="other">%d nowych wiadomości</item> <!-- 5, 10, 12, 13, 21, 25 -->
+    </plurals>
+    <plurals name="notification_new_notices_format">
+        <item quantity="one">%d nowa uwaga</item> <!-- 1 -->
+        <item quantity="few">%d nowe uwagi</item> <!-- 2, 3, 4, 32, 33, 34 -->
+        <item quantity="other">%d nowych uwag</item> <!-- 5, 10, 12, 13, 21, 25 -->
+    </plurals>
+    <plurals name="notification_new_attendance_format">
+        <item quantity="one">%d nowy wpis frekwencji</item> <!-- 1 -->
+        <item quantity="few">%d nowe wpisy frekwencji</item> <!-- 2, 3, 4, 32, 33, 34 -->
+        <item quantity="other">%d nowych wpisów frekwencji</item> <!-- 5, 10, 12, 13, 21, 25 -->
+    </plurals>
+    <plurals name="notification_new_lucky_number_format">
+        <item quantity="one">szczęśliwy numerek</item> <!-- 1 -->
+        <item quantity="few">%d szczęśliwe numerki</item> <!-- 2, 3, 4, 32, 33, 34 -->
+        <item quantity="other">%d szczęśliwych numerków</item> <!-- 5, 10, 12, 13, 21, 25 -->
+    </plurals>
+    <plurals name="notification_new_announcements_format">
+        <item quantity="one">%d nowe ogłoszenie</item> <!-- 1 -->
+        <item quantity="few">%d nowe ogłoszenia</item> <!-- 2, 3, 4, 32, 33, 34 -->
+        <item quantity="other">%d nowych ogłoszeń</item> <!-- 5, 10, 12, 13, 21, 25 -->
+    </plurals>
+    <plurals name="notification_other_format">
+        <item quantity="one">%d inne powiadomienie</item> <!-- 1 -->
+        <item quantity="few">%d inne powiadomienia</item> <!-- 2, 3, 4, 32, 33, 34 -->
+        <item quantity="other">%d innych powiadomień</item> <!-- 5, 10, 12, 13, 21, 25 -->
+    </plurals>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 518a03b9..8c058188 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -509,7 +509,7 @@
     <string name="notification">Powiadomienie</string>
     <string name="notification_absence">Nieobecność</string>
     <string name="notification_absence_excused">Nieobecność usprawiedliwiona</string>
-    <string name="notification_announcement_format">Ogłoszenie szkolne: %s</string>
+    <string name="notification_announcement_format">Ogłoszenie szkolne od %s: %s</string>
     <string name="notification_attendance_format">%1$s na lekcji %2$s z dnia %3$s</string>
     <string name="notification_attendance_no_lesson_format">%1$s z dnia %3$s</string>
     <string name="notification_belated">Spóźnienie</string>
@@ -518,8 +518,8 @@
     <string name="notification_channel_get_data_name">Pobieranie danych</string>
     <string name="notification_channel_notifications_desc">Powiadomienie o nowej zawartości w e-dzienniku</string>
     <string name="notification_channel_notifications_name">Powiadomienia</string>
-    <string name="notification_channel_notifications_quiet_desc">Powiadomienie o nowej zawartości w e-dzienniku (bez dźwięku)</string>
-    <string name="notification_channel_notifications_quiet_name">Powiadomienia (cisza)</string>
+    <string name="notification_channel_notifications_quiet_desc">Powiadomienie o nowej zawartości w e-dzienniku (bez dźwięku - podczas ciszy nocnej)</string>
+    <string name="notification_channel_notifications_quiet_name">Powiadomienia (cisza nocna)</string>
     <string name="notification_channel_updates_desc">Powiadomienia o nowych wersjach aplikacji</string>
     <string name="notification_channel_updates_name">Aktualizacje</string>
     <string name="notification_downloading_update">Pobieranie aktualizacji…</string>
@@ -536,13 +536,13 @@
     <string name="notification_grade_format">Nowa ocena (%s) z %s</string>
     <string name="notification_homework_format">Zadanie domowe z %1$s na %2$s</string>
     <string name="notification_homework_no_subject_format">Zadanie domowe na %2$s</string>
-    <string name="notification_lesson_change_format" translatable="false">%s %s - %s</string>
-    <string name="notification_lucky_number_format">Dzisiaj %d to szczęśliwy numerek.</string>
-    <string name="notification_lucky_number_later_format">Szczęsliwy numerek na %s to %d.</string>
-    <string name="notification_lucky_number_tomorrow_format">Szczęsliwy numerek na jutro to %d.</string>
-    <string name="notification_lucky_number_yours_format">Dzisiaj to Ty masz szczęśliwy numerek! (%d)</string>
-    <string name="notification_lucky_number_yours_later_format">%s to Ty będziesz miał szczęśliwy numerek! (%d)</string>
-    <string name="notification_lucky_number_yours_tomorrow_format">Jutro to Ty masz szczęśliwy numerek! (%d)</string>
+    <string name="notification_lesson_change_format">%s dnia %s - %s</string>
+    <string name="notification_lucky_number_format">Dzisiaj %2$d to szczęśliwy numerek.</string>
+    <string name="notification_lucky_number_later_format">Szczęsliwy numerek na %1$s to %2$d.</string>
+    <string name="notification_lucky_number_tomorrow_format">Szczęsliwy numerek na jutro to %2$d.</string>
+    <string name="notification_lucky_number_yours_format">Dzisiaj to Ty masz szczęśliwy numerek! (%2$d)</string>
+    <string name="notification_lucky_number_yours_later_format">%1$s to Ty będziesz miał szczęśliwy numerek! (%2$d)</string>
+    <string name="notification_lucky_number_yours_tomorrow_format">Jutro to Ty masz szczęśliwy numerek! (%2$d)</string>
     <string name="notification_message_format">Nieodebrana wiadomość od %s: %s</string>
     <string name="notification_new_notification_title_format">Nowe powiadomienia: %d</string>
     <string name="notification_no_update">Brak dostępnej aktualizacji</string>
@@ -1161,4 +1161,8 @@
     <string name="notification_day_free">Dzień wolny</string>
     <string name="edziennik_progress_endpoint_push_config">Konfigurowanie natychmiastowych powiadomień...</string>
     <string name="calendar_app_not_found">Nie znaleziono aplikacji kalendarza</string>
+    <string name="edziennik_szkolny_creating_notifications">Tworzenie powiadomień...</string>
+    <string name="notification_type_new_shared_homework">Udostępniono zadanie domowe</string>
+    <string name="notification_type_removed_shared_event">Usunięto wydarzenie</string>
+    <string name="notification_click_to_see_all">Kliknij, aby zobaczyć wszystkie powiadomienia</string>
 </resources>
diff --git a/build.gradle b/build.gradle
index 1943400f..17a6b73c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.3.50'
+        kotlin_version = '1.3.61'
 
         release = [
                 versionName: "4.0-beta.3",
@@ -17,27 +17,27 @@ buildscript {
         ]
 
         versions = [
-                kotlin           : "1.3.50",
+                kotlin           : "1.3.61",
                 ktx              : "1.1.0",
 
                 androidX         : '1.0.0',
                 annotation       : '1.1.0',
-                recyclerView     : '1.1.0',
-                material         : '1.2.0-alpha02',
-                appcompat        : '1.1.0',
-                constraintLayout : '2.0.0-beta3',
+                recyclerView     : '1.2.0-alpha01',
+                material         : '1.2.0-alpha03',
+                appcompat        : '1.2.0-alpha01',
+                constraintLayout : '2.0.0-beta4',
                 cardview         : '1.0.0',
                 gridLayout       : '1.0.0',
                 navigation       : "2.0.0",
                 navigationFragment: "1.0.0",
                 legacy           : "1.0.0",
 
-                room             : "2.2.1",
-                lifecycle        : "2.2.0-rc02",
+                room             : "2.2.3",
+                lifecycle        : "2.2.0-rc03",
                 work             : "2.2.0",
 
-                firebase         : '17.2.1',
-                firebasemessaging: "20.0.0",
+                firebase         : '17.2.2',
+                firebasemessaging: "20.1.0",
                 play_services    : "17.0.0",
 
                 materialdialogs  : "0.9.6.0",
@@ -45,7 +45,7 @@ buildscript {
                 iconics          : "4.0.1",
                 font_cmd         : "3.5.95.1-kotlin",
 
-                navlib           : "9c8fb47c52",
+                navlib           : "5c8b13c0d9db0d9e822fdae82c8afca6c01ab41e",
 
                 gifdrawable      : "1.2.15",
 
@@ -61,9 +61,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath 'me.tatarka:gradle-retrolambda:3.7.0'
-        classpath 'com.google.gms:google-services:4.3.1'
+        classpath 'com.google.gms:google-services:4.3.3'
         classpath 'io.fabric.tools:gradle:1.28.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
@@ -88,23 +88,6 @@ allprojects {
     }
 }
 
-ext {
-    compileSdkVersion = 28
-    buildToolsVersion = '28.0.3'
-    targetSdkVersion = compileSdkVersion
-    minSdkVersion = 16
-
-    androidXAppCompat = '1.1.0-beta01'
-    androidXRecyclerView = '1.1.0-alpha06'
-    androidXCardView = '1.0.0'
-    androidXGridLayout = '1.0.0'
-    androidXConstraintLayout = '1.1.3'
-    googleMaterial = '1.1.0-alpha07'
-
-    iconics = '4.0.1-b01'
-    kotlin = '1.3.41'
-}
-
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
diff --git a/cafebar/build.gradle b/cafebar/build.gradle
index 31b0b482..4e992077 100644
--- a/cafebar/build.gradle
+++ b/cafebar/build.gradle
@@ -21,11 +21,11 @@ apply plugin: 'com.android.library'
 group = 'com.github.danimahardhika'
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    compileSdkVersion setup.compileSdk
 
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
+        minSdkVersion 16
+        targetSdkVersion setup.targetSdk
         versionCode 132
         versionName "1.3.2"
         vectorDrawables.useSupportLibrary = true
@@ -58,7 +58,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "com.google.android.material:material:${googleMaterial}"
-    implementation "androidx.cardview:cardview:${androidXCardView}"
-    implementation "androidx.appcompat:appcompat:${androidXAppCompat}"
+    implementation "com.google.android.material:material:${versions.material}"
+    implementation "androidx.cardview:cardview:${versions.cardview}"
+    implementation "androidx.appcompat:appcompat:${versions.appcompat}"
 }
diff --git a/material-about-library/build.gradle b/material-about-library/build.gradle
index 8ff2c558..c79c427c 100644
--- a/material-about-library/build.gradle
+++ b/material-about-library/build.gradle
@@ -8,11 +8,11 @@ def versionPatch = 0
 def versionBuild = 0 // bump for dogfood builds, public betas, etc.
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    compileSdkVersion setup.compileSdk
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion rootProject.ext.targetSdkVersion
+        targetSdkVersion setup.targetSdk
         versionCode versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100 + versionBuild
         versionName "${versionMajor}.${versionMinor}" + (versionPatch == 0 ? "" : ".${versionPatch}")
     }
@@ -32,7 +32,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "androidx.appcompat:appcompat:${androidXAppCompat}"
-    implementation "androidx.cardview:cardview:${androidXCardView}"
-    implementation "com.google.android.material:material:${googleMaterial}"
+    implementation "androidx.appcompat:appcompat:${versions.appcompat}"
+    implementation "androidx.cardview:cardview:${versions.cardview}"
+    implementation "com.google.android.material:material:${versions.material}"
 }
diff --git a/mhttp/build.gradle b/mhttp/build.gradle
index a7863eb6..a17c5b48 100644
--- a/mhttp/build.gradle
+++ b/mhttp/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    compileSdkVersion setup.compileSdk
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion rootProject.ext.targetSdkVersion
+        targetSdkVersion setup.targetSdk
         consumerProguardFiles 'proguard-rules.pro'
         versionCode 1
         versionName PROJ_VERSION
@@ -40,7 +40,7 @@ android {
 }
 
 dependencies {
-    compileOnly "androidx.appcompat:appcompat:${androidXAppCompat}"
+    compileOnly "androidx.appcompat:appcompat:${versions.appcompat}"
     compileOnly 'io.reactivex.rxjava2:rxjava:2.1.3'
     api 'com.squareup.okhttp3:okhttp:3.12.0'
     api 'com.google.code.gson:gson:2.8.5'
diff --git a/nachos/build.gradle b/nachos/build.gradle
index cd4d8235..821a4a83 100644
--- a/nachos/build.gradle
+++ b/nachos/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion setup.compileSdk
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 28
+        targetSdkVersion setup.targetSdk
         versionCode 1
         versionName "1.0"
     }
diff --git a/settings.gradle b/settings.gradle
index 22213b80..d2e0a356 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,5 @@
 rootProject.name='Szkolny.eu'
-include ':app', ':agendacalendarview', ':mhttp', ':material-about-library', ':cafebar', ':szkolny-font', ':nachos', ':community-material'
+include ':app', ':agendacalendarview', ':mhttp', ':material-about-library', ':cafebar', ':szkolny-font', ':nachos'
 /*
 include ':Navigation'
 project(':Navigation').projectDir = new File(settingsDir, '../Navigation/navlib')*/
diff --git a/szkolny-font/build.gradle b/szkolny-font/build.gradle
index 02d6e56b..70d20b0d 100644
--- a/szkolny-font/build.gradle
+++ b/szkolny-font/build.gradle
@@ -19,12 +19,11 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion setup.compileSdk
 
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
+        minSdkVersion setup.minSdk
+        targetSdkVersion setup.targetSdk
         consumerProguardFiles 'consumer-proguard-rules.pro'
         versionCode 11
         versionName "1.1"
@@ -46,6 +45,6 @@ if (project.hasProperty('pushall') || project.hasProperty('SzkolnyFontonly')) {
 }
 
 dependencies {
-    implementation "com.mikepenz:iconics-core:${iconics}"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "com.mikepenz:iconics-core:${versions.iconics}"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
 }