diff --git a/build.gradle b/build.gradle
index e3706c381..c73ebcd77 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,31 +1,41 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
-    ext.kotlin_version = '1.4.10'
+    ext {
+        sdkVersion = 33
+        minSdkVersion = 25
+        hiltVersion = "2.44"
+        kotlinVersion = "1.8.0"
+        coreKtxVersion = "1.9.0"
+        appCompatVersion = "1.6.0"
+    }
 
     repositories {
         google()
         jcenter()
         mavenCentral()
-        maven { url 'https://jitpack.io' }
+        maven { url "https://jitpack.io" }
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
-        classpath 'com.google.dagger:hilt-android-gradle-plugin:2.38.1'
+        classpath "com.android.tools.build:gradle:7.4.0"
+        classpath "com.google.dagger:hilt-android-gradle-plugin:2.44.2"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
     }
 }
 
+plugins {
+    id 'com.google.dagger.hilt.android' version '2.44' apply false
+}
+
 allprojects {
     repositories {
         google()
         jcenter()
         mavenCentral()
-        maven { url 'https://jitpack.io' }
+        maven { url "https://jitpack.io" }
     }
 }
 
-task clean(type: Delete) {
+tasks.register("clean") {
     delete rootProject.buildDir
 }
diff --git a/chooloolib/build.gradle b/chooloolib/build.gradle
index b7b160c55..43a5af0c4 100644
--- a/chooloolib/build.gradle
+++ b/chooloolib/build.gradle
@@ -1,20 +1,18 @@
 plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'dagger.hilt.android.plugin'
+    id "com.android.library"
+    id "kotlin-android"
+    id "kotlin-kapt"
+    id 'com.google.dagger.hilt.android'
+    id "org.jetbrains.kotlin.android"
 }
 
 android {
-    compileSdk 31
+    namespace "com.chooloo.www.chooloolib"
+    compileSdk rootProject.ext.sdkVersion
 
     defaultConfig {
-        versionCode 2
-        versionName "2.0"
-
-        minSdk 25
-        targetSdk 31
-
+        targetSdk rootProject.ext.sdkVersion
+        minSdk rootProject.ext.minSdkVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }
@@ -22,71 +20,69 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
         }
     }
 
-    dataBinding {
-        //noinspection DataBindingWithoutKapt
-        enabled = true
-    }
-
-    buildFeatures {
-        viewBinding true
-    }
-
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
+        targetCompatibility JavaVersion.VERSION_18
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-    }
-
-    hilt {
-        enableAggregatingTask true
+        jvmTarget = JavaVersion.VERSION_18.toString()
     }
 
-    kapt {
-        correctErrorTypes true
-    }
+    kotlin { jvmToolchain(18) }
+    dataBinding { enabled true }
+    kapt { correctErrorTypes true }
+    buildFeatures { viewBinding true }
+    buildFeatures { viewBinding true }
+    hilt { enableAggregatingTask true }
 }
 
 dependencies {
     kapt(
-            'com.google.dagger:hilt-compiler:2.38.1',
-            'androidx.hilt:hilt-compiler:1.0.0-alpha01'
+            "androidx.hilt:hilt-compiler:1.0.0-alpha01",
+            "com.google.dagger:hilt-compiler:${rootProject.ext.hiltVersion}"
     )
 
     testImplementation(
-            'junit:junit:',
-            'androidx.room:room-testing:2.2.6'
+            "junit:junit:",
+            "androidx.room:room-testing:2.2.6"
     )
 
     androidTestImplementation(
-            'androidx.test:runner:1.3.0',
-            'androidx.test.ext:junit:1.1.3',
+            "androidx.test:runner:1.3.0",
+            "androidx.test.ext:junit:1.1.3",
             "androidx.compose.ui:ui-test-junit4:1.0.4",
-            'androidx.test.espresso:espresso-core:3.4.0'
+            "androidx.test.espresso:espresso-core:3.4.0"
     )
 
     implementation(
-            'com.squareup.picasso:picasso:2.5.2',
-            'androidx.core:core-ktx:1.7.0',
-            'dev.sasikanth:colorsheet:1.0.1',
-            'androidx.appcompat:appcompat:1.4.1',
-            'io.reactivex.rxjava2:rxjava:2.1.16',
-            'androidx.preference:preference:1.1.1',
-            'androidx.fragment:fragment-ktx:1.1.0',
-            'androidx.activity:activity-ktx:1.1.0',
-            'io.github.l4digital:fastscroll:2.0.1',
-            'io.reactivex.rxjava2:rxandroid:2.0.1',
-            'com.google.dagger:hilt-android:2.38.1',
-            'com.google.android.material:material:1.6.0',
-            'com.github.abdularis:circularimageview:1.5',
-            'com.daimajia.androidanimations:library:2.4@aar',
-            'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0',
-            'com.pushtorefresh.storio3:content-resolver:3.0.0'
+            // ktx
+            "androidx.fragment:fragment-ktx:1.5.5",
+            "androidx.activity:activity-ktx:1.6.1",
+            "androidx.preference:preference-ktx:1.2.0",
+            "androidx.navigation:navigation-ui-ktx:2.5.3",
+            "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1",
+            "androidx.navigation:navigation-fragment-ktx:2.5.3",
+            "androidx.core:core-ktx:${rootProject.ext.coreKtxVersion}",
+
+            "androidx.compose.ui:ui:1.3.3",
+            "dev.sasikanth:colorsheet:1.0.1",
+            "com.squareup.picasso:picasso:2.5.2",
+            "io.reactivex.rxjava2:rxjava:2.1.16",
+            "androidx.preference:preference:1.1.1",
+            "io.github.l4digital:fastscroll:2.0.1",
+            "io.reactivex.rxjava2:rxandroid:2.0.1",
+            "com.google.android.material:material:1.6.0",
+            "com.github.abdularis:circularimageview:1.5",
+            "com.daimajia.androidanimations:library:2.4@aar",
+            "com.pushtorefresh.storio3:content-resolver:3.0.0",
+            "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4",
+            "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9",
+            "com.google.dagger:hilt-android:${rootProject.ext.hiltVersion}",
+            "androidx.appcompat:appcompat:${rootProject.ext.appCompatVersion}",
     )
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/AndroidManifest.xml b/chooloolib/src/main/AndroidManifest.xml
index a88a88862..d1d125641 100644
--- a/chooloolib/src/main/AndroidManifest.xml
+++ b/chooloolib/src/main/AndroidManifest.xml
@@ -1,23 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.chooloo.www.chooloolib">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.CALL_PHONE" />
-    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
+    <uses-permission
+        android:name="android.permission.MODIFY_PHONE_STATE"
+        tools:ignore="ProtectedPermissions" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.VIBRATE" />
 
-    <uses-permission android:name="android.permission.VIBRATE" />
-
-    <uses-permission android:name="android.permission.VIBRATE" />
-
     <application>
         <activity
             android:name=".ui.call.CallActivity"
-            android:exported="false"
             android:configChanges="screenSize|keyboardHidden"
             android:excludeFromRecents="true"
-            android:screenOrientation="unspecified" />
+            android:exported="true"
+            android:noHistory="true"
+            android:screenOrientation="unspecified"
+            android:showOnLockScreen="true">
+            <!--            <intent-filter>-->
+            <!--                <action android:name="android.intent.action.MAIN" />-->
+            <!--                <category android:name="android.intent.category.LAUNCHER" />-->
+            <!--            </intent-filter>-->
+        </activity>
         <activity
             android:name=".ui.permissions.PermissionRequestActivity"
             android:screenOrientation="unspecified" />
@@ -30,7 +35,7 @@
             android:resource="@array/preloaded_fonts" />
 
         <service
-            android:name=".service.CallService"
+            android:name="com.chooloo.www.chooloolib.api.service.CallService"
             android:exported="true"
             android:foregroundServiceType="phoneCall"
             android:permission="android.permission.BIND_INCALL_SERVICE">
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/BaseApp.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ChoolooApp.kt
similarity index 92%
rename from chooloolib/src/main/java/com/chooloo/www/chooloolib/BaseApp.kt
rename to chooloolib/src/main/java/com/chooloo/www/chooloolib/ChoolooApp.kt
index f006ccec1..b02b9b4f9 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/BaseApp.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ChoolooApp.kt
@@ -5,7 +5,7 @@ import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor
 import com.chooloo.www.chooloolib.interactor.theme.ThemesInteractor
 import javax.inject.Inject
 
-abstract class BaseApp : Application() {
+abstract class ChoolooApp : Application() {
     @Inject lateinit var themes: ThemesInteractor
     @Inject lateinit var preferences: PreferencesInteractor
 
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/AccountsAdapter.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/AccountsAdapter.kt
index f0481f55e..92c41dc3d 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/AccountsAdapter.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/AccountsAdapter.kt
@@ -3,8 +3,8 @@ package com.chooloo.www.chooloolib.adapter
 import com.chooloo.www.chooloolib.R
 import com.chooloo.www.chooloolib.interactor.animation.AnimationsInteractor
 import com.chooloo.www.chooloolib.interactor.string.StringsInteractor
-import com.chooloo.www.chooloolib.model.ListData
-import com.chooloo.www.chooloolib.model.RawContactAccount
+import com.chooloo.www.chooloolib.data.model.ListData
+import com.chooloo.www.chooloolib.data.model.RawContactAccount
 import com.chooloo.www.chooloolib.ui.widgets.listitemholder.ListItemHolder
 import javax.inject.Inject
 
@@ -12,7 +12,11 @@ class AccountsAdapter @Inject constructor(
     animations: AnimationsInteractor,
     private val strings: StringsInteractor
 ) : ListAdapter<RawContactAccount>(animations) {
-    override fun onBindListItem(listItemHolder: ListItemHolder, item: RawContactAccount) {
+    override fun onBindListItem(
+        listItemHolder: ListItemHolder,
+        item: RawContactAccount,
+        position: Int
+    ) {
         listItemHolder.apply {
             captionText = null
             isImageVisible = false
@@ -25,6 +29,6 @@ class AccountsAdapter @Inject constructor(
         }
     }
 
-    override fun convertDataToListData(data: List<RawContactAccount>) =
-        ListData.fromRawContacts(data, accounts = true, withHeader = false)
+    override fun convertDataToListData(items: List<RawContactAccount>) =
+        ListData.fromRawContacts(items, accounts = true, withHeader = false)
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/CallActionsAdapter.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/CallActionsAdapter.kt
new file mode 100644
index 000000000..d620f0d42
--- /dev/null
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/CallActionsAdapter.kt
@@ -0,0 +1,89 @@
+package com.chooloo.www.chooloolib.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import androidx.recyclerview.widget.RecyclerView
+import com.chooloo.www.chooloolib.databinding.CallActionBinding
+import com.chooloo.www.chooloolib.ui.callactions.CallAction
+
+class CallActionsAdapter : RecyclerView.Adapter<CallActionsAdapter.ViewHolder>() {
+    private var _callActions: MutableList<CallAction> = mutableListOf()
+    private var _onCallActionClickListener: (CallAction) -> Unit = {}
+
+
+    override fun getItemCount() = _callActions.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
+        ViewHolder(CallActionBinding.inflate(LayoutInflater.from(parent.context), parent, false))
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) =
+        holder.bind(_callActions[position], _onCallActionClickListener::invoke)
+
+
+    private fun getCallAction(@StringRes idRes: Int): CallAction? {
+        val index = _callActions.indexOfFirst { it.idRes == idRes }
+        if (index == -1) return null
+        return _callActions[index]
+    }
+
+    private fun changeCallAction(@StringRes idRes: Int, change: (CallAction) -> Unit) {
+        val index = _callActions.indexOfFirst { it.idRes == idRes }
+        if (index == -1) return
+        change.invoke(_callActions[index])
+        notifyItemChanged(index)
+    }
+
+    fun isCallActionEnabled(@StringRes idRes: Int) = getCallAction(idRes)?.isEnabled ?: false
+
+    fun isCallActionActivated(@StringRes idRes: Int) = getCallAction(idRes)?.isActivated ?: false
+
+    fun setCallActionEnabled(@StringRes idRes: Int, isEnabled: Boolean) {
+        changeCallAction(idRes) { it.isEnabled = isEnabled }
+    }
+
+    fun setCallActionActivated(@StringRes idRes: Int, isActivated: Boolean) {
+        changeCallAction(idRes) { it.isActivated = isActivated }
+    }
+
+    fun setCallActionIcon(@StringRes idRes: Int, @DrawableRes iconRes: Int) {
+        changeCallAction(idRes) { it.tempIconRes = iconRes }
+    }
+
+    fun addCallActions(callActions: List<CallAction>) {
+        for (callAction in callActions) {
+            if (_callActions.contains(callAction)) continue
+            _callActions.add(callAction)
+            notifyItemChanged(_callActions.indexOf(callAction))
+        }
+    }
+
+    fun removeCallActions(callActions: List<CallAction>) {
+        for (callAction in callActions) {
+            if (!_callActions.contains(callAction)) continue
+            val removedIndex = _callActions.indexOf(callAction)
+            _callActions.remove(callAction)
+            notifyItemRemoved(removedIndex)
+        }
+    }
+
+    fun setOnCallActionClickListener(onCallActionClickListener: (CallAction) -> Unit = {}) {
+        _onCallActionClickListener = onCallActionClickListener
+    }
+
+
+    class ViewHolder(private val binding: CallActionBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+
+        fun bind(callAction: CallAction, onClickListener: (CallAction) -> Unit = {}) {
+            binding.callActionRoot.apply {
+                setDefaultIcon(callAction.tempIconRes ?: callAction.iconRes)
+                callAction.checkedIconRes?.let(::setCheckedIcon)
+                isEnabled = callAction.isEnabled
+                isActivated = callAction.isActivated
+                setOnClickListener { onClickListener.invoke(callAction) }
+            }
+        }
+    }
+}
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/CallItemsAdapter.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/CallItemsAdapter.kt
index 143bf071c..08430ce1a 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/CallItemsAdapter.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/CallItemsAdapter.kt
@@ -3,33 +3,41 @@ package com.chooloo.www.chooloolib.adapter
 import android.net.Uri
 import android.telecom.Call.Details.CAPABILITY_SEPARATE_FROM_CONFERENCE
 import com.chooloo.www.chooloolib.R
+import com.chooloo.www.chooloolib.data.model.Call
+import com.chooloo.www.chooloolib.data.model.ListData
+import com.chooloo.www.chooloolib.di.module.IoScope
+import com.chooloo.www.chooloolib.di.module.MainScope
 import com.chooloo.www.chooloolib.interactor.animation.AnimationsInteractor
-import com.chooloo.www.chooloolib.interactor.color.ColorsInteractor
-import com.chooloo.www.chooloolib.interactor.drawable.DrawablesInteractor
 import com.chooloo.www.chooloolib.interactor.phoneaccounts.PhonesInteractor
-import com.chooloo.www.chooloolib.model.Call
-import com.chooloo.www.chooloolib.model.ListData
 import com.chooloo.www.chooloolib.ui.widgets.listitemholder.ListItemHolder
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class CallItemsAdapter @Inject constructor(
     animationsInteractor: AnimationsInteractor,
+    @IoScope private val ioScope: CoroutineScope,
     private val phonesInteractor: PhonesInteractor,
+    @MainScope private val mainScope: CoroutineScope,
 ) : ListAdapter<Call>(animationsInteractor) {
-    override fun onBindListItem(listItemHolder: ListItemHolder, item: Call) {
+    override fun onBindListItem(listItemHolder: ListItemHolder, item: Call, position: Int) {
         listItemHolder.apply {
-            phonesInteractor.lookupAccount(item.number) { account ->
-                account?.photoUri?.let {
-                    setImageUri(Uri.parse(it))
-                } ?: run {
-                    setImageResource(R.drawable.person)
-                }
+            ioScope.launch {
+                val account = phonesInteractor.lookupAccount(item.number)
+
+                mainScope.launch {
+                    account?.photoUri?.let {
+                        setImageUri(Uri.parse(it))
+                    } ?: run {
+                        setImageResource(R.drawable.person)
+                    }
 
-                account?.displayString?.let {
-                    titleText = it
-                    captionText = item.number
-                } ?: run {
-                    titleText = item.number
+                    account?.displayString?.let {
+                        titleText = it
+                        captionText = item.number
+                    } ?: run {
+                        titleText = item.number
+                    }
                 }
             }
 
@@ -40,9 +48,9 @@ class CallItemsAdapter @Inject constructor(
 
             setLeftButtonIcon(R.drawable.call_split)
             setRightButtonIcon(R.drawable.call_end)
-            setRightButtonIconTint(R.color.negative_foreground)
+            setRightButtonIconTint(R.color.negative)
         }
     }
 
-    override fun convertDataToListData(data: List<Call>) = ListData(data)
+    override fun convertDataToListData(items: List<Call>) = ListData(items)
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/ChoicesAdapter.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/ChoicesAdapter.kt
index 271cfb318..35a8d559b 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/ChoicesAdapter.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/ChoicesAdapter.kt
@@ -3,9 +3,9 @@ package com.chooloo.www.chooloolib.adapter
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import com.chooloo.www.chooloolib.data.model.ListData
 import com.chooloo.www.chooloolib.databinding.ListItemBinding
 import com.chooloo.www.chooloolib.interactor.animation.AnimationsInteractor
-import com.chooloo.www.chooloolib.model.ListData
 import com.chooloo.www.chooloolib.ui.widgets.listitemholder.ChoiceItemHolder
 import com.chooloo.www.chooloolib.ui.widgets.listitemholder.ListItemHolder
 import javax.inject.Inject
@@ -15,6 +15,7 @@ class ChoicesAdapter @Inject constructor(
     animations: AnimationsInteractor,
 ) : ListAdapter<String>(animations) {
     private var _selectedIndex: Int? = null
+    private var _onChoiceSelectedListener: (String) -> Boolean = { true }
 
     var selectedIndex: Int?
         get() = _selectedIndex
@@ -26,14 +27,23 @@ class ChoicesAdapter @Inject constructor(
         ListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
     )
 
-    override fun onBindListItem(listItemHolder: ListItemHolder, item: String) {
-        listItemHolder.titleText = item
-        selectedIndex?.let {
-            if (items[it] == item) {
-                listItemHolder.setSelected()
+    override fun onBindListItem(listItemHolder: ListItemHolder, item: String, position: Int) {
+        listItemHolder.apply {
+            titleText = item
+            (this as ChoiceItemHolder).setSelected(selectedIndex == position)
+            setOnClickListener {
+                if (_onChoiceSelectedListener.invoke(item)) {
+                    selectedIndex?.let(::notifyItemChanged)
+                    selectedIndex = position
+                    notifyItemChanged(position)
+                }
             }
         }
     }
 
-    override fun convertDataToListData(data: List<String>) = ListData(data)
+    override fun convertDataToListData(items: List<String>) = ListData(items)
+
+    fun setOnChoiceSelectedListener(onChoiceSelectedListener: (String) -> Boolean) {
+        _onChoiceSelectedListener = onChoiceSelectedListener
+    }
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/ContactsAdapter.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/ContactsAdapter.kt
index f71a8ded4..1ea35864e 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/ContactsAdapter.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/ContactsAdapter.kt
@@ -1,19 +1,24 @@
 package com.chooloo.www.chooloolib.adapter
 
 import android.net.Uri
+import com.chooloo.www.chooloolib.data.model.ContactAccount
+import com.chooloo.www.chooloolib.data.model.ListData
+import com.chooloo.www.chooloolib.di.module.IoScope
+import com.chooloo.www.chooloolib.di.module.MainScope
 import com.chooloo.www.chooloolib.interactor.animation.AnimationsInteractor
 import com.chooloo.www.chooloolib.interactor.phoneaccounts.PhonesInteractor
-import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor
-import com.chooloo.www.chooloolib.model.ContactAccount
-import com.chooloo.www.chooloolib.model.ListData
 import com.chooloo.www.chooloolib.ui.widgets.listitemholder.ListItemHolder
 import com.chooloo.www.chooloolib.util.initials
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 
 open class ContactsAdapter @Inject constructor(
     animations: AnimationsInteractor,
     private val phones: PhonesInteractor,
+    @IoScope private val ioScope: CoroutineScope,
+    @MainScope private val mainScope: CoroutineScope
 ) : ListAdapter<ContactAccount>(animations) {
     private var _withFavs: Boolean = true
     private var _withHeaders: Boolean = true
@@ -31,12 +36,20 @@ open class ContactsAdapter @Inject constructor(
         }
 
 
-    override fun onBindListItem(listItemHolder: ListItemHolder, item: ContactAccount) {
+    override fun onBindListItem(
+        listItemHolder: ListItemHolder,
+        item: ContactAccount,
+        position: Int
+    ) {
         listItemHolder.apply {
             titleText = item.name
             imageInitials = item.name?.initials()
-            phones.getContactAccounts(item.id) {
-                captionText = it?.firstOrNull()?.number
+
+            ioScope.launch {
+                val number = phones.getContactAccounts(item.id).firstOrNull()?.number
+                mainScope.launch {
+                    captionText = number
+                }
             }
 
             setImageUri(if (item.photoUri != null) Uri.parse(item.photoUri) else null)
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/ListAdapter.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/ListAdapter.kt
index c5202ed64..39d334a8e 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/ListAdapter.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/ListAdapter.kt
@@ -1,11 +1,12 @@
 package com.chooloo.www.chooloolib.adapter
 
+import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import com.chooloo.www.chooloolib.data.model.ListData
 import com.chooloo.www.chooloolib.databinding.ListItemBinding
 import com.chooloo.www.chooloolib.interactor.animation.AnimationsInteractor
-import com.chooloo.www.chooloolib.model.ListData
 import com.chooloo.www.chooloolib.ui.widgets.listitemholder.ListItemHolder
 import com.l4digital.fastscroll.FastScroller
 
@@ -28,6 +29,7 @@ abstract class ListAdapter<ItemType>(
 
     var items: List<ItemType>
         get() = _data.items
+        @SuppressLint("NotifyDataSetChanged")
         set(value) {
             _data = convertDataToListData(value)
             notifyDataSetChanged()
@@ -53,9 +55,9 @@ abstract class ListAdapter<ItemType>(
                 true
             }
 
-            animations.show(itemView, false)
+//            animations.show(itemView, false)
 
-            onBindListItem(this, dataItem)
+            onBindListItem(this, dataItem, position)
         }
     }
 
@@ -105,5 +107,5 @@ abstract class ListAdapter<ItemType>(
 
     open fun convertDataToListData(items: List<ItemType>) = ListData(items)
 
-    abstract fun onBindListItem(listItemHolder: ListItemHolder, item: ItemType)
+    abstract fun onBindListItem(listItemHolder: ListItemHolder, item: ItemType, position: Int)
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/MenuAdapter.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/MenuAdapter.kt
index afe242bf5..2c9f60ed7 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/MenuAdapter.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/MenuAdapter.kt
@@ -6,9 +6,9 @@ import android.os.Build.VERSION_CODES
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.ViewGroup
+import com.chooloo.www.chooloolib.data.model.ListData
 import com.chooloo.www.chooloolib.databinding.ListItemBinding
 import com.chooloo.www.chooloolib.interactor.animation.AnimationsInteractor
-import com.chooloo.www.chooloolib.model.ListData
 import com.chooloo.www.chooloolib.ui.widgets.listitemholder.ListItemHolder
 import com.chooloo.www.chooloolib.ui.widgets.listitemholder.MenuItemHolder
 import javax.inject.Inject
@@ -21,7 +21,7 @@ class MenuAdapter @Inject constructor(
         ListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
     )
 
-    override fun onBindListItem(listItemHolder: ListItemHolder, item: MenuItem) {
+    override fun onBindListItem(listItemHolder: ListItemHolder, item: MenuItem, position: Int) {
         listItemHolder.apply {
             isClickable = item.isEnabled
             titleText = item.title.toString()
@@ -29,7 +29,7 @@ class MenuAdapter @Inject constructor(
                 captionText = item.contentDescription?.toString()
             }
 
-            setImageDrawable(item.icon)
+            item.icon?.let(::setImageDrawable)
         }
     }
 
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/PhonesAdapter.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/PhonesAdapter.kt
index cefcab14b..7bd6a8aab 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/PhonesAdapter.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/PhonesAdapter.kt
@@ -3,9 +3,9 @@ package com.chooloo.www.chooloolib.adapter
 import android.content.Context
 import android.provider.ContactsContract.CommonDataKinds.Phone
 import com.chooloo.www.chooloolib.R
+import com.chooloo.www.chooloolib.data.model.ListData
+import com.chooloo.www.chooloolib.data.model.PhoneAccount
 import com.chooloo.www.chooloolib.interactor.animation.AnimationsInteractor
-import com.chooloo.www.chooloolib.model.ListData
-import com.chooloo.www.chooloolib.model.PhoneAccount
 import com.chooloo.www.chooloolib.ui.widgets.listitemholder.ListItemHolder
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
@@ -14,7 +14,7 @@ class PhonesAdapter @Inject constructor(
     animationsInteractor: AnimationsInteractor,
     @ApplicationContext private val context: Context
 ) : ListAdapter<PhoneAccount>(animationsInteractor) {
-    override fun onBindListItem(listItemHolder: ListItemHolder, item: PhoneAccount) {
+    override fun onBindListItem(listItemHolder: ListItemHolder, item: PhoneAccount, position: Int) {
         listItemHolder.apply {
             isImageVisible = false
             titleText = item.number
@@ -26,6 +26,6 @@ class PhonesAdapter @Inject constructor(
         }
     }
 
-    override fun convertDataToListData(data: List<PhoneAccount>) =
-        ListData.fromPhones(data, withHeader = false)
+    override fun convertDataToListData(items: List<PhoneAccount>) =
+        ListData.fromPhones(items, withHeader = false)
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt
index 4103f006e..9842c1225 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/adapter/RecentsAdapter.kt
@@ -4,18 +4,20 @@ import android.content.Context
 import android.net.Uri
 import android.provider.ContactsContract.CommonDataKinds.Phone
 import com.chooloo.www.chooloolib.R
+import com.chooloo.www.chooloolib.data.model.ListData
+import com.chooloo.www.chooloolib.data.model.RecentAccount
+import com.chooloo.www.chooloolib.di.module.IoScope
+import com.chooloo.www.chooloolib.di.module.MainScope
 import com.chooloo.www.chooloolib.interactor.animation.AnimationsInteractor
 import com.chooloo.www.chooloolib.interactor.drawable.DrawablesInteractor
-import com.chooloo.www.chooloolib.interactor.permission.PermissionsInteractor
 import com.chooloo.www.chooloolib.interactor.phoneaccounts.PhonesInteractor
-import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor
 import com.chooloo.www.chooloolib.interactor.recents.RecentsInteractor
-import com.chooloo.www.chooloolib.model.ListData
-import com.chooloo.www.chooloolib.model.RecentAccount
 import com.chooloo.www.chooloolib.ui.widgets.listitemholder.ListItemHolder
 import com.chooloo.www.chooloolib.util.getHoursString
 import com.chooloo.www.chooloolib.util.initials
 import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class RecentsAdapter @Inject constructor(
@@ -23,8 +25,8 @@ class RecentsAdapter @Inject constructor(
     private val phones: PhonesInteractor,
     private val recents: RecentsInteractor,
     private val drawables: DrawablesInteractor,
-    private val preferences: PreferencesInteractor,
-    private val permissions: PermissionsInteractor,
+    @IoScope private val ioScope: CoroutineScope,
+    @MainScope private val mainScope: CoroutineScope,
     @ApplicationContext private val context: Context
 ) : ListAdapter<RecentAccount>(animations) {
 
@@ -37,27 +39,35 @@ class RecentsAdapter @Inject constructor(
         }
 
 
-    override fun onBindListItem(listItemHolder: ListItemHolder, item: RecentAccount) {
+    override fun onBindListItem(
+        listItemHolder: ListItemHolder,
+        item: RecentAccount,
+        position: Int
+    ) {
         listItemHolder.apply {
             val date = context.getHoursString(item.date)
 
             captionText = if (item.groupCount > 1) "(${item.groupCount}) $date ·" else "$date ·"
 
-            phones.lookupAccount(item.number) {
-                titleText = it?.name ?: item.number
-                setImageUri(if (it?.photoUri != null) Uri.parse(it.photoUri) else null)
-                it?.let {
-                    captionText =
-                        "$captionText ${
-                            Phone.getTypeLabel(
-                                context.resources,
-                                it.type,
-                                it.label
-                            )
-                        } ·"
-                    imageInitials = it.name?.initials()
-                    if (it.name == null || it.name.isEmpty()) {
-                        drawables.getDrawable(R.drawable.person)?.let(this::setImageDrawable)
+            ioScope.launch {
+                val account = phones.lookupAccount(item.number)
+
+                mainScope.launch {
+                    titleText = account?.name ?: item.cachedName ?: item.number
+                    setImageUri(account?.photoUri?.let(Uri::parse))
+                    account?.let {
+                        captionText =
+                            "$captionText ${
+                                Phone.getTypeLabel(
+                                    context.resources,
+                                    it.type,
+                                    it.label
+                                )
+                            } ·"
+                        imageInitials = it.name?.initials() ?: it.number?.getOrNull(0).toString()
+                        if (it.name.isNullOrEmpty()) {
+                            drawables.getDrawable(R.drawable.person)?.let(::setImageDrawable)
+                        }
                     }
                 }
             }
@@ -66,6 +76,6 @@ class RecentsAdapter @Inject constructor(
         }
     }
 
-    override fun convertDataToListData(data: List<RecentAccount>) =
-        ListData.fromRecents(data, groupSimilar)
+    override fun convertDataToListData(items: List<RecentAccount>) =
+        ListData.fromRecents(items, groupSimilar)
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/service/CallService.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/api/service/CallService.kt
similarity index 66%
rename from chooloolib/src/main/java/com/chooloo/www/chooloolib/service/CallService.kt
rename to chooloolib/src/main/java/com/chooloo/www/chooloolib/api/service/CallService.kt
index da689856a..cfeb9e8ce 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/service/CallService.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/api/service/CallService.kt
@@ -1,30 +1,36 @@
-package com.chooloo.www.chooloolib.service
+package com.chooloo.www.chooloolib.api.service
 
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.telecom.CallAudioState
 import android.telecom.InCallService
-import androidx.lifecycle.MutableLiveData
 import com.chooloo.www.chooloolib.interactor.callaudio.CallAudiosInteractor
 import com.chooloo.www.chooloolib.interactor.calls.CallsInteractor
-import com.chooloo.www.chooloolib.model.Call
+import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor
+import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor.Companion.IncomingCallMode
+import com.chooloo.www.chooloolib.data.model.Call
 import com.chooloo.www.chooloolib.notification.CallNotification
-import com.chooloo.www.chooloolib.repository.calls.CallsRepository
+import com.chooloo.www.chooloolib.data.repository.calls.CallsRepository
 import com.chooloo.www.chooloolib.ui.call.CallActivity
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
 import javax.inject.Inject
 
 @SuppressLint("NewApi")
 @AndroidEntryPoint
 class CallService : InCallService() {
+    private val _calls = MutableStateFlow<List<Call>>(arrayListOf())
+
+    val calls = _calls.asStateFlow()
+
     @Inject lateinit var callAudios: CallAudiosInteractor
     @Inject lateinit var callsRepository: CallsRepository
     @Inject lateinit var callsInteractor: CallsInteractor
+    @Inject lateinit var preferences: PreferencesInteractor
     @Inject lateinit var callNotification: CallNotification
 
-    val calls = MutableLiveData<List<Call>>()
-
 
     override fun onCreate() {
         super.onCreate()
@@ -34,19 +40,20 @@ class CallService : InCallService() {
 
     override fun onDestroy() {
         callNotification.detach()
-        callNotification.cancel()
         super.onDestroy()
     }
 
     override fun onCallAdded(telecomCall: android.telecom.Call) {
         super.onCallAdded(telecomCall)
-        addCall(Call(telecomCall))
-        callsInteractor.entryAddCall(Call(telecomCall))
-        if (!sIsActivityActive) {
+        val call = Call(telecomCall)
+        addCall(call)
+        callsInteractor.entryAddCall(call)
+        if (!sIsActivityActive && (preferences.incomingCallMode == IncomingCallMode.FULL_SCREEN || call.isDirectionOutgoing)) {
             startCallActivity()
         }
     }
 
+
     override fun onCallRemoved(telecomCall: android.telecom.Call) {
         super.onCallRemoved(telecomCall)
         removeCall(Call(telecomCall))
@@ -66,15 +73,15 @@ class CallService : InCallService() {
     }
 
     private fun addCall(call: Call) {
-        val list = calls.value?.toMutableList()
-        list?.add(call)
-        calls.value = list
+        val list = calls.value.toMutableList()
+        list.add(call)
+        _calls.value = list
     }
 
     private fun removeCall(call: Call) {
-        val list = calls.value?.toMutableList()
-        list?.remove(call)
-        calls.value = list
+        val list = calls.value.toMutableList()
+        list.remove(call)
+        _calls.value = list
     }
 
 
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/BaseContentResolver.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/BaseContentResolver.kt
deleted file mode 100644
index 97d0df0db..000000000
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/BaseContentResolver.kt
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.chooloo.www.chooloolib.contentresolver
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.database.Cursor
-import android.net.Uri
-import com.pushtorefresh.storio3.contentresolver.impl.DefaultStorIOContentResolver
-import com.pushtorefresh.storio3.contentresolver.queries.Query
-import io.reactivex.BackpressureStrategy
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.Disposable
-import io.reactivex.schedulers.Schedulers
-
-abstract class BaseContentResolver<ItemType>(private val context: Context) {
-    private var _filter: String? = null
-
-    private val _ioContentResolver by lazy {
-        DefaultStorIOContentResolver.builder().contentResolver(context.contentResolver).build()
-    }
-
-    private val _query: Query
-        get() = Query.builder()
-            .uri(finalUri)
-            .columns(*projection)
-            .whereArgs(*(selectionArgs ?: arrayOf()))
-            .where(if (selection == "") null else selection)
-            .sortOrder(if (sortOrder == "") null else sortOrder)
-            .build()
-
-    val finalUri: Uri
-        get() = if (filterUri != null && _filter?.isNotEmpty() == true) {
-            Uri.withAppendedPath(filterUri, _filter)
-        } else {
-            uri
-        }
-
-
-    open var filter: String?
-        get() = _filter
-        set(value) {
-            _filter = if (value == "") null else value
-        }
-
-
-    private fun queryCursor() =
-        _ioContentResolver
-            .get()
-            .cursor()
-            .withQuery(_query)
-            .prepare()
-            .executeAsBlocking()
-
-    @SuppressLint("CheckResult")
-    fun queryCursor(callback: (Cursor?) -> Unit): Disposable =
-        _ioContentResolver
-            .get()
-            .cursor()
-            .withQuery(_query)
-            .prepare()
-            .asRxSingle()
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(callback::invoke)
-
-    fun queryItems() = convertCursorToItems(queryCursor())
-
-    fun queryItems(callback: (List<ItemType>) -> Unit): Disposable =
-        queryCursor { callback.invoke(convertCursorToItems(it)) }
-
-    @SuppressLint("CheckResult")
-    fun observeUri(observer: () -> Unit): Disposable =
-        _ioContentResolver
-            .observeChangesOfUri(finalUri, BackpressureStrategy.LATEST)
-            .subscribe { observer.invoke() }
-            .also { observer.invoke() }
-
-    private fun observeCursor(observer: (Cursor?) -> Unit): Disposable =
-        _ioContentResolver
-            .get()
-            .cursor()
-            .withQuery(_query)
-            .prepare()
-            .asRxFlowable(BackpressureStrategy.LATEST)
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(observer::invoke)
-
-    fun observeItems(observer: (List<ItemType>) -> Unit) =
-        observeCursor { observer.invoke(convertCursorToItems(it)) }
-
-    private fun convertCursorToItems(cursor: Cursor?): ArrayList<ItemType> {
-        val content = ArrayList<ItemType>()
-        while (cursor != null && cursor.moveToNext()) {
-            content.add(convertCursorToItem(cursor))
-        }
-        cursor?.close()
-        return content
-    }
-
-    abstract val uri: Uri
-    abstract val filterUri: Uri?
-    abstract val selection: String?
-    abstract val sortOrder: String?
-    abstract val projection: Array<String>
-    abstract val selectionArgs: Array<String>?
-    abstract fun convertCursorToItem(cursor: Cursor): ItemType
-}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/contentresolver/BaseContentResolver.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/contentresolver/BaseContentResolver.kt
new file mode 100644
index 000000000..127af4671
--- /dev/null
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/contentresolver/BaseContentResolver.kt
@@ -0,0 +1,91 @@
+package com.chooloo.www.chooloolib.data.contentresolver
+
+import android.content.ContentResolver
+import android.database.ContentObserver
+import android.database.Cursor
+import android.net.Uri
+import com.chooloo.www.chooloolib.di.module.IoDispatcher
+import com.pushtorefresh.storio3.contentresolver.queries.Query
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+abstract class BaseContentResolver<ItemType>(
+    private val contentResolver: ContentResolver,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher
+) {
+    private var _filter: String? = null
+
+    private val _query: Query
+        get() = Query.builder()
+            .uri(finalUri)
+            .columns(*projection)
+            .whereArgs(*(selectionArgs ?: arrayOf()))
+            .where(if (selection == "") null else selection)
+            .sortOrder(if (sortOrder == "") null else sortOrder)
+            .build()
+
+    val finalUri: Uri
+        get() = if (filterUri != null && _filter?.isNotEmpty() == true) {
+            Uri.withAppendedPath(filterUri, _filter)
+        } else {
+            uri
+        }
+
+    open var filter: String?
+        get() = _filter
+        set(value) {
+            _filter = if (value == "") null else value
+        }
+
+    suspend fun queryCursor() = withContext(ioDispatcher) {
+        contentResolver.query(
+            finalUri,
+            projection,
+            if (selection == "") null else selection,
+            selectionArgs ?: arrayOf(),
+            if (sortOrder == "") null else sortOrder
+        )
+    }
+
+    suspend fun queryItems() = convertCursorToItems(queryCursor())
+
+    fun getCursorFlow() = callbackFlow {
+        val callback = object : ContentObserver(null) {
+            override fun onChange(selfChange: Boolean) {
+                launch {
+                    send(queryCursor())
+                }
+            }
+        }
+        send(queryCursor())
+        contentResolver.registerContentObserver(finalUri, false, callback)
+        awaitClose { contentResolver.unregisterContentObserver(callback) }
+    }
+
+    fun getItemsFlow() = flow {
+        getCursorFlow().collect {
+            emit(convertCursorToItems(it))
+        }
+    }
+
+    private fun convertCursorToItems(cursor: Cursor?): ArrayList<ItemType> {
+        val content = ArrayList<ItemType>()
+        while (cursor != null && cursor.moveToNext() && !cursor.isClosed) {
+            content.add(convertCursorToItem(cursor))
+        }
+        cursor?.close()
+        return content
+    }
+
+    abstract val uri: Uri
+    abstract val filterUri: Uri?
+    abstract val selection: String?
+    abstract val sortOrder: String?
+    abstract val projection: Array<String>
+    abstract val selectionArgs: Array<String>?
+    abstract fun convertCursorToItem(cursor: Cursor): ItemType
+}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/ContactsContentResolver.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/contentresolver/ContactsContentResolver.kt
similarity index 76%
rename from chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/ContactsContentResolver.kt
rename to chooloolib/src/main/java/com/chooloo/www/chooloolib/data/contentresolver/ContactsContentResolver.kt
index 857441e81..ec490239e 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/ContactsContentResolver.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/contentresolver/ContactsContentResolver.kt
@@ -1,15 +1,21 @@
-package com.chooloo.www.chooloolib.contentresolver
+package com.chooloo.www.chooloolib.data.contentresolver
 
 import android.annotation.SuppressLint
-import android.content.Context
+import android.content.ContentResolver
 import android.database.Cursor
 import android.net.Uri
 import android.provider.ContactsContract
-import com.chooloo.www.chooloolib.model.ContactAccount
+import com.chooloo.www.chooloolib.di.module.IoDispatcher
+import com.chooloo.www.chooloolib.data.model.ContactAccount
 import com.chooloo.www.chooloolib.util.SelectionBuilder
+import kotlinx.coroutines.CoroutineDispatcher
 
-class ContactsContentResolver(context: Context, contactId: Long? = null) :
-    BaseContentResolver<ContactAccount>(context) {
+class ContactsContentResolver(
+    contactId: Long? = null,
+    contentResolver: ContentResolver,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher
+) :
+    BaseContentResolver<ContactAccount>(contentResolver, ioDispatcher) {
 
     override val selectionArgs: Array<String>? = null
     override val uri: Uri = ContactsContract.Contacts.CONTENT_URI
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/PhoneLookupContentResolver.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/contentresolver/PhoneLookupContentResolver.kt
similarity index 73%
rename from chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/PhoneLookupContentResolver.kt
rename to chooloolib/src/main/java/com/chooloo/www/chooloolib/data/contentresolver/PhoneLookupContentResolver.kt
index e2a5353d2..1e8ed4750 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/PhoneLookupContentResolver.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/contentresolver/PhoneLookupContentResolver.kt
@@ -1,14 +1,20 @@
-package com.chooloo.www.chooloolib.contentresolver
+package com.chooloo.www.chooloolib.data.contentresolver
 
 import android.annotation.SuppressLint
-import android.content.Context
+import android.content.ContentResolver
 import android.database.Cursor
 import android.net.Uri
 import android.provider.ContactsContract.PhoneLookup
-import com.chooloo.www.chooloolib.model.PhoneLookupAccount
+import com.chooloo.www.chooloolib.di.module.IoDispatcher
+import com.chooloo.www.chooloolib.data.model.PhoneLookupAccount
+import kotlinx.coroutines.CoroutineDispatcher
 
-class PhoneLookupContentResolver(context: Context, number: String?) :
-    BaseContentResolver<PhoneLookupAccount>(context) {
+class PhoneLookupContentResolver(
+    number: String?,
+    contentResolver: ContentResolver,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher
+) :
+    BaseContentResolver<PhoneLookupAccount>(contentResolver, ioDispatcher) {
 
     override val selection: String? = null
     override val sortOrder: String? = null
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/PhonesContentResolver.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/contentresolver/PhonesContentResolver.kt
similarity index 72%
rename from chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/PhonesContentResolver.kt
rename to chooloolib/src/main/java/com/chooloo/www/chooloolib/data/contentresolver/PhonesContentResolver.kt
index e96cc70ab..3754d4498 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/PhonesContentResolver.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/contentresolver/PhonesContentResolver.kt
@@ -1,15 +1,21 @@
-package com.chooloo.www.chooloolib.contentresolver
+package com.chooloo.www.chooloolib.data.contentresolver
 
 import android.annotation.SuppressLint
-import android.content.Context
+import android.content.ContentResolver
 import android.database.Cursor
 import android.net.Uri
 import android.provider.ContactsContract.CommonDataKinds.Phone
-import com.chooloo.www.chooloolib.model.PhoneAccount
+import com.chooloo.www.chooloolib.di.module.IoDispatcher
+import com.chooloo.www.chooloolib.data.model.PhoneAccount
 import com.chooloo.www.chooloolib.util.SelectionBuilder
+import kotlinx.coroutines.CoroutineDispatcher
 
-class PhonesContentResolver(context: Context, contactId: Long? = null) :
-    BaseContentResolver<PhoneAccount>(context) {
+class PhonesContentResolver(
+    contactId: Long? = null,
+    contentResolver: ContentResolver,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher
+) :
+    BaseContentResolver<PhoneAccount>(contentResolver, ioDispatcher) {
 
     override val uri: Uri = Phone.CONTENT_URI
     override val sortOrder: String? = null
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/RawContactsContentResolver.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/contentresolver/RawContactsContentResolver.kt
similarity index 71%
rename from chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/RawContactsContentResolver.kt
rename to chooloolib/src/main/java/com/chooloo/www/chooloolib/data/contentresolver/RawContactsContentResolver.kt
index 8cee9c8d4..08a21e5c3 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/RawContactsContentResolver.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/contentresolver/RawContactsContentResolver.kt
@@ -1,14 +1,20 @@
-package com.chooloo.www.chooloolib.contentresolver
+package com.chooloo.www.chooloolib.data.contentresolver
 
-import android.content.Context
+import android.content.ContentResolver
 import android.database.Cursor
 import android.net.Uri
 import android.provider.ContactsContract.Contacts
 import androidx.core.database.getStringOrNull
-import com.chooloo.www.chooloolib.model.RawContactAccount
+import com.chooloo.www.chooloolib.di.module.IoDispatcher
+import com.chooloo.www.chooloolib.data.model.RawContactAccount
+import kotlinx.coroutines.CoroutineDispatcher
 
-class RawContactsContentResolver(context: Context, contactId: Long) :
-    BaseContentResolver<RawContactAccount>(context) {
+class RawContactsContentResolver(
+    contactId: Long,
+    contentResolver: ContentResolver,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher
+) :
+    BaseContentResolver<RawContactAccount>(contentResolver, ioDispatcher) {
     override val uri: Uri = Uri.withAppendedPath(
         Uri.withAppendedPath(Contacts.CONTENT_URI, contactId.toString()),
         Contacts.Entity.CONTENT_DIRECTORY
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/RecentsContentResolver.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/contentresolver/RecentsContentResolver.kt
similarity index 78%
rename from chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/RecentsContentResolver.kt
rename to chooloolib/src/main/java/com/chooloo/www/chooloolib/data/contentresolver/RecentsContentResolver.kt
index bbdba2aa1..85270e24e 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/contentresolver/RecentsContentResolver.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/contentresolver/RecentsContentResolver.kt
@@ -1,19 +1,22 @@
-package com.chooloo.www.chooloolib.contentresolver
+package com.chooloo.www.chooloolib.data.contentresolver
 
 import android.annotation.SuppressLint
-import android.content.Context
+import android.content.ContentResolver
 import android.database.Cursor
 import android.net.Uri
 import android.provider.CallLog
-import com.chooloo.www.chooloolib.model.RecentAccount
+import com.chooloo.www.chooloolib.di.module.IoDispatcher
+import com.chooloo.www.chooloolib.data.model.RecentAccount
 import com.chooloo.www.chooloolib.util.SelectionBuilder
+import kotlinx.coroutines.CoroutineDispatcher
 import java.util.*
 
 class RecentsContentResolver(
-    context: Context,
-    private val recentId: Long? = null
+    private val recentId: Long? = null,
+    contentResolver: ContentResolver,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher
 ) :
-    BaseContentResolver<RecentAccount>(context) {
+    BaseContentResolver<RecentAccount>(contentResolver, ioDispatcher) {
 
     override val uri: Uri = CallLog.Calls.CONTENT_URI
     override val filterUri: Uri? = null
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/Call.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/Call.kt
similarity index 92%
rename from chooloolib/src/main/java/com/chooloo/www/chooloolib/model/Call.kt
rename to chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/Call.kt
index 0fa6a2b1a..619a49161 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/Call.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/Call.kt
@@ -1,4 +1,4 @@
-package com.chooloo.www.chooloolib.model
+package com.chooloo.www.chooloolib.data.model
 
 import android.net.Uri
 import android.os.Build
@@ -6,15 +6,14 @@ import android.os.Build.VERSION.SDK_INT
 import android.os.Build.VERSION_CODES.Q
 import android.os.Bundle
 import android.telecom.Call.*
-import android.telecom.Call.Details.CAPABILITY_HOLD
-import android.telecom.Call.Details.PROPERTY_ENTERPRISE_CALL
+import android.telecom.Call.Details.*
 import android.telecom.Connection
 import android.telecom.DisconnectCause
 import android.telecom.PhoneAccountHandle
 import android.telecom.PhoneAccountSuggestion
 import androidx.annotation.RequiresApi
 import com.chooloo.www.chooloolib.R
-import com.chooloo.www.chooloolib.model.Call.State.*
+import com.chooloo.www.chooloolib.data.model.Call.State.*
 import com.chooloo.www.chooloolib.util.baseobservable.BaseObservable
 import java.util.stream.Collectors
 import java.util.stream.Stream
@@ -32,11 +31,13 @@ class Call(telecomCall: android.telecom.Call) : BaseObservable<Call.Listener>()
     private var _phoneAccountSelected: Boolean = false
     private val _id: String = Call::class.java.simpleName + sIdCounter++
     private val _call: android.telecom.Call = telecomCall
+    private val _pastStates = mutableListOf<State>()
 
     init {
         _call.registerCallback(object : android.telecom.Call.Callback() {
             override fun onStateChanged(call: android.telecom.Call?, state: Int) {
                 invokeListeners { it.onCallChanged(this@Call) }
+                _pastStates.add(State.fromTelecomState(state))
             }
 
             override fun onDetailsChanged(call: android.telecom.Call?, details: Details?) {
@@ -143,6 +144,20 @@ class Call(telecomCall: android.telecom.Call) : BaseObservable<Call.Listener>()
     val isIncoming: Boolean
         get() = state == INCOMING
 
+    val isDirectionIncoming: Boolean
+        get() = if (SDK_INT >= Q) {
+            _call.details.callDirection == DIRECTION_INCOMING
+        } else {
+            INCOMING in _pastStates
+        }
+
+    val isDirectionOutgoing: Boolean
+        get() = if (SDK_INT >= Q) {
+            _call.details.callDirection == DIRECTION_OUTGOING
+        } else {
+            DIALING in _pastStates
+        }
+
     val children: List<Call>
         get() = _call.children.map(::Call).toList()
 
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/CallList.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/CallList.kt
similarity index 97%
rename from chooloolib/src/main/java/com/chooloo/www/chooloolib/model/CallList.kt
rename to chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/CallList.kt
index 1ead7a643..fec873a63 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/CallList.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/CallList.kt
@@ -1,4 +1,4 @@
-package com.chooloo.www.chooloolib.model
+package com.chooloo.www.chooloolib.data.model
 
 import java.util.*
 
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/ContactAccount.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/ContactAccount.kt
similarity index 89%
rename from chooloolib/src/main/java/com/chooloo/www/chooloolib/model/ContactAccount.kt
rename to chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/ContactAccount.kt
index ea38b8f76..00e4cdc59 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/ContactAccount.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/ContactAccount.kt
@@ -1,4 +1,4 @@
-package com.chooloo.www.chooloolib.model
+package com.chooloo.www.chooloolib.data.model
 
 data class ContactAccount(
     val id: Long = 0,
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/ListData.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/ListData.kt
similarity index 89%
rename from chooloolib/src/main/java/com/chooloo/www/chooloolib/model/ListData.kt
rename to chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/ListData.kt
index 07d0ce77a..c4791051b 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/ListData.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/ListData.kt
@@ -1,6 +1,6 @@
-package com.chooloo.www.chooloolib.model
+package com.chooloo.www.chooloolib.data.model
 
-import com.chooloo.www.chooloolib.model.RawContactAccount.RawContactType
+import com.chooloo.www.chooloolib.data.model.RawContactAccount.RawContactType
 import com.chooloo.www.chooloolib.util.getRelativeDateString
 
 data class ListData<DataType>(
@@ -65,8 +65,11 @@ data class ListData<DataType>(
             phones: List<PhoneAccount>,
             withHeader: Boolean = true
         ): ListData<PhoneAccount> {
-            val phones = phones.toList().distinctBy { it.normalizedNumber }
-            return ListData(phones, mapOf(Pair(if (withHeader) "Phones" else "", phones.size)))
+            val distinctPhones = phones.toList().distinctBy { it.cleanNumber }
+            return ListData(
+                distinctPhones,
+                mapOf(Pair(if (withHeader) "Phones" else "", distinctPhones.size))
+            )
         }
 
         fun fromRawContacts(
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/PhoneAccount.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/PhoneAccount.kt
similarity index 72%
rename from chooloolib/src/main/java/com/chooloo/www/chooloolib/model/PhoneAccount.kt
rename to chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/PhoneAccount.kt
index 893b52d66..989ffb271 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/PhoneAccount.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/PhoneAccount.kt
@@ -1,4 +1,4 @@
-package com.chooloo.www.chooloolib.model
+package com.chooloo.www.chooloolib.data.model
 
 import android.provider.ContactsContract.CommonDataKinds.Phone
 
@@ -9,4 +9,6 @@ data class PhoneAccount(
     val label: String? = null,
     val normalizedNumber: String?,
     val type: Int = Phone.TYPE_OTHER
-)
+) {
+    val cleanNumber get() = number.replace("-", "")
+}
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/PhoneLookupAccount.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/PhoneLookupAccount.kt
similarity index 91%
rename from chooloolib/src/main/java/com/chooloo/www/chooloolib/model/PhoneLookupAccount.kt
rename to chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/PhoneLookupAccount.kt
index b2518e530..16705fe3b 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/PhoneLookupAccount.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/PhoneLookupAccount.kt
@@ -1,4 +1,4 @@
-package com.chooloo.www.chooloolib.model
+package com.chooloo.www.chooloolib.data.model
 
 import android.provider.ContactsContract.CommonDataKinds.Phone
 
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/RawContactAccount.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/RawContactAccount.kt
similarity index 95%
rename from chooloolib/src/main/java/com/chooloo/www/chooloolib/model/RawContactAccount.kt
rename to chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/RawContactAccount.kt
index 5bb4b3f7a..1b1a6c2b5 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/RawContactAccount.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/RawContactAccount.kt
@@ -1,4 +1,4 @@
-package com.chooloo.www.chooloolib.model
+package com.chooloo.www.chooloolib.data.model
 
 import android.provider.ContactsContract.CommonDataKinds.*
 import androidx.annotation.StringRes
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/RecentAccount.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/RecentAccount.kt
similarity index 96%
rename from chooloolib/src/main/java/com/chooloo/www/chooloolib/model/RecentAccount.kt
rename to chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/RecentAccount.kt
index 5d5c739e7..4b176b640 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/RecentAccount.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/RecentAccount.kt
@@ -1,4 +1,4 @@
-package com.chooloo.www.chooloolib.model
+package com.chooloo.www.chooloolib.data.model
 
 import android.provider.CallLog
 import androidx.annotation.IntDef
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/SimAccount.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/SimAccount.kt
similarity index 91%
rename from chooloolib/src/main/java/com/chooloo/www/chooloolib/model/SimAccount.kt
rename to chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/SimAccount.kt
index 2cc4f084d..2a6490001 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/model/SimAccount.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/model/SimAccount.kt
@@ -1,4 +1,4 @@
-package com.chooloo.www.chooloolib.model
+package com.chooloo.www.chooloolib.data.model
 
 import android.telecom.PhoneAccount
 import android.telecom.PhoneAccountHandle
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/calls/CallsRepository.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/calls/CallsRepository.kt
new file mode 100644
index 000000000..d0b6df5cc
--- /dev/null
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/calls/CallsRepository.kt
@@ -0,0 +1,8 @@
+package com.chooloo.www.chooloolib.data.repository.calls
+
+import com.chooloo.www.chooloolib.data.model.Call
+import kotlinx.coroutines.flow.Flow
+
+interface CallsRepository {
+    fun getCalls(): Flow<List<Call>>
+}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/calls/CallsRepositoryImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/calls/CallsRepositoryImpl.kt
new file mode 100644
index 000000000..5e836f11c
--- /dev/null
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/calls/CallsRepositoryImpl.kt
@@ -0,0 +1,15 @@
+package com.chooloo.www.chooloolib.data.repository.calls
+
+import com.chooloo.www.chooloolib.api.service.CallService
+import com.chooloo.www.chooloolib.data.model.Call
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class CallsRepositoryImpl @Inject constructor() : CallsRepository {
+    override fun getCalls(): Flow<List<Call>> = flow {
+        CallService.sInstance?.calls?.collect(this::emit)
+    }
+}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/contacts/ContactsRepository.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/contacts/ContactsRepository.kt
new file mode 100644
index 000000000..8676aa2e5
--- /dev/null
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/contacts/ContactsRepository.kt
@@ -0,0 +1,9 @@
+package com.chooloo.www.chooloolib.data.repository.contacts
+
+import com.chooloo.www.chooloolib.data.model.ContactAccount
+import kotlinx.coroutines.flow.Flow
+
+interface ContactsRepository {
+    fun getContacts(filter: String? = null): Flow<List<ContactAccount>>
+    fun getContact(contactId: Long): Flow<ContactAccount?>
+}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/contacts/ContactsRepositoryImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/contacts/ContactsRepositoryImpl.kt
new file mode 100644
index 000000000..5b600afa2
--- /dev/null
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/contacts/ContactsRepositoryImpl.kt
@@ -0,0 +1,24 @@
+package com.chooloo.www.chooloolib.data.repository.contacts
+
+import com.chooloo.www.chooloolib.data.model.ContactAccount
+import com.chooloo.www.chooloolib.di.factory.contentresolver.ContentResolverFactory
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ContactsRepositoryImpl @Inject constructor(
+    private val contentResolverFactory: ContentResolverFactory
+) : ContactsRepository {
+    override fun getContacts(filter: String?): Flow<List<ContactAccount>> =
+        contentResolverFactory.getContactsContentResolver().apply {
+            this.filter = filter
+        }.getItemsFlow()
+
+    override fun getContact(contactId: Long): Flow<ContactAccount?> = flow {
+        contentResolverFactory.getContactsContentResolver(contactId).getItemsFlow().collect {
+            emit(it.getOrNull(0))
+        }
+    }
+}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/phones/PhonesRepository.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/phones/PhonesRepository.kt
new file mode 100644
index 000000000..ea4f7a7eb
--- /dev/null
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/phones/PhonesRepository.kt
@@ -0,0 +1,8 @@
+package com.chooloo.www.chooloolib.data.repository.phones
+
+import com.chooloo.www.chooloolib.data.model.PhoneAccount
+import kotlinx.coroutines.flow.Flow
+
+interface PhonesRepository {
+    fun getPhones(contactId: Long? = null, filter: String? = null): Flow<List<PhoneAccount>>
+}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/phones/PhonesRepositoryImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/phones/PhonesRepositoryImpl.kt
new file mode 100644
index 000000000..ec279a337
--- /dev/null
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/phones/PhonesRepositoryImpl.kt
@@ -0,0 +1,17 @@
+package com.chooloo.www.chooloolib.data.repository.phones
+
+import com.chooloo.www.chooloolib.data.model.PhoneAccount
+import com.chooloo.www.chooloolib.di.factory.contentresolver.ContentResolverFactory
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class PhonesRepositoryImpl @Inject constructor(
+    private val contentResolverFactory: ContentResolverFactory
+) : PhonesRepository {
+    override fun getPhones(contactId: Long?, filter: String?): Flow<List<PhoneAccount>> =
+        contentResolverFactory.getPhonesContentResolver(contactId).apply {
+            this.filter = filter
+        }.getItemsFlow()
+}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/rawcontacts/RawContactsRepository.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/rawcontacts/RawContactsRepository.kt
new file mode 100644
index 000000000..2e1b87870
--- /dev/null
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/rawcontacts/RawContactsRepository.kt
@@ -0,0 +1,8 @@
+package com.chooloo.www.chooloolib.data.repository.rawcontacts
+
+import com.chooloo.www.chooloolib.data.model.RawContactAccount
+import kotlinx.coroutines.flow.Flow
+
+interface RawContactsRepository {
+    fun getRawContacts(contactId: Long, filter: String? = null): Flow<List<RawContactAccount>>
+}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/rawcontacts/RawContactsRepositoryImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/rawcontacts/RawContactsRepositoryImpl.kt
new file mode 100644
index 000000000..bf2901681
--- /dev/null
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/rawcontacts/RawContactsRepositoryImpl.kt
@@ -0,0 +1,17 @@
+package com.chooloo.www.chooloolib.data.repository.rawcontacts
+
+import com.chooloo.www.chooloolib.data.model.RawContactAccount
+import com.chooloo.www.chooloolib.di.factory.contentresolver.ContentResolverFactory
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RawContactsRepositoryImpl @Inject constructor(
+    private val contentResolverFactory: ContentResolverFactory
+) : RawContactsRepository {
+    override fun getRawContacts(contactId: Long, filter: String?): Flow<List<RawContactAccount>> =
+        contentResolverFactory.getRawContactsContentResolver(contactId).apply {
+            this.filter = filter
+        }.getItemsFlow()
+}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/recents/RecentsRepository.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/recents/RecentsRepository.kt
new file mode 100644
index 000000000..576decf2c
--- /dev/null
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/recents/RecentsRepository.kt
@@ -0,0 +1,9 @@
+package com.chooloo.www.chooloolib.data.repository.recents
+
+import com.chooloo.www.chooloolib.data.model.RecentAccount
+import kotlinx.coroutines.flow.Flow
+
+interface RecentsRepository {
+    fun getRecent(recentId: Long? = null): Flow<RecentAccount?>
+    fun getRecents(filter: String? = null): Flow<List<RecentAccount>>
+}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/recents/RecentsRepositoryImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/recents/RecentsRepositoryImpl.kt
new file mode 100644
index 000000000..fc56c1e1d
--- /dev/null
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/data/repository/recents/RecentsRepositoryImpl.kt
@@ -0,0 +1,24 @@
+package com.chooloo.www.chooloolib.data.repository.recents
+
+import com.chooloo.www.chooloolib.data.model.RecentAccount
+import com.chooloo.www.chooloolib.di.factory.contentresolver.ContentResolverFactory
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RecentsRepositoryImpl @Inject constructor(
+    private val contentResolverFactory: ContentResolverFactory
+) : RecentsRepository {
+    override fun getRecents(filter: String?): Flow<List<RecentAccount>> =
+        contentResolverFactory.getRecentsContentResolver().apply {
+            this.filter = filter
+        }.getItemsFlow()
+
+    override fun getRecent(recentId: Long?) = flow {
+        contentResolverFactory.getRecentsContentResolver(recentId).getItemsFlow().collect {
+            emit(it.getOrNull(0))
+        }
+    }
+}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/contentresolver/ContentResolverFactory.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/contentresolver/ContentResolverFactory.kt
index 81c110c42..dc00ed975 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/contentresolver/ContentResolverFactory.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/contentresolver/ContentResolverFactory.kt
@@ -1,6 +1,6 @@
 package com.chooloo.www.chooloolib.di.factory.contentresolver
 
-import com.chooloo.www.chooloolib.contentresolver.*
+import com.chooloo.www.chooloolib.data.contentresolver.*
 
 interface ContentResolverFactory {
     fun getPhonesContentResolver(contactId: Long? = null): PhonesContentResolver
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/contentresolver/ContentResolverFactoryImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/contentresolver/ContentResolverFactoryImpl.kt
index 65d40d069..2984f1282 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/contentresolver/ContentResolverFactoryImpl.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/contentresolver/ContentResolverFactoryImpl.kt
@@ -1,27 +1,29 @@
 package com.chooloo.www.chooloolib.di.factory.contentresolver
 
-import android.content.Context
-import com.chooloo.www.chooloolib.contentresolver.*
-import dagger.hilt.android.qualifiers.ApplicationContext
+import android.content.ContentResolver
+import com.chooloo.www.chooloolib.data.contentresolver.*
+import com.chooloo.www.chooloolib.di.module.IoDispatcher
+import kotlinx.coroutines.CoroutineDispatcher
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class ContentResolverFactoryImpl @Inject constructor(
-    @ApplicationContext private val context: Context
+    private val contentResolver: ContentResolver,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher
 ) : ContentResolverFactory {
     override fun getRecentsContentResolver(recentId: Long?) =
-        RecentsContentResolver(context, recentId)
+        RecentsContentResolver(recentId, contentResolver, ioDispatcher)
 
     override fun getPhonesContentResolver(contactId: Long?) =
-        PhonesContentResolver(context, contactId)
+        PhonesContentResolver(contactId, contentResolver, ioDispatcher)
 
     override fun getContactsContentResolver(contactId: Long?) =
-        ContactsContentResolver(context, contactId)
+        ContactsContentResolver(contactId, contentResolver, ioDispatcher)
 
     override fun getRawContactsContentResolver(contactId: Long) =
-        RawContactsContentResolver(context, contactId)
+        RawContactsContentResolver(contactId, contentResolver, ioDispatcher)
 
     override fun getPhoneLookupContentResolver(number: String?) =
-        PhoneLookupContentResolver(context, number)
+        PhoneLookupContentResolver(number, contentResolver, ioDispatcher)
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/fragment/FragmentFactory.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/fragment/FragmentFactory.kt
index 426f59ecf..3f5629e7d 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/fragment/FragmentFactory.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/fragment/FragmentFactory.kt
@@ -7,9 +7,10 @@ import com.chooloo.www.chooloolib.ui.briefcontact.BriefContactFragment
 import com.chooloo.www.chooloolib.ui.briefcontact.menu.BriefContactMenuFragment
 import com.chooloo.www.chooloolib.ui.callitems.CallItemsFragment
 import com.chooloo.www.chooloolib.ui.contacts.ContactsFragment
-import com.chooloo.www.chooloolib.ui.contacts.ContactsSuggestionsFragment
+import com.chooloo.www.chooloolib.ui.contacts.suggestions.ContactsSuggestionsFragment
 import com.chooloo.www.chooloolib.ui.dialer.DialerFragment
 import com.chooloo.www.chooloolib.ui.dialpad.DialpadFragment
+import com.chooloo.www.chooloolib.ui.permission.PermissionFragment
 import com.chooloo.www.chooloolib.ui.phones.PhonesFragment
 import com.chooloo.www.chooloolib.ui.prompt.PromptFragment
 import com.chooloo.www.chooloolib.ui.recent.RecentFragment
@@ -24,6 +25,7 @@ interface FragmentFactory {
     fun getContactsFragment(): ContactsFragment
     fun getCallItemsFragment(): CallItemsFragment
     fun getRecentMenuFragment(): RecentMenuFragment
+    fun getPermissionFragment(): PermissionFragment
     fun getRecentFragment(recentId: Long): RecentFragment
     fun getBriefContactMenuFragment(): BriefContactMenuFragment
     fun getDialerFragment(text: String? = null): DialerFragment
@@ -31,7 +33,7 @@ interface FragmentFactory {
     fun getContactsSuggestionsFragment(): ContactsSuggestionsFragment
     fun getBriefContactFragment(contactId: Long): BriefContactFragment
     fun getAccountsFragment(contactId: Long? = null): AccountsFragment
-    fun getPromptFragment(title: String, subtitle: String): PromptFragment
+    fun getPromptFragment(title: String, subtitle: String, isActivated: Boolean): PromptFragment
     fun getRecentsHistoryFragment(filter: String? = null): RecentsHistoryFragment
     fun getRecentsFragment(filter: String? = null, isGrouped: Boolean? = null): RecentsFragment
     fun getChoicesFragment(
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/fragment/FragmentFactoryImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/fragment/FragmentFactoryImpl.kt
index 9c8b1dd3a..25b687d30 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/fragment/FragmentFactoryImpl.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/fragment/FragmentFactoryImpl.kt
@@ -7,9 +7,10 @@ import com.chooloo.www.chooloolib.ui.briefcontact.BriefContactFragment
 import com.chooloo.www.chooloolib.ui.briefcontact.menu.BriefContactMenuFragment
 import com.chooloo.www.chooloolib.ui.callitems.CallItemsFragment
 import com.chooloo.www.chooloolib.ui.contacts.ContactsFragment
-import com.chooloo.www.chooloolib.ui.contacts.ContactsSuggestionsFragment
+import com.chooloo.www.chooloolib.ui.contacts.suggestions.ContactsSuggestionsFragment
 import com.chooloo.www.chooloolib.ui.dialer.DialerFragment
 import com.chooloo.www.chooloolib.ui.dialpad.DialpadFragment
+import com.chooloo.www.chooloolib.ui.permission.PermissionFragment
 import com.chooloo.www.chooloolib.ui.phones.PhonesFragment
 import com.chooloo.www.chooloolib.ui.prompt.PromptFragment
 import com.chooloo.www.chooloolib.ui.recent.RecentFragment
@@ -26,12 +27,12 @@ class FragmentFactoryImpl @Inject constructor() : FragmentFactory {
     override fun getSettingsFragment() = SettingsFragment()
     override fun getContactsFragment() = ContactsFragment()
     override fun getCallItemsFragment() = CallItemsFragment()
+    override fun getPermissionFragment() = PermissionFragment()
     override fun getRecentMenuFragment() = RecentMenuFragment()
     override fun getContactsSuggestionsFragment() = ContactsSuggestionsFragment()
     override fun getDialerFragment(text: String?) = DialerFragment.newInstance(text)
     override fun getRecentFragment(recentId: Long) = RecentFragment.newInstance(recentId)
     override fun getBriefContactMenuFragment() = BriefContactMenuFragment()
-
     override fun getAccountsFragment(contactId: Long?) =
         AccountsFragment.newInstance(contactId)
 
@@ -41,8 +42,12 @@ class FragmentFactoryImpl @Inject constructor() : FragmentFactory {
     override fun getPhonesFragment(contactId: Long?) =
         PhonesFragment.newInstance(contactId)
 
-    override fun getPromptFragment(title: String, subtitle: String) =
-        PromptFragment.newInstance(title, subtitle)
+    override fun getPromptFragment(
+        title: String,
+        subtitle: String,
+        isActivated: Boolean
+    ): PromptFragment =
+        PromptFragment.newInstance(title, subtitle, isActivated)
 
     override fun getRecentsHistoryFragment(filter: String?) =
         RecentsHistoryFragment.newInstance(filter)
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/livedata/LiveDataFactory.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/livedata/LiveDataFactory.kt
deleted file mode 100644
index 98aaed0cf..000000000
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/livedata/LiveDataFactory.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.chooloo.www.chooloolib.di.factory.livedata
-
-import com.chooloo.www.chooloolib.livedata.ContactsLiveData
-import com.chooloo.www.chooloolib.livedata.PhonesLiveData
-import com.chooloo.www.chooloolib.livedata.RawContactsLiveData
-import com.chooloo.www.chooloolib.livedata.RecentsLiveData
-
-interface LiveDataFactory {
-    fun getPhonesLiveData(contactId: Long? = null): PhonesLiveData
-    fun getRecentsLiveData(recentId: Long? = null): RecentsLiveData
-    fun getRawContactsLiveData(contactId: Long): RawContactsLiveData
-    fun getContactsLiveData(contactId: Long? = null): ContactsLiveData
-}
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/livedata/LiveDataFactoryImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/livedata/LiveDataFactoryImpl.kt
deleted file mode 100644
index 3b89742d0..000000000
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/factory/livedata/LiveDataFactoryImpl.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.chooloo.www.chooloolib.di.factory.livedata
-
-import android.content.Context
-import com.chooloo.www.chooloolib.di.factory.contentresolver.ContentResolverFactory
-import com.chooloo.www.chooloolib.livedata.ContactsLiveData
-import com.chooloo.www.chooloolib.livedata.PhonesLiveData
-import com.chooloo.www.chooloolib.livedata.RawContactsLiveData
-import com.chooloo.www.chooloolib.livedata.RecentsLiveData
-import dagger.hilt.android.qualifiers.ApplicationContext
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class LiveDataFactoryImpl @Inject constructor(
-    @ApplicationContext private val context: Context,
-    private val contentResolverFactory: ContentResolverFactory
-) : LiveDataFactory {
-    override fun getRecentsLiveData(recentId: Long?) =
-        RecentsLiveData(context, recentId, contentResolverFactory)
-
-    override fun getRawContactsLiveData(contactId: Long) =
-        RawContactsLiveData(context, contactId, contentResolverFactory)
-
-    override fun getPhonesLiveData(contactId: Long?) =
-        PhonesLiveData(context, contactId, contentResolverFactory)
-
-    override fun getContactsLiveData(contactId: Long?) =
-        ContactsLiveData(context, contactId, contentResolverFactory)
-}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/module/ApplicationModule.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/module/ApplicationModule.kt
index eb2267557..57fe3ddc0 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/module/ApplicationModule.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/module/ApplicationModule.kt
@@ -1,7 +1,9 @@
 package com.chooloo.www.chooloolib.di.module
 
 import android.app.KeyguardManager
+import android.app.UiModeManager
 import android.content.ClipboardManager
+import android.content.ContentResolver
 import android.content.Context
 import android.media.AudioManager
 import android.os.PowerManager
@@ -11,12 +13,20 @@ import android.telephony.SubscriptionManager
 import android.telephony.TelephonyManager
 import android.view.inputmethod.InputMethodManager
 import androidx.core.app.NotificationManagerCompat
+import com.chooloo.www.chooloolib.data.repository.calls.CallsRepository
+import com.chooloo.www.chooloolib.data.repository.calls.CallsRepositoryImpl
+import com.chooloo.www.chooloolib.data.repository.contacts.ContactsRepository
+import com.chooloo.www.chooloolib.data.repository.contacts.ContactsRepositoryImpl
+import com.chooloo.www.chooloolib.data.repository.phones.PhonesRepository
+import com.chooloo.www.chooloolib.data.repository.phones.PhonesRepositoryImpl
+import com.chooloo.www.chooloolib.data.repository.rawcontacts.RawContactsRepository
+import com.chooloo.www.chooloolib.data.repository.rawcontacts.RawContactsRepositoryImpl
+import com.chooloo.www.chooloolib.data.repository.recents.RecentsRepository
+import com.chooloo.www.chooloolib.data.repository.recents.RecentsRepositoryImpl
 import com.chooloo.www.chooloolib.di.factory.contentresolver.ContentResolverFactory
 import com.chooloo.www.chooloolib.di.factory.contentresolver.ContentResolverFactoryImpl
 import com.chooloo.www.chooloolib.di.factory.fragment.FragmentFactory
 import com.chooloo.www.chooloolib.di.factory.fragment.FragmentFactoryImpl
-import com.chooloo.www.chooloolib.di.factory.livedata.LiveDataFactory
-import com.chooloo.www.chooloolib.di.factory.livedata.LiveDataFactoryImpl
 import com.chooloo.www.chooloolib.interactor.animation.AnimationsInteractor
 import com.chooloo.www.chooloolib.interactor.animation.AnimationsInteractorImpl
 import com.chooloo.www.chooloolib.interactor.audio.AudiosInteractor
@@ -55,16 +65,6 @@ import com.chooloo.www.chooloolib.interactor.telecom.TelecomInteractor
 import com.chooloo.www.chooloolib.interactor.telecom.TelecomInteractorImpl
 import com.chooloo.www.chooloolib.interactor.theme.ThemesInteractor
 import com.chooloo.www.chooloolib.interactor.theme.ThemesInteractorImpl
-import com.chooloo.www.chooloolib.repository.calls.CallsRepository
-import com.chooloo.www.chooloolib.repository.calls.CallsRepositoryImpl
-import com.chooloo.www.chooloolib.repository.contacts.ContactsRepository
-import com.chooloo.www.chooloolib.repository.contacts.ContactsRepositoryImpl
-import com.chooloo.www.chooloolib.repository.phones.PhonesRepository
-import com.chooloo.www.chooloolib.repository.phones.PhonesRepositoryImpl
-import com.chooloo.www.chooloolib.repository.rawcontacts.RawContactsRepository
-import com.chooloo.www.chooloolib.repository.rawcontacts.RawContactsRepositoryImpl
-import com.chooloo.www.chooloolib.repository.recents.RecentsRepository
-import com.chooloo.www.chooloolib.repository.recents.RecentsRepositoryImpl
 import com.chooloo.www.chooloolib.util.PreferencesManager
 import dagger.Binds
 import dagger.Module
@@ -84,8 +84,15 @@ class ApplicationModule {
     fun provideVibrator(@ApplicationContext context: Context): Vibrator =
         context.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
 
+    @Provides
+    fun provideContentResolver(@ApplicationContext context: Context): ContentResolver =
+        context.contentResolver
     //region manager
 
+    @Provides
+    fun provideUiManager(@ApplicationContext context: Context): UiModeManager =
+        context.getSystemService(Context.UI_MODE_SERVICE) as UiModeManager
+
     @Provides
     fun providePowerManager(@ApplicationContext context: Context): PowerManager =
         context.getSystemService(Context.POWER_SERVICE) as PowerManager
@@ -152,9 +159,6 @@ class ApplicationModule {
 
         //region factory
 
-        @Binds
-        fun bindLiveDataFactory(liveDataFactoryImpl: LiveDataFactoryImpl): LiveDataFactory
-
         @Binds
         fun bindFragmentFactory(fragmentFactoryImpl: FragmentFactoryImpl): FragmentFactory
 
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/module/DispatcherModule.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/module/DispatcherModule.kt
new file mode 100644
index 000000000..d0968b515
--- /dev/null
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/module/DispatcherModule.kt
@@ -0,0 +1,37 @@
+package com.chooloo.www.chooloolib.di.module
+
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import javax.inject.Qualifier
+
+@InstallIn(SingletonComponent::class)
+@Module
+class DispatcherModule {
+    @DefaultDispatcher
+    @Provides
+    fun provideDefaultDispatcher(): CoroutineDispatcher = Dispatchers.Default
+
+    @IoDispatcher
+    @Provides
+    fun provideIoDispatcher(): CoroutineDispatcher = Dispatchers.IO
+
+    @MainDispatcher
+    @Provides
+    fun provideMainDispatcher(): CoroutineDispatcher = Dispatchers.Main
+}
+
+@Retention(AnnotationRetention.BINARY)
+@Qualifier
+annotation class DefaultDispatcher
+
+@Retention(AnnotationRetention.BINARY)
+@Qualifier
+annotation class IoDispatcher
+
+@Retention(AnnotationRetention.BINARY)
+@Qualifier
+annotation class MainDispatcher
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/module/ScopeModule.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/module/ScopeModule.kt
new file mode 100644
index 000000000..60d2a6b18
--- /dev/null
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/di/module/ScopeModule.kt
@@ -0,0 +1,40 @@
+package com.chooloo.www.chooloolib.di.module
+
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import javax.inject.Qualifier
+
+@InstallIn(SingletonComponent::class)
+@Module
+class ScopeModule {
+    @DefaultDispatcher
+    @Provides
+    fun provideDefaultScope(@DefaultDispatcher defaultDispatcher: CoroutineDispatcher): CoroutineScope =
+        CoroutineScope(defaultDispatcher)
+
+    @IoScope
+    @Provides
+    fun provideIoScope(@IoDispatcher ioDispatcher: CoroutineDispatcher): CoroutineScope =
+        CoroutineScope(ioDispatcher)
+
+    @MainScope
+    @Provides
+    fun provideMainScope(@MainDispatcher mainDispatcher: CoroutineDispatcher): CoroutineScope =
+        CoroutineScope(mainDispatcher)
+}
+
+@Retention(AnnotationRetention.BINARY)
+@Qualifier
+annotation class DefaultScope
+
+@Retention(AnnotationRetention.BINARY)
+@Qualifier
+annotation class IoScope
+
+@Retention(AnnotationRetention.BINARY)
+@Qualifier
+annotation class MainScope
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/animation/AnimationsInteractorImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/animation/AnimationsInteractorImpl.kt
index 421f985ea..a32890896 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/animation/AnimationsInteractorImpl.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/animation/AnimationsInteractorImpl.kt
@@ -1,5 +1,6 @@
 package com.chooloo.www.chooloolib.interactor.animation
 
+import android.animation.ValueAnimator.REVERSE
 import android.os.Handler
 import android.os.Looper
 import android.view.View
@@ -30,8 +31,10 @@ class AnimationsInteractorImpl @Inject constructor(
 
     override fun focus(view: View) {
         if (_isEnabled) {
-            YoYo.with(Techniques.Tada)
-                .duration(200)
+            YoYo.with(Techniques.FadeIn)
+                .duration(800)
+                .repeatMode(REVERSE)
+                .repeat(Animation.INFINITE)
                 .playOn(view)
         }
     }
@@ -42,7 +45,7 @@ class AnimationsInteractorImpl @Inject constructor(
         }
         view.visibility = VISIBLE
         if (_isEnabled) {
-            YoYo.with(Techniques.FadeInDown)
+            YoYo.with(Techniques.SlideInDown)
                 .duration(100)
                 .playOn(view)
         }
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/audio/AudiosInteractor.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/audio/AudiosInteractor.kt
index 30a9de269..106603e39 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/audio/AudiosInteractor.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/audio/AudiosInteractor.kt
@@ -1,6 +1,7 @@
 package com.chooloo.www.chooloolib.interactor.audio
 
 import com.chooloo.www.chooloolib.interactor.base.BaseInteractor
+import kotlinx.coroutines.flow.StateFlow
 
 interface AudiosInteractor : BaseInteractor<AudiosInteractor.Listener> {
     interface Listener
@@ -17,7 +18,7 @@ interface AudiosInteractor : BaseInteractor<AudiosInteractor.Listener> {
 
     fun vibrate(millis: Long = 10)
 
-    
+
     enum class AudioMode(val mode: Int) {
         NORMAL(android.media.AudioManager.MODE_NORMAL),
         IN_CALL(android.media.AudioManager.MODE_IN_CALL),
@@ -26,7 +27,6 @@ interface AudiosInteractor : BaseInteractor<AudiosInteractor.Listener> {
         IN_COMMUNICATION(android.media.AudioManager.MODE_IN_COMMUNICATION)
     }
 
-
     companion object {
         const val SHORT_VIBRATE_LENGTH: Long = 20
     }
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/blocked/BlockedInteractor.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/blocked/BlockedInteractor.kt
index c4d9f1691..330faf995 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/blocked/BlockedInteractor.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/blocked/BlockedInteractor.kt
@@ -5,7 +5,7 @@ import com.chooloo.www.chooloolib.interactor.base.BaseInteractor
 interface BlockedInteractor : BaseInteractor<BlockedInteractor.Listener> {
     interface Listener
 
-    fun blockNumber(number: String)
-    fun unblockNumber(number: String)
-    fun isNumberBlocked(number: String): Boolean
+    suspend fun blockNumber(number: String)
+    suspend fun unblockNumber(number: String)
+    suspend fun isNumberBlocked(number: String): Boolean
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/blocked/BlockedInteractorImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/blocked/BlockedInteractorImpl.kt
index 7bf22f0dc..dd100d64a 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/blocked/BlockedInteractorImpl.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/blocked/BlockedInteractorImpl.kt
@@ -4,36 +4,45 @@ import android.content.ContentValues
 import android.content.Context
 import android.provider.BlockedNumberContract
 import android.provider.BlockedNumberContract.BlockedNumbers
+import com.chooloo.www.chooloolib.di.module.IoDispatcher
 import com.chooloo.www.chooloolib.interactor.base.BaseInteractorImpl
 import com.chooloo.www.chooloolib.util.annotation.RequiresDefaultDialer
 import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class BlockedInteractorImpl @Inject constructor(
-    @ApplicationContext private val context: Context
+    @ApplicationContext private val context: Context,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher
 ) : BaseInteractorImpl<BlockedInteractor.Listener>(), BlockedInteractor {
 
     @RequiresDefaultDialer
-    override fun isNumberBlocked(number: String) =
+    override suspend fun isNumberBlocked(number: String) = withContext(ioDispatcher) {
         BlockedNumberContract.isBlocked(context, number)
+    }
 
     @RequiresDefaultDialer
-    override fun blockNumber(number: String) {
-        if (isNumberBlocked(number)) return
-        val contentValues = ContentValues()
-        contentValues.put(BlockedNumbers.COLUMN_ORIGINAL_NUMBER, number)
-        context.contentResolver.insert(BlockedNumbers.CONTENT_URI, contentValues)
+    override suspend fun blockNumber(number: String) {
+        withContext(ioDispatcher) {
+            if (isNumberBlocked(number)) return@withContext
+            val contentValues = ContentValues()
+            contentValues.put(BlockedNumbers.COLUMN_ORIGINAL_NUMBER, number)
+            context.contentResolver.insert(BlockedNumbers.CONTENT_URI, contentValues)
+        }
     }
 
     @RequiresDefaultDialer
-    override fun unblockNumber(number: String) {
-        if (!isNumberBlocked(number)) return
-        val contentValues = ContentValues()
-        contentValues.put(BlockedNumbers.COLUMN_ORIGINAL_NUMBER, number)
-        context.contentResolver.insert(BlockedNumbers.CONTENT_URI, contentValues)?.also {
-            context.contentResolver.delete(it, null, null)
+    override suspend fun unblockNumber(number: String) {
+        withContext(ioDispatcher) {
+            if (!isNumberBlocked(number)) return@withContext
+            val contentValues = ContentValues()
+            contentValues.put(BlockedNumbers.COLUMN_ORIGINAL_NUMBER, number)
+            context.contentResolver.insert(BlockedNumbers.CONTENT_URI, contentValues)?.also {
+                context.contentResolver.delete(it, null, null)
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/callaudio/CallAudiosInteractor.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/callaudio/CallAudiosInteractor.kt
index fe8ec8095..5243ad52a 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/callaudio/CallAudiosInteractor.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/callaudio/CallAudiosInteractor.kt
@@ -1,7 +1,11 @@
 package com.chooloo.www.chooloolib.interactor.callaudio
 
 import android.telecom.CallAudioState
-import android.telecom.CallAudioState.*
+import android.telecom.CallAudioState.ROUTE_BLUETOOTH
+import android.telecom.CallAudioState.ROUTE_EARPIECE
+import android.telecom.CallAudioState.ROUTE_SPEAKER
+import android.telecom.CallAudioState.ROUTE_WIRED_HEADSET
+import android.telecom.CallAudioState.ROUTE_WIRED_OR_EARPIECE
 import androidx.annotation.StringRes
 import com.chooloo.www.chooloolib.R
 import com.chooloo.www.chooloolib.interactor.base.BaseInteractor
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/callaudio/CallAudiosInteractorImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/callaudio/CallAudiosInteractorImpl.kt
index da6da81da..cf28e03db 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/callaudio/CallAudiosInteractorImpl.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/callaudio/CallAudiosInteractorImpl.kt
@@ -3,7 +3,7 @@ package com.chooloo.www.chooloolib.interactor.callaudio
 import android.telecom.CallAudioState
 import com.chooloo.www.chooloolib.interactor.callaudio.CallAudiosInteractor.AudioRoute
 import com.chooloo.www.chooloolib.interactor.callaudio.CallAudiosInteractor.AudioRoute.*
-import com.chooloo.www.chooloolib.service.CallService
+import com.chooloo.www.chooloolib.api.service.CallService
 import com.chooloo.www.chooloolib.util.baseobservable.BaseObservable
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/calls/CallsInteractor.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/calls/CallsInteractor.kt
index 52e68c53d..76d12d07d 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/calls/CallsInteractor.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/calls/CallsInteractor.kt
@@ -1,6 +1,6 @@
 package com.chooloo.www.chooloolib.interactor.calls
 
-import com.chooloo.www.chooloolib.model.Call
+import com.chooloo.www.chooloolib.data.model.Call
 import com.chooloo.www.chooloolib.interactor.base.BaseInteractor
 
 interface CallsInteractor : BaseInteractor<CallsInteractor.Listener>, Call.Listener {
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/calls/CallsInteractorImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/calls/CallsInteractorImpl.kt
index aea340d81..8be1da6a3 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/calls/CallsInteractorImpl.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/calls/CallsInteractorImpl.kt
@@ -1,8 +1,8 @@
 package com.chooloo.www.chooloolib.interactor.calls
 
-import com.chooloo.www.chooloolib.model.Call
-import com.chooloo.www.chooloolib.model.Call.State.*
-import com.chooloo.www.chooloolib.model.CallList
+import com.chooloo.www.chooloolib.data.model.Call
+import com.chooloo.www.chooloolib.data.model.Call.State.*
+import com.chooloo.www.chooloolib.data.model.CallList
 import com.chooloo.www.chooloolib.util.baseobservable.BaseObservable
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -12,7 +12,6 @@ class CallsInteractorImpl @Inject constructor() :
     BaseObservable<CallsInteractor.Listener>(),
     CallsInteractor {
 
-
     private val _callList: CallList = CallList()
 
     override val mainCall: Call?
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/contacts/ContactsInteractor.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/contacts/ContactsInteractor.kt
index 90d73caf3..7464828ef 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/contacts/ContactsInteractor.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/contacts/ContactsInteractor.kt
@@ -1,16 +1,17 @@
 package com.chooloo.www.chooloolib.interactor.contacts
 
+import com.chooloo.www.chooloolib.data.model.ContactAccount
 import com.chooloo.www.chooloolib.interactor.base.BaseInteractor
-import com.chooloo.www.chooloolib.model.ContactAccount
+import kotlinx.coroutines.flow.Flow
 
 interface ContactsInteractor : BaseInteractor<ContactsInteractor.Listener> {
     interface Listener
 
     fun deleteContact(contactId: Long)
-    fun queryContact(contactId: Long, callback: (ContactAccount?) -> Unit)
-    fun observeContact(contactId: Long, callback: (ContactAccount?) -> Unit)
+    fun getContact(contactId: Long): Flow<ContactAccount?>
+    fun getContacts(): Flow<List<ContactAccount>>
     fun toggleContactFavorite(contactId: Long, isFavorite: Boolean)
-    fun blockContact(contactId: Long, onSuccess: (() -> Unit)? = null)
-    fun unblockContact(contactId: Long, onSuccess: (() -> Unit)? = null)
-    fun getIsContactBlocked(contactId: Long, callback: (Boolean) -> Unit)
+    suspend fun blockContact(contactId: Long)
+    suspend fun unblockContact(contactId: Long)
+    suspend fun getIsContactBlocked(contactId: Long): Boolean
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/contacts/ContactsInteractorImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/contacts/ContactsInteractorImpl.kt
index a762b030f..55e230c90 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/contacts/ContactsInteractorImpl.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/contacts/ContactsInteractorImpl.kt
@@ -6,14 +6,12 @@ import android.content.Context
 import android.net.Uri
 import android.provider.ContactsContract.Contacts
 import androidx.annotation.RequiresPermission
-import com.chooloo.www.chooloolib.contentresolver.ContactsContentResolver
+import com.chooloo.www.chooloolib.data.repository.contacts.ContactsRepository
 import com.chooloo.www.chooloolib.interactor.base.BaseInteractorImpl
 import com.chooloo.www.chooloolib.interactor.blocked.BlockedInteractor
 import com.chooloo.www.chooloolib.interactor.phoneaccounts.PhonesInteractor
-import com.chooloo.www.chooloolib.model.ContactAccount
 import com.chooloo.www.chooloolib.util.annotation.RequiresDefaultDialer
 import dagger.hilt.android.qualifiers.ApplicationContext
-import io.reactivex.disposables.CompositeDisposable
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -21,26 +19,13 @@ import javax.inject.Singleton
 class ContactsInteractorImpl @Inject constructor(
     private val phones: PhonesInteractor,
     private val blocked: BlockedInteractor,
-    private val disposables: CompositeDisposable,
+    private val contactsRepository: ContactsRepository,
     @ApplicationContext private val context: Context,
 ) : BaseInteractorImpl<ContactsInteractor.Listener>(), ContactsInteractor {
 
-    override fun queryContact(contactId: Long, callback: (ContactAccount?) -> Unit) {
-        disposables.add(
-            ContactsContentResolver(context, contactId).queryItems { contacts ->
-                contacts.let { callback.invoke(contacts.getOrNull(0)) }
-            }
-        )
-    }
-
-    override fun observeContact(contactId: Long, callback: (ContactAccount?) -> Unit) {
-        disposables.add(
-            ContactsContentResolver(context, contactId).observeItems { contacts ->
-                contacts.let { callback.invoke(contacts.getOrNull(0)) }
-            }
-        )
-    }
+    override fun getContact(contactId: Long) = contactsRepository.getContact(contactId)
 
+    override fun getContacts() = contactsRepository.getContacts()
 
     @RequiresPermission(WRITE_CONTACTS)
     override fun deleteContact(contactId: Long) {
@@ -53,18 +38,14 @@ class ContactsInteractorImpl @Inject constructor(
     }
 
     @RequiresDefaultDialer
-    override fun blockContact(contactId: Long, onSuccess: (() -> Unit)?) {
-        phones.getContactAccounts(contactId) { accounts ->
-            accounts?.forEach { blocked.blockNumber(it.number) }
-            onSuccess?.invoke()
-        }
+    override suspend fun blockContact(contactId: Long) {
+        val contactAccounts = phones.getContactAccounts(contactId)
+        contactAccounts.forEach { blocked.blockNumber(it.number) }
     }
 
-    override fun unblockContact(contactId: Long, onSuccess: (() -> Unit)?) {
-        phones.getContactAccounts(contactId) { accounts ->
-            accounts?.forEach { blocked.unblockNumber(it.number) }
-            onSuccess?.invoke()
-        }
+    override suspend fun unblockContact(contactId: Long) {
+        val contactAccounts = phones.getContactAccounts(contactId)
+        contactAccounts.forEach { blocked.unblockNumber(it.number) }
     }
 
     @RequiresPermission(WRITE_CONTACTS)
@@ -75,9 +56,8 @@ class ContactsInteractorImpl @Inject constructor(
         context.contentResolver.update(Contacts.CONTENT_URI, contentValues, filter, null)
     }
 
-    override fun getIsContactBlocked(contactId: Long, callback: (Boolean) -> Unit) {
-        phones.getContactAccounts(contactId) { accounts ->
-            callback.invoke(accounts?.all { blocked.isNumberBlocked(it.number) } ?: false)
-        }
+    override suspend fun getIsContactBlocked(contactId: Long): Boolean {
+        val contactAccounts = phones.getContactAccounts(contactId)
+        return contactAccounts.all { blocked.isNumberBlocked(it.number) }
     }
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/dialog/DialogsInteractor.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/dialog/DialogsInteractor.kt
index 21fbe534b..e31116ac1 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/dialog/DialogsInteractor.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/dialog/DialogsInteractor.kt
@@ -7,16 +7,21 @@ import androidx.annotation.ArrayRes
 import androidx.annotation.ColorInt
 import androidx.annotation.RequiresPermission
 import androidx.annotation.StringRes
+import com.chooloo.www.chooloolib.data.model.SimAccount
 import com.chooloo.www.chooloolib.interactor.base.BaseInteractor
 import com.chooloo.www.chooloolib.interactor.callaudio.CallAudiosInteractor
+import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor.Companion.IncomingCallMode
 import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor.Companion.Page
 import com.chooloo.www.chooloolib.interactor.theme.ThemesInteractor.ThemeMode
-import com.chooloo.www.chooloolib.model.SimAccount
 
 interface DialogsInteractor : BaseInteractor<DialogsInteractor.Listener> {
     interface Listener
 
-    fun askForBoolean(@StringRes titleRes: Int, callback: (result: Boolean) -> Unit)
+    fun askForBoolean(
+        @StringRes titleRes: Int,
+        isActivated: Boolean,
+        callback: (result: Boolean) -> Boolean
+    )
 
     fun askForValidation(@StringRes titleRes: Int, callback: (result: Boolean) -> Unit)
 
@@ -25,7 +30,7 @@ interface DialogsInteractor : BaseInteractor<DialogsInteractor.Listener> {
         @StringRes titleRes: Int,
         @StringRes subtitleRes: Int? = null,
         selectedChoiceIndex: Int? = null,
-        choiceCallback: (String) -> Unit
+        choiceCallback: (String) -> Boolean
     )
 
     fun <T> askForChoice(
@@ -34,7 +39,7 @@ interface DialogsInteractor : BaseInteractor<DialogsInteractor.Listener> {
         @StringRes titleRes: Int,
         @StringRes subtitleRes: Int? = null,
         selectedChoice: T? = null,
-        choiceCallback: (T) -> Unit
+        choiceCallback: (T) -> Boolean
     )
 
     fun askForColor(
@@ -45,17 +50,18 @@ interface DialogsInteractor : BaseInteractor<DialogsInteractor.Listener> {
     )
 
     @RequiresPermission(READ_PHONE_STATE)
-    fun askForSim(callback: (SimAccount?) -> Unit)
-    fun askForDefaultPage(callback: (Page) -> Unit)
-    fun askForThemeMode(callback: (ThemeMode) -> Unit)
-    fun askForRoute(callback: (CallAudiosInteractor.AudioRoute) -> Unit)
+    fun askForSim(callback: (SimAccount?) -> Boolean)
+    fun askForDefaultPage(callback: (Page) -> Boolean)
+    fun askForThemeMode(callback: (ThemeMode) -> Boolean)
+    fun askForIncomingCallMode(callback: (IncomingCallMode) -> Boolean)
+    fun askForRoute(callback: (CallAudiosInteractor.AudioRoute) -> Boolean)
     fun askForPhoneAccountHandle(
         phonesAccountHandles: List<PhoneAccountHandle>,
-        callback: (PhoneAccountHandle) -> Unit
+        callback: (PhoneAccountHandle) -> Boolean
     )
 
     fun askForPhoneAccountSuggestion(
         phoneAccountSuggestions: List<PhoneAccountSuggestion>,
-        callback: (PhoneAccountSuggestion) -> Unit
+        callback: (PhoneAccountSuggestion) -> Boolean
     )
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/dialog/DialogsInteractorImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/dialog/DialogsInteractorImpl.kt
index 080c86636..7833e773e 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/dialog/DialogsInteractorImpl.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/dialog/DialogsInteractorImpl.kt
@@ -8,21 +8,24 @@ import android.telecom.TelecomManager
 import androidx.annotation.RequiresApi
 import androidx.annotation.StringRes
 import com.chooloo.www.chooloolib.R
+import com.chooloo.www.chooloolib.data.model.SimAccount
 import com.chooloo.www.chooloolib.di.factory.fragment.FragmentFactory
 import com.chooloo.www.chooloolib.interactor.callaudio.CallAudiosInteractor
 import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor
+import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor.Companion.IncomingCallMode
 import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor.Companion.Page
 import com.chooloo.www.chooloolib.interactor.prompt.PromptsInteractor
 import com.chooloo.www.chooloolib.interactor.sim.SimsInteractor
 import com.chooloo.www.chooloolib.interactor.string.StringsInteractor
 import com.chooloo.www.chooloolib.interactor.theme.ThemesInteractor.ThemeMode
-import com.chooloo.www.chooloolib.model.SimAccount
 import com.chooloo.www.chooloolib.ui.base.BaseActivity
 import com.chooloo.www.chooloolib.util.baseobservable.BaseObservable
 import com.chooloo.www.chooloolib.util.fullLabel
 import dagger.hilt.android.qualifiers.ActivityContext
 import dagger.hilt.android.scopes.ActivityScoped
-import dev.sasikanth.colorsheet.ColorSheet
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @ActivityScoped
@@ -37,13 +40,15 @@ class DialogsInteractorImpl @Inject constructor(
     private val preferences: PreferencesInteractor,
 ) : BaseObservable<DialogsInteractor.Listener>(), DialogsInteractor {
 
-    private val activity = context as BaseActivity<*>
-
-
-    override fun askForBoolean(titleRes: Int, callback: (result: Boolean) -> Unit) {
+    override fun askForBoolean(
+        @StringRes titleRes: Int,
+        isActivated: Boolean,
+        callback: (result: Boolean) -> Boolean
+    ) {
         prompts.showFragment(fragmentsFactory.getPromptFragment(
             strings.getString(R.string.prompt_yes_or_no),
-            strings.getString(titleRes)
+            strings.getString(titleRes),
+            isActivated
         ).apply {
             setOnItemClickListener(callback::invoke)
         })
@@ -52,9 +57,13 @@ class DialogsInteractorImpl @Inject constructor(
     override fun askForValidation(@StringRes titleRes: Int, callback: (result: Boolean) -> Unit) {
         prompts.showFragment(fragmentsFactory.getPromptFragment(
             strings.getString(R.string.prompt_are_you_sure),
-            strings.getString(titleRes)
+            strings.getString(titleRes),
+            true
         ).apply {
-            setOnItemClickListener(callback::invoke)
+            setOnItemClickListener {
+                callback.invoke(it)
+                true
+            }
         })
     }
 
@@ -64,16 +73,12 @@ class DialogsInteractorImpl @Inject constructor(
         @StringRes titleRes: Int,
         @StringRes subtitleRes: Int?,
         selectedChoiceIndex: Int?,
-        choiceCallback: (String) -> Unit
+        choiceCallback: (String) -> Boolean
     ) {
         prompts.showFragment(
             fragmentsFactory.getChoicesFragment(titleRes, subtitleRes, choices, selectedChoiceIndex)
-                .apply {
-                    setOnChoiceClickListener {
-                        choiceCallback.invoke(it)
-                        this@apply.finish()
-                    }
-                })
+                .apply { setOnChoiceClickListener(choiceCallback) }
+        )
     }
 
     override fun <T> askForChoice(
@@ -82,7 +87,7 @@ class DialogsInteractorImpl @Inject constructor(
         @StringRes titleRes: Int,
         @StringRes subtitleRes: Int?,
         selectedChoice: T?,
-        choiceCallback: (T) -> Unit
+        choiceCallback: (T) -> Boolean
     ) {
         val objectsToStringMap = choices.associateBy({ choiceToString.invoke(it) }, { it })
         askForChoice(
@@ -101,18 +106,18 @@ class DialogsInteractorImpl @Inject constructor(
         noColorOption: Boolean,
         selectedColor: Int?
     ) {
-        ColorSheet().colorPicker(
-            colors = activity.resources.getIntArray(R.array.accent_colors),
-            listener = callback::invoke,
-            noColorOption = true,
-            selectedColor = selectedColor
-        ).show(activity.supportFragmentManager)
+//        ColorSheet().colorPicker(
+//            colors = activity.resources.getIntArray(R.array.accent_colors),
+//            listener = callback::invoke,
+//            noColorOption = true,
+//            selectedColor = selectedColor
+//        ).show(activity.supportFragmentManager)
     }
 
-    override fun askForSim(callback: (SimAccount?) -> Unit) {
-        sims.getSimAccounts { simAccounts ->
+    override fun askForSim(callback: (SimAccount?) -> Boolean) {
+        CoroutineScope(Dispatchers.IO).launch {
             askForChoice(
-                choices = simAccounts,
+                choices = sims.getSimAccounts(),
                 choiceCallback = callback::invoke,
                 choiceToString = SimAccount::label,
                 titleRes = R.string.hint_sim_account,
@@ -121,7 +126,7 @@ class DialogsInteractorImpl @Inject constructor(
         }
     }
 
-    override fun askForDefaultPage(callback: (Page) -> Unit) {
+    override fun askForDefaultPage(callback: (Page) -> Boolean) {
         askForChoice(
             choices = Page.values().toList(),
             titleRes = R.string.hint_default_page,
@@ -132,7 +137,7 @@ class DialogsInteractorImpl @Inject constructor(
         )
     }
 
-    override fun askForThemeMode(callback: (ThemeMode) -> Unit) {
+    override fun askForThemeMode(callback: (ThemeMode) -> Boolean) {
         askForChoice(
             choices = ThemeMode.values().toList(),
             titleRes = R.string.hint_theme_mode,
@@ -143,7 +148,18 @@ class DialogsInteractorImpl @Inject constructor(
         )
     }
 
-    override fun askForRoute(callback: (CallAudiosInteractor.AudioRoute) -> Unit) {
+    override fun askForIncomingCallMode(callback: (IncomingCallMode) -> Boolean) {
+        askForChoice(
+            choices = IncomingCallMode.values().toList(),
+            titleRes = R.string.hint_incoming_call_mode,
+            choiceCallback = callback::invoke,
+            subtitleRes = R.string.explain_choose_incoming_call_mode,
+            selectedChoice = preferences.incomingCallMode,
+            choiceToString = { strings.getString(it.titleRes) }
+        )
+    }
+
+    override fun askForRoute(callback: (CallAudiosInteractor.AudioRoute) -> Boolean) {
         askForChoice(
             choiceCallback = callback::invoke,
             titleRes = R.string.action_choose_audio_route,
@@ -156,7 +172,7 @@ class DialogsInteractorImpl @Inject constructor(
 
     override fun askForPhoneAccountHandle(
         phonesAccountHandles: List<PhoneAccountHandle>,
-        callback: (PhoneAccountHandle) -> Unit
+        callback: (PhoneAccountHandle) -> Boolean
     ) {
         askForChoice(
             choiceCallback = callback::invoke,
@@ -170,7 +186,7 @@ class DialogsInteractorImpl @Inject constructor(
     @RequiresApi(Q)
     override fun askForPhoneAccountSuggestion(
         phoneAccountSuggestions: List<PhoneAccountSuggestion>,
-        callback: (PhoneAccountSuggestion) -> Unit
+        callback: (PhoneAccountSuggestion) -> Boolean
     ) {
         askForChoice(
             choiceCallback = callback::invoke,
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/permission/PermissionsInteractor.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/permission/PermissionsInteractor.kt
index a26b7f729..c22daab2e 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/permission/PermissionsInteractor.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/permission/PermissionsInteractor.kt
@@ -22,12 +22,21 @@ interface PermissionsInteractor : BaseInteractor<PermissionsInteractor.Listener>
         callback: (List<PermissionResult>) -> Unit
     )
 
+    suspend fun checkPermission(permission: String): Boolean
+    suspend fun checkPermissions(vararg permissions: String): Boolean
+
     fun runWithPermissions(
         permissions: Array<String>,
         grantedCallback: () -> Unit,
         deniedCallback: (() -> Unit)? = null
     )
 
+    fun runWithPermissions(
+        vararg permissions: String,
+        callback: (Boolean) -> Unit
+    )
+
+
     fun runWithDefaultDialer(
         @StringRes errorMessageRes: Int? = null,
         callback: () -> Unit,
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/permission/PermissionsInteractorImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/permission/PermissionsInteractorImpl.kt
index 2f6c8ab23..d95c8dd3c 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/permission/PermissionsInteractorImpl.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/permission/PermissionsInteractorImpl.kt
@@ -8,6 +8,7 @@ import android.content.pm.PackageManager
 import android.telecom.TelecomManager
 import android.widget.Toast
 import androidx.core.app.ActivityCompat
+import com.chooloo.www.chooloolib.di.module.IoDispatcher
 import com.chooloo.www.chooloolib.ui.permissions.DefaultDialerRequestActivity
 import com.chooloo.www.chooloolib.ui.permissions.PermissionRequestActivity
 import com.chooloo.www.chooloolib.ui.permissions.PermissionRequestActivity.Companion.PERMISSIONS_ARGUMENT_KEY
@@ -16,14 +17,19 @@ import com.chooloo.www.chooloolib.ui.permissions.PermissionRequestActivity.Compa
 import com.chooloo.www.chooloolib.ui.permissions.PermissionRequestActivity.Companion.REQUEST_CODE_ARGUMENT_KEY
 import com.chooloo.www.chooloolib.util.baseobservable.BaseObservable
 import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.withContext
 import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject
 import javax.inject.Singleton
+import kotlin.coroutines.resume
 
 @Singleton
 class PermissionsInteractorImpl @Inject constructor(
     private val telecomManager: TelecomManager,
-    @ApplicationContext private val context: Context
+    @ApplicationContext private val context: Context,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher
 ) :
     BaseObservable<PermissionsInteractor.Listener>(),
     PermissionsInteractor {
@@ -84,6 +90,23 @@ class PermissionsInteractorImpl @Inject constructor(
         _onPermissionsResultListeners[_requestCode] = callback
     }
 
+    override suspend fun checkPermissions(vararg permissions: String): Boolean =
+        withContext(ioDispatcher) {
+            suspendCancellableCoroutine { continuation ->
+                checkPermissions(*permissions) { results ->
+                    continuation.resume(results.all { it.state == GRANTED })
+                }
+            }
+        }
+
+    override suspend fun checkPermission(permission: String): Boolean = withContext(ioDispatcher) {
+        suspendCancellableCoroutine { continuation ->
+            checkPermissions(permission) { results ->
+                continuation.resume(results.all { it.state == GRANTED })
+            }
+        }
+    }
+
     override fun runWithPermissions(
         permissions: Array<String>,
         grantedCallback: () -> Unit,
@@ -102,6 +125,14 @@ class PermissionsInteractorImpl @Inject constructor(
         }
     }
 
+    override fun runWithPermissions(vararg permissions: String, callback: (Boolean) -> Unit) {
+        runWithPermissions(
+            permissions as Array<String>,
+            { callback.invoke(true) },
+            { callback.invoke(false) }
+        )
+    }
+
     override fun runWithDefaultDialer(errorMessageRes: Int?, callback: () -> Unit) {
         checkDefaultDialer {
             if (it) {
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/phoneaccounts/PhonesInteractor.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/phoneaccounts/PhonesInteractor.kt
index 233a2b8a0..afbc394b7 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/phoneaccounts/PhonesInteractor.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/phoneaccounts/PhonesInteractor.kt
@@ -1,12 +1,12 @@
 package com.chooloo.www.chooloolib.interactor.phoneaccounts
 
-import com.chooloo.www.chooloolib.model.PhoneAccount
-import com.chooloo.www.chooloolib.model.PhoneLookupAccount
+import com.chooloo.www.chooloolib.data.model.PhoneAccount
+import com.chooloo.www.chooloolib.data.model.PhoneLookupAccount
 import com.chooloo.www.chooloolib.interactor.base.BaseInteractor
 
 interface PhonesInteractor : BaseInteractor<PhonesInteractor.Listener> {
     interface Listener
 
-    fun lookupAccount(number: String?, callback: (PhoneLookupAccount?) -> Unit)
-    fun getContactAccounts(contactId: Long, callback: (Array<PhoneAccount>?) -> Unit)
+    suspend fun getContactAccounts(contactId: Long): List<PhoneAccount>
+    suspend fun lookupAccount(number: String?): PhoneLookupAccount?
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/phoneaccounts/PhonesInteractorImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/phoneaccounts/PhonesInteractorImpl.kt
index b4bbb00d2..3fde98603 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/phoneaccounts/PhonesInteractorImpl.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/phoneaccounts/PhonesInteractorImpl.kt
@@ -1,38 +1,27 @@
 package com.chooloo.www.chooloolib.interactor.phoneaccounts
 
-import android.content.Context
-import com.chooloo.www.chooloolib.contentresolver.PhoneLookupContentResolver
-import com.chooloo.www.chooloolib.contentresolver.PhonesContentResolver
-import com.chooloo.www.chooloolib.model.PhoneAccount
-import com.chooloo.www.chooloolib.model.PhoneLookupAccount
+import com.chooloo.www.chooloolib.data.model.PhoneAccount
+import com.chooloo.www.chooloolib.data.model.PhoneLookupAccount
+import com.chooloo.www.chooloolib.di.factory.contentresolver.ContentResolverFactory
 import com.chooloo.www.chooloolib.interactor.base.BaseInteractorImpl
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.reactivex.exceptions.OnErrorNotImplementedException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class PhonesInteractorImpl @Inject constructor(
-    @ApplicationContext private val context: Context
+    private val contentResolverFactory: ContentResolverFactory,
 ) : BaseInteractorImpl<PhonesInteractor.Listener>(), PhonesInteractor {
 
-    override fun lookupAccount(number: String?, callback: (PhoneLookupAccount?) -> Unit) {
+    override suspend fun lookupAccount(number: String?): PhoneLookupAccount? =
         if (number == null || number.isEmpty()) {
-            callback.invoke(PhoneLookupAccount.PRIVATE)
-            return
-        }
-        try {
-            PhoneLookupContentResolver(context, number).queryItems { phones ->
-                callback.invoke(phones.getOrNull(0))
-            }
+            PhoneLookupAccount.PRIVATE
+        } else try {
+            contentResolverFactory.getPhoneLookupContentResolver(number).queryItems().getOrNull(0)
         } catch (e: OnErrorNotImplementedException) {
-            callback.invoke(null)
+            null
         }
-    }
 
-    override fun getContactAccounts(contactId: Long, callback: (Array<PhoneAccount>?) -> Unit) {
-        PhonesContentResolver(context, contactId).queryItems {
-            callback.invoke(it.toTypedArray())
-        }
-    }
+    override suspend fun getContactAccounts(contactId: Long): List<PhoneAccount> =
+        contentResolverFactory.getPhonesContentResolver(contactId).queryItems().toList()
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/preferences/PreferencesInteractor.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/preferences/PreferencesInteractor.kt
index 7ae01c2ce..44b52ab54 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/preferences/PreferencesInteractor.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/preferences/PreferencesInteractor.kt
@@ -14,32 +14,29 @@ interface PreferencesInteractor : BaseInteractor<PreferencesInteractor.Listener>
 
     var defaultPage: Page
     var themeMode: ThemeMode
-    var accentTheme: AccentTheme
+    var incomingCallMode: IncomingCallMode
 
     fun setDefaultValues()
 
     companion object {
-        enum class AccentTheme(val key: String, val theme: Int) {
-            RED("red", R.style.Accent_Red),
-            BLUE("blue", R.style.Accent_Blue),
-            GREEN("green", R.style.Accent_Green),
-            PURPLE("purple", R.style.Accent_Purple),
-            DEFAULT(BLUE.key, BLUE.theme);
+        enum class Page(val key: String, val index: Int, val titleRes: Int) {
+            CONTACTS("contacts", 0, R.string.contacts),
+            RECENTS("recents", 1, R.string.recents);
 
             companion object {
                 fun fromKey(key: String?) =
-                    values().associateBy(AccentTheme::key).getOrDefault(key ?: "", DEFAULT)
+                    values().associateBy(Page::key).getOrDefault(key ?: "", CONTACTS)
             }
         }
 
-        enum class Page(val key: String, val index: Int, val titleRes: Int) {
-            CONTACTS("contacts", 0, R.string.contacts),
-            RECENTS("recents", 1, R.string.recents),
-            DEFAULT(CONTACTS.key, CONTACTS.index, R.string.default_page);
+        enum class IncomingCallMode(val key: String, val index: Int, val titleRes: Int) {
+            POP_UP("popup_notification", 0, R.string.pop_up_notification),
+            FULL_SCREEN("full_screen", 1, R.string.full_screen);
 
             companion object {
                 fun fromKey(key: String?) =
-                    values().associateBy(Page::key).getOrDefault(key ?: "", DEFAULT)
+                    IncomingCallMode.values().associateBy(IncomingCallMode::key)
+                        .getOrDefault(key ?: "", FULL_SCREEN)
             }
         }
     }
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/preferences/PreferencesInteractorImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/preferences/PreferencesInteractorImpl.kt
index 338c5a97d..1a0cf366a 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/preferences/PreferencesInteractorImpl.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/preferences/PreferencesInteractorImpl.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import androidx.preference.PreferenceManager
 import com.chooloo.www.chooloolib.R
 import com.chooloo.www.chooloolib.interactor.base.BaseInteractorImpl
-import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor.Companion.AccentTheme
+import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor.Companion.IncomingCallMode
 import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor.Companion.Page
 import com.chooloo.www.chooloolib.interactor.theme.ThemesInteractor.ThemeMode
 import com.chooloo.www.chooloolib.util.PreferencesManager
@@ -14,63 +14,63 @@ import javax.inject.Singleton
 
 @Singleton
 class PreferencesInteractorImpl @Inject constructor(
-    @ApplicationContext private val context: Context,
-    private val preferencesManager: PreferencesManager
+    private val prefs: PreferencesManager,
+    @ApplicationContext private val context: Context
 ) : BaseInteractorImpl<PreferencesInteractor.Listener>(),
     PreferencesInteractor {
 
     override var isAnimations: Boolean
-        get() = preferencesManager.getBoolean(
+        get() = prefs.getBoolean(
             R.string.pref_key_animations,
             R.bool.pref_default_value_animations
         )
         set(value) {
-            preferencesManager.putBoolean(R.string.pref_key_animations, value)
+            prefs.putBoolean(R.string.pref_key_animations, value)
         }
 
     override var isGroupRecents: Boolean
-        get() = preferencesManager.getBoolean(
+        get() = prefs.getBoolean(
             R.string.pref_key_group_recents,
             R.bool.pref_default_value_group_recents
         )
         set(value) {
-            preferencesManager.putBoolean(R.string.pref_key_group_recents, value)
+            prefs.putBoolean(R.string.pref_key_group_recents, value)
         }
 
     override var isDialpadTones: Boolean
-        get() = preferencesManager.getBoolean(
+        get() = prefs.getBoolean(
             R.string.pref_key_dialpad_tones,
             R.bool.pref_default_value_dialpad_tones
         )
         set(value) {
-            preferencesManager.putBoolean(R.string.pref_key_dialpad_tones, value)
+            prefs.putBoolean(R.string.pref_key_dialpad_tones, value)
         }
 
     override var isDialpadVibrate: Boolean
-        get() = preferencesManager.getBoolean(
+        get() = prefs.getBoolean(
             R.string.pref_key_dialpad_vibrate,
             R.bool.pref_default_value_dialpad_vibrate
         )
         set(value) {
-            preferencesManager.putBoolean(R.string.pref_key_dialpad_vibrate, value)
+            prefs.putBoolean(R.string.pref_key_dialpad_vibrate, value)
         }
 
     override var defaultPage: Page
-        get() = Page.fromKey(preferencesManager.getString(R.string.pref_key_default_page))
+        get() = Page.fromKey(prefs.getString(R.string.pref_key_default_page))
         set(value) {
-            preferencesManager.putString(R.string.pref_key_default_page, value.key)
+            prefs.putString(R.string.pref_key_default_page, value.key)
         }
 
     override var themeMode: ThemeMode
-        get() = ThemeMode.fromKey(preferencesManager.getString(R.string.pref_key_theme_mode))
+        get() = ThemeMode.fromKey(prefs.getString(R.string.pref_key_theme_mode))
         set(value) {
-            preferencesManager.putString(R.string.pref_key_theme_mode, value.key)
+            prefs.putString(R.string.pref_key_theme_mode, value.key)
         }
 
-    override var accentTheme: AccentTheme
-        get() = AccentTheme.fromKey(preferencesManager.getString(R.string.pref_key_color))
+    override var incomingCallMode: IncomingCallMode
+        get() = IncomingCallMode.fromKey(prefs.getString(R.string.pref_key_incoming_call_mode))
         set(value) {
-            preferencesManager.putString(R.string.pref_key_color, value.key)
+            prefs.putString(R.string.pref_key_incoming_call_mode, value.key)
         }
 
     override fun setDefaultValues() {
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/rawcontacts/RawContactsInteractor.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/rawcontacts/RawContactsInteractor.kt
index 05dd16c44..aa0bbdb9d 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/rawcontacts/RawContactsInteractor.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/rawcontacts/RawContactsInteractor.kt
@@ -1,10 +1,11 @@
 package com.chooloo.www.chooloolib.interactor.rawcontacts
 
+import com.chooloo.www.chooloolib.data.model.RawContactAccount
 import com.chooloo.www.chooloolib.interactor.base.BaseInteractor
-import com.chooloo.www.chooloolib.model.RawContactAccount
+import kotlinx.coroutines.flow.Flow
 
 interface RawContactsInteractor : BaseInteractor<RawContactsInteractor.Listener> {
     interface Listener
 
-    fun queryRawContacts(contactId: Long, callback: (List<RawContactAccount>) -> Unit)
+    fun getRawContacts(contactId: Long): Flow<List<RawContactAccount>>
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/rawcontacts/RawContactsInteractorImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/rawcontacts/RawContactsInteractorImpl.kt
index 7397c9895..6e259dc92 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/rawcontacts/RawContactsInteractorImpl.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/rawcontacts/RawContactsInteractorImpl.kt
@@ -1,21 +1,16 @@
 package com.chooloo.www.chooloolib.interactor.rawcontacts
 
-import android.content.Context
-import com.chooloo.www.chooloolib.contentresolver.RawContactsContentResolver
+import com.chooloo.www.chooloolib.data.repository.rawcontacts.RawContactsRepository
 import com.chooloo.www.chooloolib.interactor.base.BaseInteractorImpl
-import com.chooloo.www.chooloolib.model.RawContactAccount
-import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class RawContactsInteractorImpl @Inject constructor(
-    @ApplicationContext private val context: Context
+    private val rawContactsRepository: RawContactsRepository
 ) :
     BaseInteractorImpl<RawContactsInteractor.Listener>(),
     RawContactsInteractor {
 
-    override fun queryRawContacts(contactId: Long, callback: (List<RawContactAccount>) -> Unit) {
-        RawContactsContentResolver(context, contactId).queryItems(callback)
-    }
+    override fun getRawContacts(contactId: Long) = rawContactsRepository.getRawContacts(contactId)
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/recents/RecentsInteractor.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/recents/RecentsInteractor.kt
index 53844e37c..e9cc79885 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/recents/RecentsInteractor.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/recents/RecentsInteractor.kt
@@ -1,15 +1,15 @@
 package com.chooloo.www.chooloolib.interactor.recents
 
+import com.chooloo.www.chooloolib.data.model.RecentAccount
 import com.chooloo.www.chooloolib.interactor.base.BaseInteractor
-import com.chooloo.www.chooloolib.model.RecentAccount
+import kotlinx.coroutines.flow.Flow
 
 interface RecentsInteractor : BaseInteractor<RecentsInteractor.Listener> {
     interface Listener
 
     fun deleteRecent(recentId: Long)
-    fun queryRecent(recentId: Long): RecentAccount?
-    fun queryRecent(recentId: Long, callback: (RecentAccount?) -> Unit)
-    fun observeRecent(recentId: Long, callback: (RecentAccount?) -> Unit)
+    fun getRecents(): Flow<List<RecentAccount>>
+    fun getRecent(recentId: Long): Flow<RecentAccount?>
     fun getCallTypeImage(@RecentAccount.CallType callType: Int): Int
     fun getLastOutgoingCall(): String
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/recents/RecentsInteractorImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/recents/RecentsInteractorImpl.kt
index 4ae359439..8b7278026 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/recents/RecentsInteractorImpl.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/recents/RecentsInteractorImpl.kt
@@ -5,16 +5,17 @@ import android.content.Context
 import android.provider.CallLog
 import androidx.annotation.RequiresPermission
 import com.chooloo.www.chooloolib.R
-import com.chooloo.www.chooloolib.contentresolver.RecentsContentResolver
+import com.chooloo.www.chooloolib.data.model.RecentAccount
+import com.chooloo.www.chooloolib.data.repository.recents.RecentsRepository
 import com.chooloo.www.chooloolib.interactor.base.BaseInteractorImpl
-import com.chooloo.www.chooloolib.model.RecentAccount
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class RecentsInteractorImpl @Inject constructor(
-    @ApplicationContext private val context: Context
+    @ApplicationContext private val context: Context,
+    private val recentsRepository: RecentsRepository
 ) : BaseInteractorImpl<RecentsInteractor.Listener>(), RecentsInteractor {
 
     @RequiresPermission(WRITE_CALL_LOG)
@@ -26,20 +27,9 @@ class RecentsInteractorImpl @Inject constructor(
         )
     }
 
-    override fun queryRecent(recentId: Long) =
-        RecentsContentResolver(context, recentId).queryItems().getOrNull(0)
+    override fun getRecent(recentId: Long) = recentsRepository.getRecent(recentId)
 
-    override fun queryRecent(recentId: Long, callback: (RecentAccount?) -> Unit) {
-        RecentsContentResolver(context, recentId).queryItems {
-            callback.invoke(it.getOrNull(0))
-        }
-    }
-
-    override fun observeRecent(recentId: Long, callback: (RecentAccount?) -> Unit) {
-        RecentsContentResolver(context, recentId).observeItems {
-            callback.invoke(it.getOrNull(0))
-        }
-    }
+    override fun getRecents() = recentsRepository.getRecents()
 
     override fun getCallTypeImage(@RecentAccount.CallType callType: Int) = when (callType) {
         RecentAccount.TYPE_INCOMING -> R.drawable.call_received
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/screen/ScreensInteractorImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/screen/ScreensInteractorImpl.kt
index eb3d3b410..4a050a718 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/screen/ScreensInteractorImpl.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/screen/ScreensInteractorImpl.kt
@@ -35,8 +35,8 @@ class ScreensInteractorImpl @Inject constructor(
     override fun showWhenLocked() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
             activity.apply {
-                setShowWhenLocked(true)
                 setTurnScreenOn(true)
+                setShowWhenLocked(true)
                 keyguardManager.requestDismissKeyguard(this, null)
             }
         } else {
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/sim/SimsInteractor.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/sim/SimsInteractor.kt
index d74e4b0d0..80d2a26bb 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/sim/SimsInteractor.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/sim/SimsInteractor.kt
@@ -2,14 +2,14 @@ package com.chooloo.www.chooloolib.interactor.sim
 
 import android.telecom.PhoneAccount
 import android.telephony.SubscriptionInfo
-import com.chooloo.www.chooloolib.model.SimAccount
+import com.chooloo.www.chooloolib.data.model.SimAccount
 import com.chooloo.www.chooloolib.interactor.base.BaseInteractor
 
 interface SimsInteractor : BaseInteractor<SimsInteractor.Listener> {
     interface Listener
 
-    fun getIsMultiSim(callback: (Boolean) -> Unit)
-    fun getSimAccounts(callback: (List<SimAccount>) -> Unit)
-    fun getPhoneAccounts(callback: (List<PhoneAccount>) -> Unit)
-    fun getSubscriptionInfos(callback: (List<SubscriptionInfo>) -> Unit)
+    suspend fun getIsMultiSim(): Boolean
+    suspend fun getSimAccounts(): List<SimAccount>
+    suspend fun getPhoneAccounts(): List<PhoneAccount>
+    suspend fun getSubscriptionInfos(): List<SubscriptionInfo>
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/sim/SimsInteractorImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/sim/SimsInteractorImpl.kt
index 2c4a29ad2..9c386e9b1 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/sim/SimsInteractorImpl.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/sim/SimsInteractorImpl.kt
@@ -6,7 +6,7 @@ import android.telecom.TelecomManager
 import android.telephony.SubscriptionInfo
 import android.telephony.SubscriptionManager
 import androidx.annotation.RequiresPermission
-import com.chooloo.www.chooloolib.model.SimAccount
+import com.chooloo.www.chooloolib.data.model.SimAccount
 import com.chooloo.www.chooloolib.util.baseobservable.BaseObservable
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -18,30 +18,18 @@ class SimsInteractorImpl @Inject constructor(
 ) : BaseObservable<SimsInteractor.Listener>(), SimsInteractor {
 
     @RequiresPermission(READ_PHONE_STATE)
-    override fun getIsMultiSim(callback: (isMultiSim: Boolean) -> Unit) {
-        callback.invoke(telecomManager.callCapablePhoneAccounts.size > 1)
-    }
+    override suspend fun getIsMultiSim(): Boolean =
+        telecomManager.callCapablePhoneAccounts.size > 1
 
     @RequiresPermission(READ_PHONE_STATE)
-    override fun getSimAccounts(callback: (List<SimAccount>) -> Unit) {
-        getPhoneAccounts {
-            callback.invoke(it.mapIndexed { index, phoneAccount ->
-                SimAccount(index, phoneAccount)
-            })
-        }
-    }
+    override suspend fun getSimAccounts(): List<SimAccount> =
+        getPhoneAccounts().mapIndexed(::SimAccount)
 
     @RequiresPermission(READ_PHONE_STATE)
-    override fun getPhoneAccounts(callback: (List<PhoneAccount>) -> Unit) {
-        val phoneAccounts = ArrayList<PhoneAccount>()
-        telecomManager.callCapablePhoneAccounts.forEach { pah ->
-            phoneAccounts.add(telecomManager.getPhoneAccount(pah))
-        }
-        callback.invoke(phoneAccounts)
-    }
+    override suspend fun getPhoneAccounts(): List<PhoneAccount> =
+        telecomManager.callCapablePhoneAccounts.map(telecomManager::getPhoneAccount)
 
     @RequiresPermission(READ_PHONE_STATE)
-    override fun getSubscriptionInfos(callback: (List<SubscriptionInfo>) -> Unit) {
-        callback.invoke(subscriptionManager.activeSubscriptionInfoList)
-    }
+    override suspend fun getSubscriptionInfos(): List<SubscriptionInfo> =
+        subscriptionManager.activeSubscriptionInfoList
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/telecom/TelecomInteractor.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/telecom/TelecomInteractor.kt
index 60724801c..31a8b7148 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/telecom/TelecomInteractor.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/telecom/TelecomInteractor.kt
@@ -1,7 +1,7 @@
 package com.chooloo.www.chooloolib.interactor.telecom
 
 import com.chooloo.www.chooloolib.interactor.base.BaseInteractor
-import com.chooloo.www.chooloolib.model.SimAccount
+import com.chooloo.www.chooloolib.data.model.SimAccount
 
 interface TelecomInteractor : BaseInteractor<TelecomInteractor.Listener> {
     interface Listener {}
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/telecom/TelecomInteractorImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/telecom/TelecomInteractorImpl.kt
index 8f2d90673..e7bafaecc 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/telecom/TelecomInteractorImpl.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/telecom/TelecomInteractorImpl.kt
@@ -11,7 +11,7 @@ import android.telecom.PhoneAccount
 import android.telecom.TelecomManager
 import android.telephony.TelephonyManager
 import androidx.annotation.RequiresPermission
-import com.chooloo.www.chooloolib.model.SimAccount
+import com.chooloo.www.chooloolib.data.model.SimAccount
 import com.chooloo.www.chooloolib.util.CallUtils
 import com.chooloo.www.chooloolib.util.PhoneNumberUtils
 import com.chooloo.www.chooloolib.util.baseobservable.BaseObservable
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/theme/ThemesInteractorImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/theme/ThemesInteractorImpl.kt
index 400aae501..0d8083cca 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/theme/ThemesInteractorImpl.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/interactor/theme/ThemesInteractorImpl.kt
@@ -1,7 +1,9 @@
 package com.chooloo.www.chooloolib.interactor.theme
 
 import android.app.Application
+import android.app.UiModeManager
 import android.content.Context
+import android.os.Build
 import androidx.appcompat.app.AppCompatDelegate
 import com.chooloo.www.chooloolib.interactor.theme.ThemesInteractor.ThemeMode
 import com.chooloo.www.chooloolib.util.baseobservable.BaseObservable
@@ -12,14 +14,19 @@ import javax.inject.Singleton
 
 @Singleton
 class ThemesInteractorImpl @Inject constructor(
-    @ApplicationContext private val context: Context
+    private val uiManager: UiModeManager,
+    @ApplicationContext private val context: Context,
 ) : BaseObservable<ThemesInteractor.Listener>(), ThemesInteractor {
 
     override fun applyThemeMode(themeMode: ThemeMode) {
         if (themeMode == ThemeMode.DYNAMIC) {
             DynamicColors.applyToActivitiesIfAvailable(context as Application)
         } else {
-            AppCompatDelegate.setDefaultNightMode(themeMode.mode)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                uiManager.setApplicationNightMode(themeMode.mode)
+            } else {
+                AppCompatDelegate.setDefaultNightMode(themeMode.mode)
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/livedata/ContactsLiveData.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/livedata/ContactsLiveData.kt
deleted file mode 100644
index b94c1c4e2..000000000
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/livedata/ContactsLiveData.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.chooloo.www.chooloolib.livedata
-
-import android.content.Context
-import com.chooloo.www.chooloolib.contentresolver.ContactsContentResolver
-import com.chooloo.www.chooloolib.di.factory.contentresolver.ContentResolverFactory
-import com.chooloo.www.chooloolib.model.ContactAccount
-import dagger.hilt.android.qualifiers.ApplicationContext
-import javax.inject.Singleton
-
-@Singleton
-class ContactsLiveData(
-    @ApplicationContext context: Context,
-    private val contactId: Long? = null,
-    private val contentResolverFactory: ContentResolverFactory
-) : ContentProviderLiveData<ContactsContentResolver, ContactAccount>(context) {
-    override val contentResolver by lazy { contentResolverFactory.getContactsContentResolver(contactId) }
-}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/livedata/ContentProviderLiveData.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/livedata/ContentProviderLiveData.kt
deleted file mode 100644
index 69fdb0925..000000000
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/livedata/ContentProviderLiveData.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.chooloo.www.chooloolib.livedata
-
-import android.content.Context
-import android.database.ContentObserver
-import androidx.lifecycle.LiveData
-import com.chooloo.www.chooloolib.contentresolver.BaseContentResolver
-import dagger.hilt.android.qualifiers.ApplicationContext
-
-abstract class ContentProviderLiveData<ContentResolver : BaseContentResolver<T>, T : Any>(
-    @ApplicationContext private val context: Context
-) :
-    LiveData<List<T>>() {
-
-    private var observer = object : ContentObserver(null) {
-        override fun onChange(selfChange: Boolean) {
-            super.onChange(selfChange)
-            postValue(contentResolver.queryItems())
-        }
-    }
-
-    var filter: String?
-        get() = contentResolver.filter
-        @Synchronized
-        set(value) {
-            contentResolver.filter = value
-            onActive()
-        }
-
-
-    override fun onActive() {
-        detachObserver()
-        attachObserver()
-        value = contentResolver.queryItems()
-    }
-
-    override fun onInactive() {
-        detachObserver()
-    }
-
-    private fun attachObserver() {
-        context.contentResolver.registerContentObserver(contentResolver.finalUri, true, observer)
-    }
-
-    private fun detachObserver() {
-        context.contentResolver.unregisterContentObserver(observer)
-    }
-
-
-    abstract val contentResolver: ContentResolver
-}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/livedata/PhonesLiveData.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/livedata/PhonesLiveData.kt
deleted file mode 100644
index 381f1acb3..000000000
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/livedata/PhonesLiveData.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.chooloo.www.chooloolib.livedata
-
-import android.content.Context
-import com.chooloo.www.chooloolib.contentresolver.PhonesContentResolver
-import com.chooloo.www.chooloolib.di.factory.contentresolver.ContentResolverFactory
-import com.chooloo.www.chooloolib.model.PhoneAccount
-
-class PhonesLiveData(
-    context: Context,
-    private val contactId: Long? = null,
-    private val contentResolverFactory: ContentResolverFactory,
-) : ContentProviderLiveData<PhonesContentResolver, PhoneAccount>(context) {
-    override val contentResolver by lazy { contentResolverFactory.getPhonesContentResolver(contactId) }
-}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/livedata/RawContactsLiveData.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/livedata/RawContactsLiveData.kt
deleted file mode 100644
index 0c16ebf84..000000000
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/livedata/RawContactsLiveData.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.chooloo.www.chooloolib.livedata
-
-import android.content.Context
-import com.chooloo.www.chooloolib.contentresolver.RawContactsContentResolver
-import com.chooloo.www.chooloolib.di.factory.contentresolver.ContentResolverFactory
-import com.chooloo.www.chooloolib.model.RawContactAccount
-
-class RawContactsLiveData(
-    context: Context,
-    private val contactId: Long,
-    private val contentResolverFactory: ContentResolverFactory,
-) : ContentProviderLiveData<RawContactsContentResolver, RawContactAccount>(context) {
-    override val contentResolver by lazy {
-        contentResolverFactory.getRawContactsContentResolver(contactId)
-    }
-}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/livedata/RecentsLiveData.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/livedata/RecentsLiveData.kt
deleted file mode 100644
index 6df53b4de..000000000
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/livedata/RecentsLiveData.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.chooloo.www.chooloolib.livedata
-
-import android.content.Context
-import com.chooloo.www.chooloolib.contentresolver.RecentsContentResolver
-import com.chooloo.www.chooloolib.di.factory.contentresolver.ContentResolverFactory
-import com.chooloo.www.chooloolib.model.RecentAccount
-
-class RecentsLiveData(
-    context: Context,
-    private val recentId: Long? = null,
-    private val contentResolverFactory: ContentResolverFactory
-) : ContentProviderLiveData<RecentsContentResolver, RecentAccount>(context) {
-    override val contentResolver by lazy { contentResolverFactory.getRecentsContentResolver(recentId) }
-}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/notification/CallNotification.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/notification/CallNotification.kt
index 4d28bbe78..cf2b85b07 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/notification/CallNotification.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/notification/CallNotification.kt
@@ -1,7 +1,9 @@
 package com.chooloo.www.chooloolib.notification
 
 import android.app.Notification
+import android.app.Notification.CATEGORY_CALL
 import android.app.Notification.EXTRA_NOTIFICATION_ID
+import android.app.NotificationManager.IMPORTANCE_DEFAULT
 import android.app.NotificationManager.IMPORTANCE_HIGH
 import android.app.PendingIntent
 import android.app.PendingIntent.FLAG_CANCEL_CURRENT
@@ -16,14 +18,17 @@ import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import com.chooloo.www.chooloolib.R
+import com.chooloo.www.chooloolib.data.model.Call
+import com.chooloo.www.chooloolib.data.model.Call.State.DISCONNECTED
+import com.chooloo.www.chooloolib.data.model.Call.State.DISCONNECTING
+import com.chooloo.www.chooloolib.di.module.IoScope
 import com.chooloo.www.chooloolib.interactor.callaudio.CallAudiosInteractor
 import com.chooloo.www.chooloolib.interactor.calls.CallsInteractor
 import com.chooloo.www.chooloolib.interactor.color.ColorsInteractor
 import com.chooloo.www.chooloolib.interactor.phoneaccounts.PhonesInteractor
+import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor
+import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor.Companion.IncomingCallMode
 import com.chooloo.www.chooloolib.interactor.string.StringsInteractor
-import com.chooloo.www.chooloolib.model.Call
-import com.chooloo.www.chooloolib.model.Call.State.DISCONNECTED
-import com.chooloo.www.chooloolib.model.Call.State.DISCONNECTING
 import com.chooloo.www.chooloolib.receiver.CallBroadcastReceiver
 import com.chooloo.www.chooloolib.receiver.CallBroadcastReceiver.Companion.ACTION_HANGUP
 import com.chooloo.www.chooloolib.receiver.CallBroadcastReceiver.Companion.ACTION_MUTE
@@ -32,6 +37,8 @@ import com.chooloo.www.chooloolib.receiver.CallBroadcastReceiver.Companion.ACTIO
 import com.chooloo.www.chooloolib.receiver.CallBroadcastReceiver.Companion.ACTION_UNSPEAKER
 import com.chooloo.www.chooloolib.ui.call.CallActivity
 import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -42,48 +49,36 @@ class CallNotification @Inject constructor(
     private val colors: ColorsInteractor,
     private val phones: PhonesInteractor,
     private val strings: StringsInteractor,
+    @IoScope private val ioScope: CoroutineScope,
     private val callAudios: CallAudiosInteractor,
+    private val preferences: PreferencesInteractor,
     @ApplicationContext private val context: Context,
     private val notificationManager: NotificationManagerCompat
 ) : CallsInteractor.Listener, CallAudiosInteractor.Listener {
 
     private var _call: Call? = null
 
+    private val _channel
+        get() = if (_call?.isIncoming == true && preferences.incomingCallMode == IncomingCallMode.POP_UP) {
+            _channelImportanceHigh
+        } else {
+            _channelImportanceLow
+        }
 
-    override fun onNoCalls() {
-        detach()
-        cancel()
-    }
-
-    override fun onCallChanged(call: Call) {
-    }
-
-    override fun onMainCallChanged(call: Call) {
-        show(call)
-        _call = call
-    }
-
-
-    override fun onMuteChanged(isMuted: Boolean) {
-        _call?.let(::show)
-    }
-
-    override fun onAudioRouteChanged(audiosRoute: CallAudiosInteractor.AudioRoute) {
-        _call?.let(::show)
-    }
-
-
-    fun attach() {
-        createNotificationChannel()
-        calls.registerListener(this)
-        callAudios.registerListener(this)
-        Thread.currentThread().setUncaughtExceptionHandler { _, _ -> cancel() }
+    private val _channelImportanceLow by lazy {
+        NotificationChannelCompat.Builder(CHANNEL_ID_PRIORITY_LOW, IMPORTANCE_DEFAULT)
+            .setName(strings.getString(R.string.call_notification_channel_name))
+            .setDescription(strings.getString(R.string.call_notification_channel_description))
+            .build()
+            .also(notificationManager::createNotificationChannel)
     }
 
-    fun detach() {
-        calls.unregisterListener(this)
-        callAudios.unregisterListener(this)
-        cancel()
+    private val _channelImportanceHigh by lazy {
+        NotificationChannelCompat.Builder(CHANNEL_ID_PRIORITY_HIGH, IMPORTANCE_HIGH)
+            .setName(strings.getString(R.string.call_notification_channel_name))
+            .setDescription(strings.getString(R.string.call_notification_channel_description))
+            .build()
+            .also(notificationManager::createNotificationChannel)
     }
 
     private val _contentPendingIntent by lazy {
@@ -145,12 +140,25 @@ class CallNotification @Inject constructor(
         )
     }
 
-    private val _channel by lazy {
-        NotificationChannelCompat.Builder(CHANNEL_ID, IMPORTANCE_HIGH)
-            .setName(strings.getString(R.string.call_notification_channel_name))
-            .setDescription(strings.getString(R.string.call_notification_channel_description))
-            .setLightsEnabled(true)
-            .build()
+
+    override fun onNoCalls() {
+        detach()
+    }
+
+    override fun onCallChanged(call: Call) {
+    }
+
+    override fun onMainCallChanged(call: Call) {
+        _call = call
+        refresh()
+    }
+
+    override fun onMuteChanged(isMuted: Boolean) {
+        refresh()
+    }
+
+    override fun onAudioRouteChanged(audioRoute: CallAudiosInteractor.AudioRoute) {
+        refresh()
     }
 
 
@@ -168,56 +176,70 @@ class CallNotification @Inject constructor(
             FLAG_CANCEL_CURRENT or FLAG_IMMUTABLE
         )
 
+    private suspend fun buildNotification(call: Call, callback: (Notification) -> Unit) {
+        val phoneAccount = phones.lookupAccount(call.number)
+        val builder = NotificationCompat.Builder(context, _channel.id)
+            .setWhen(0)
+            .setOngoing(true)
+            .setColorized(true)
+            .setPriority(PRIORITY)
+            .setOnlyAlertOnce(true)
+            .setCategory(CATEGORY_CALL)
+            .setContentTitle(phoneAccount?.displayString ?: call.number)
+            .setSmallIcon(R.drawable.icon_full_144)
+            .setContentIntent(_contentPendingIntent)
+            .setColor(colors.getAttrColor(R.attr.colorSecondary))
+            .setContentText(strings.getString(call.state.stringRes))
+
+        if (call.state !in arrayOf(DISCONNECTED, DISCONNECTING)) {
+            builder.addAction(_hangupAction)
+        }
 
-    private fun buildNotification(call: Call, callback: (Notification) -> Unit) {
-        phones.lookupAccount(call.number) {
-            val builder = NotificationCompat.Builder(context, CHANNEL_ID)
-                .setWhen(0)
-                .setOngoing(true)
-                .setColorized(true)
-                .setPriority(PRIORITY)
-                .setOnlyAlertOnce(true)
-                .setContentTitle(it?.displayString ?: call.number)
-                .setSmallIcon(R.drawable.icon_full_144)
-                .setContentIntent(_contentPendingIntent)
-                .setColor(colors.getAttrColor(R.attr.colorSecondary))
-                .setContentText(strings.getString(call.state.stringRes))
-            if (call.isIncoming) {
-                builder.addAction(_answerAction)
-            }
-            if (call.state !in arrayOf(DISCONNECTED, DISCONNECTING)) {
-                builder.addAction(_hangupAction)
-            }
+        if (call.isIncoming) {
+            builder.addAction(_answerAction)
+        } else if (call.state !in arrayOf(DISCONNECTED, DISCONNECTING)) {
             callAudios.isMuted?.let { isMuted ->
                 if (call.isCapable(CAPABILITY_MUTE)) {
                     builder.addAction(if (isMuted) _unmuteAction else _muteAction)
                 }
             }
+
             callAudios.isSpeakerOn?.let { isSpeakerOn ->
                 builder.addAction(if (isSpeakerOn) _unspeakerAction else _speakerAction)
             }
-            callback.invoke(builder.build())
         }
+
+        callback.invoke(builder.build())
     }
 
 
-    fun show(call: Call) {
-        buildNotification(call) {
-            notificationManager.notify(ID, it)
-        }
+    fun attach() {
+        calls.registerListener(this)
+        callAudios.registerListener(this)
+        Thread.currentThread().setUncaughtExceptionHandler { _, _ -> detach() }
     }
 
-    fun cancel() {
+    fun detach() {
+        calls.unregisterListener(this)
+        callAudios.unregisterListener(this)
         notificationManager.cancel(ID)
     }
 
-    fun createNotificationChannel() {
-        notificationManager.createNotificationChannel(_channel)
+    fun show(call: Call) {
+        ioScope.launch {
+            buildNotification(call) { notificationManager.notify(ID, it) }
+        }
+    }
+
+    fun refresh() {
+        _call?.let(::show)
     }
 
+
     companion object {
         const val ID = 420
-        const val CHANNEL_ID = "call_notification_channel"
-        const val PRIORITY = NotificationCompat.PRIORITY_LOW
+        const val PRIORITY = NotificationCompat.PRIORITY_HIGH
+        const val CHANNEL_ID_PRIORITY_LOW = "cnc_priority_low"
+        const val CHANNEL_ID_PRIORITY_HIGH = "cnc_priority_high"
     }
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/calls/CallsRepository.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/calls/CallsRepository.kt
deleted file mode 100644
index 1b713e881..000000000
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/calls/CallsRepository.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.chooloo.www.chooloolib.repository.calls
-
-import androidx.lifecycle.LiveData
-import com.chooloo.www.chooloolib.model.Call
-
-interface CallsRepository {
-    fun getCalls(): LiveData<List<Call>>
-}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/calls/CallsRepositoryImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/calls/CallsRepositoryImpl.kt
deleted file mode 100644
index d6ffbfa31..000000000
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/calls/CallsRepositoryImpl.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.chooloo.www.chooloolib.repository.calls
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import com.chooloo.www.chooloolib.model.Call
-import com.chooloo.www.chooloolib.service.CallService
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class CallsRepositoryImpl @Inject constructor() : CallsRepository {
-    val calls = MutableLiveData<List<Call>>()
-
-    override fun getCalls(): LiveData<List<Call>> = CallService.sInstance?.calls ?: calls
-}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/contacts/ContactsRepository.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/contacts/ContactsRepository.kt
deleted file mode 100644
index a97a9f49f..000000000
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/contacts/ContactsRepository.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.chooloo.www.chooloolib.repository.contacts
-
-import androidx.lifecycle.LiveData
-import com.chooloo.www.chooloolib.model.ContactAccount
-
-interface ContactsRepository {
-    fun getContacts(): LiveData<List<ContactAccount>>
-    fun getContact(contactId: Long, callback: (ContactAccount?) -> Unit)
-}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/contacts/ContactsRepositoryImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/contacts/ContactsRepositoryImpl.kt
deleted file mode 100644
index 60a948325..000000000
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/contacts/ContactsRepositoryImpl.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.chooloo.www.chooloolib.repository.contacts
-
-import androidx.lifecycle.LiveData
-import com.chooloo.www.chooloolib.di.factory.contentresolver.ContentResolverFactory
-import com.chooloo.www.chooloolib.di.factory.livedata.LiveDataFactory
-import com.chooloo.www.chooloolib.model.ContactAccount
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class ContactsRepositoryImpl @Inject constructor(
-    private val liveDataFactory: LiveDataFactory,
-    private val contentResolverFactory: ContentResolverFactory
-) : ContactsRepository {
-    override fun getContacts(): LiveData<List<ContactAccount>> =
-        liveDataFactory.getContactsLiveData()
-
-    override fun getContact(contactId: Long, callback: (ContactAccount?) -> Unit) {
-        contentResolverFactory.getContactsContentResolver(contactId).queryItems {
-            callback.invoke(it.getOrNull(0))
-        }
-    }
-}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/phones/PhonesRepository.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/phones/PhonesRepository.kt
deleted file mode 100644
index 712eae141..000000000
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/phones/PhonesRepository.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.chooloo.www.chooloolib.repository.phones
-
-import androidx.lifecycle.LiveData
-import com.chooloo.www.chooloolib.model.PhoneAccount
-
-interface PhonesRepository {
-    fun getPhones(contactId: Long? = null): LiveData<List<PhoneAccount>>
-}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/phones/PhonesRepositoryImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/phones/PhonesRepositoryImpl.kt
deleted file mode 100644
index 6cc5445f5..000000000
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/phones/PhonesRepositoryImpl.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.chooloo.www.chooloolib.repository.phones
-
-import com.chooloo.www.chooloolib.di.factory.livedata.LiveDataFactory
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class PhonesRepositoryImpl @Inject constructor(
-    private val liveDataFactory: LiveDataFactory
-) : PhonesRepository {
-    override fun getPhones(contactId: Long?) = liveDataFactory.getPhonesLiveData(contactId)
-}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/rawcontacts/RawContactsRepository.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/rawcontacts/RawContactsRepository.kt
deleted file mode 100644
index b53529646..000000000
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/rawcontacts/RawContactsRepository.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.chooloo.www.chooloolib.repository.rawcontacts
-
-import androidx.lifecycle.LiveData
-import com.chooloo.www.chooloolib.model.RawContactAccount
-
-interface RawContactsRepository {
-    fun getRawContacts(contactId: Long): LiveData<List<RawContactAccount>>
-}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/rawcontacts/RawContactsRepositoryImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/rawcontacts/RawContactsRepositoryImpl.kt
deleted file mode 100644
index e755e851c..000000000
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/rawcontacts/RawContactsRepositoryImpl.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.chooloo.www.chooloolib.repository.rawcontacts
-
-import com.chooloo.www.chooloolib.di.factory.livedata.LiveDataFactory
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class RawContactsRepositoryImpl @Inject constructor(
-    private val liveDataFactory: LiveDataFactory
-) : RawContactsRepository {
-    override fun getRawContacts(contactId: Long) = liveDataFactory.getRawContactsLiveData(contactId)
-}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/recents/RecentsRepository.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/recents/RecentsRepository.kt
deleted file mode 100644
index df5208347..000000000
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/recents/RecentsRepository.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.chooloo.www.chooloolib.repository.recents
-
-import androidx.lifecycle.LiveData
-import com.chooloo.www.chooloolib.model.RecentAccount
-
-interface RecentsRepository {
-    fun getRecents(): LiveData<List<RecentAccount>>
-    fun getRecent(recentId: Long? = null, callback: (RecentAccount?) -> Unit)
-}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/recents/RecentsRepositoryImpl.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/recents/RecentsRepositoryImpl.kt
deleted file mode 100644
index 7bbfd91f3..000000000
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/repository/recents/RecentsRepositoryImpl.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.chooloo.www.chooloolib.repository.recents
-
-import com.chooloo.www.chooloolib.di.factory.contentresolver.ContentResolverFactory
-import com.chooloo.www.chooloolib.di.factory.livedata.LiveDataFactory
-import com.chooloo.www.chooloolib.model.RecentAccount
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class RecentsRepositoryImpl @Inject constructor(
-    private val liveDataFactory: LiveDataFactory,
-    private val contentResolverFactory: ContentResolverFactory
-) : RecentsRepository {
-    override fun getRecents() = liveDataFactory.getRecentsLiveData()
-
-    override fun getRecent(recentId: Long?, callback: (RecentAccount?) -> Unit) {
-        contentResolverFactory.getRecentsContentResolver(recentId).queryItems {
-            callback.invoke(it.getOrNull(0))
-        }
-    }
-}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/accounts/AccountsFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/accounts/AccountsFragment.kt
index dc8e36dd6..5a0b6b117 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/accounts/AccountsFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/accounts/AccountsFragment.kt
@@ -5,7 +5,7 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
 import com.chooloo.www.chooloolib.adapter.AccountsAdapter
 import com.chooloo.www.chooloolib.interactor.telecom.TelecomInteractor
-import com.chooloo.www.chooloolib.model.RawContactAccount
+import com.chooloo.www.chooloolib.data.model.RawContactAccount
 import com.chooloo.www.chooloolib.ui.briefcontact.BriefContactFragment.Companion.ARG_CONTACT_ID
 import com.chooloo.www.chooloolib.ui.list.ListFragment
 import dagger.hilt.android.AndroidEntryPoint
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/accounts/AccountsViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/accounts/AccountsViewState.kt
index 4e541387d..e14f89725 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/accounts/AccountsViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/accounts/AccountsViewState.kt
@@ -1,34 +1,32 @@
 package com.chooloo.www.chooloolib.ui.accounts
 
-import androidx.lifecycle.LiveData
+import android.Manifest.permission.READ_CONTACTS
 import androidx.lifecycle.MutableLiveData
 import com.chooloo.www.chooloolib.R
+import com.chooloo.www.chooloolib.data.model.RawContactAccount
+import com.chooloo.www.chooloolib.data.repository.rawcontacts.RawContactsRepository
 import com.chooloo.www.chooloolib.interactor.navigation.NavigationsInteractor
 import com.chooloo.www.chooloolib.interactor.permission.PermissionsInteractor
-import com.chooloo.www.chooloolib.model.RawContactAccount
-import com.chooloo.www.chooloolib.repository.rawcontacts.RawContactsRepository
 import com.chooloo.www.chooloolib.ui.list.ListViewState
 import com.chooloo.www.chooloolib.util.DataLiveEvent
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 @HiltViewModel
 class AccountsViewState @Inject constructor(
+    permissions: PermissionsInteractor,
     private val navigations: NavigationsInteractor,
-    private val permissions: PermissionsInteractor,
     private val rawContactsRepository: RawContactsRepository
 ) :
-    ListViewState<RawContactAccount>() {
+    ListViewState<RawContactAccount>(permissions) {
 
     override val noResultsIconRes = R.drawable.call
     override val noResultsTextRes = R.string.error_no_results_phones
-    override val noPermissionsTextRes = R.string.error_no_permissions_phones
+    override val requiredPermissions = listOf(READ_CONTACTS)
 
-    val contactId = MutableLiveData(0L)
     val callEvent = DataLiveEvent<String>()
-
-    private val accountsLiveData
-        get() = contactId.value?.let { rawContactsRepository.getRawContacts(it) }
+    val contactId = MutableLiveData(0L)
 
 
     override fun onItemRightClick(item: RawContactAccount) {
@@ -38,12 +36,8 @@ class AccountsViewState @Inject constructor(
         }
     }
 
-    override fun getItemsObservable(callback: (LiveData<List<RawContactAccount>>) -> Unit) {
-        permissions.runWithReadContactsPermissions {
-            onPermissionsChanged(it)
-            if (it) accountsLiveData?.let(callback::invoke)
-        }
-    }
+    override fun getItemsFlow(filter: String?): Flow<List<RawContactAccount>>? =
+        contactId.value?.let { rawContactsRepository.getRawContacts(it, filter) }
 
     fun onContactId(contactId: Long) {
         this.contactId.value = contactId
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseChoicesFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseChoicesFragment.kt
index 50fab603e..634bdc8f4 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseChoicesFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseChoicesFragment.kt
@@ -14,7 +14,7 @@ open class BaseChoicesFragment @Inject constructor() : BaseFragment<BaseViewStat
     override val contentView by lazy { binding.root }
     override val viewState: BaseViewState by viewModels()
 
-    private var _onChoiceClickListener: (String) -> Unit = {}
+    private var _onChoiceSelectedListener: (String) -> Boolean = { true }
     protected open val binding by lazy { MenuBinding.inflate(layoutInflater) }
 
     @Inject lateinit var adapter: ChoicesAdapter
@@ -22,11 +22,11 @@ open class BaseChoicesFragment @Inject constructor() : BaseFragment<BaseViewStat
 
     override fun onSetup() {
         adapter.apply {
-            setOnItemClickListener(_onChoiceClickListener::invoke)
+            setOnChoiceSelectedListener(_onChoiceSelectedListener)
             selectedIndex = args.getInt(ARG_SELECTED_INDEX, -1)
             items = args.getStringArrayList(ARG_CHOICES)?.toList() as List<String>
         }
-        
+
         binding.apply {
             menuRecyclerView.adapter = adapter
 
@@ -45,8 +45,8 @@ open class BaseChoicesFragment @Inject constructor() : BaseFragment<BaseViewStat
     }
 
 
-    fun setOnChoiceClickListener(onChoiceClickListener: (String) -> Unit) {
-        _onChoiceClickListener = onChoiceClickListener
+    fun setOnChoiceClickListener(onChoiceSelectedListener: (String) -> Boolean) {
+        _onChoiceSelectedListener = onChoiceSelectedListener
     }
 
 
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseFragment.kt
index 622d13191..e163243ef 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseFragment.kt
@@ -6,6 +6,8 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.StringRes
 import androidx.fragment.app.Fragment
+import com.chooloo.www.chooloolib.di.factory.fragment.FragmentFactory
+import com.chooloo.www.chooloolib.interactor.permission.PermissionsInteractor
 import javax.inject.Inject
 
 abstract class BaseFragment<out VM : BaseViewState> : Fragment(), BaseView<VM> {
@@ -14,6 +16,8 @@ abstract class BaseFragment<out VM : BaseViewState> : Fragment(), BaseView<VM> {
     val args get() = arguments ?: Bundle()
 
     @Inject lateinit var baseActivity: BaseActivity<*>
+    @Inject lateinit var fragmentFactory: FragmentFactory
+    @Inject lateinit var permissions: PermissionsInteractor
 
 
     override fun onCreateView(
@@ -24,10 +28,9 @@ abstract class BaseFragment<out VM : BaseViewState> : Fragment(), BaseView<VM> {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        onSetup()
-        viewState.apply {
-            attach()
+        onSetupHook()
 
+        viewState.apply {
             errorEvent.observe(this@BaseFragment) {
                 it.ifNew?.let(this@BaseFragment::showError)
             }
@@ -45,11 +48,11 @@ abstract class BaseFragment<out VM : BaseViewState> : Fragment(), BaseView<VM> {
     }
 
     override fun showError(@StringRes stringResId: Int) {
-        baseActivity.viewState.errorEvent.call(stringResId)
+        baseActivity.viewState.onError(stringResId)
     }
 
     override fun showMessage(@StringRes stringResId: Int) {
-        baseActivity.viewState.messageEvent.call(stringResId)
+        baseActivity.viewState.onMessage(stringResId)
     }
 
     override fun finish() {
@@ -57,6 +60,11 @@ abstract class BaseFragment<out VM : BaseViewState> : Fragment(), BaseView<VM> {
         _onFinishListener.invoke()
     }
 
+    protected open fun onSetupHook() {
+        onSetup()
+        viewState.attach()
+    }
+
     fun setOnFinishListener(onFinishListener: () -> Unit) {
         _onFinishListener = onFinishListener
     }
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseView.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseView.kt
index 13b6f451b..759c1866f 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseView.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseView.kt
@@ -1,7 +1,6 @@
 package com.chooloo.www.chooloolib.ui.base
 
 import androidx.annotation.StringRes
-import androidx.lifecycle.Lifecycle
 
 interface BaseView<out VM : BaseViewState> {
     val viewState: VM?
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseViewState.kt
index ce30d68da..3ff7f40a4 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseViewState.kt
@@ -1,14 +1,34 @@
 package com.chooloo.www.chooloolib.ui.base
 
+import androidx.annotation.StringRes
 import androidx.lifecycle.ViewModel
 import com.chooloo.www.chooloolib.util.DataLiveEvent
 import com.chooloo.www.chooloolib.util.LiveEvent
+import com.chooloo.www.chooloolib.util.MutableDataLiveEvent
+import com.chooloo.www.chooloolib.util.MutableLiveEvent
 
 open class BaseViewState : ViewModel() {
-    val finishEvent = LiveEvent()
-    val errorEvent = DataLiveEvent<Int>()
-    val messageEvent = DataLiveEvent<Int>()
+    protected val _finishEvent = MutableLiveEvent()
+    protected val _errorEvent = MutableDataLiveEvent<Int>()
+    protected val _messageEvent = MutableDataLiveEvent<Int>()
+
+    val finishEvent = _finishEvent as LiveEvent
+    val errorEvent = _errorEvent as DataLiveEvent<Int>
+    val messageEvent = _messageEvent as DataLiveEvent<Int>
+
 
     open fun attach() {}
     open fun detach() {}
+
+    fun onFinish() {
+        _finishEvent.call()
+    }
+
+    fun onError(@StringRes errMessageRes: Int) {
+        _errorEvent.call(errMessageRes)
+    }
+
+    fun onMessage(@StringRes messageRes: Int) {
+        _messageEvent.call(messageRes)
+    }
 }
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BottomFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BottomFragment.kt
index 2b6a9e658..ca9c3e787 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BottomFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BottomFragment.kt
@@ -6,12 +6,13 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.StringRes
+import androidx.fragment.app.commit
 import androidx.fragment.app.viewModels
 import com.chooloo.www.chooloolib.databinding.BottomDialogBinding
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import javax.inject.Inject
 
-open class BottomFragment<FragmentType : BaseFragment<out BaseViewState>>(
+open class BottomFragment<FragmentType : BaseFragment<BaseViewState>>(
     private val fragment: FragmentType
 ) : BottomSheetDialogFragment(), BaseView<BaseViewState> {
     override val viewState: BaseViewState by viewModels()
@@ -57,15 +58,16 @@ open class BottomFragment<FragmentType : BaseFragment<out BaseViewState>>(
             }
         }
 
-        childFragmentManager.beginTransaction()
-            .replace(binding.bottomDialogFragmentPlaceholder.id, fragment).commit()
+        childFragmentManager.commit {
+            replace(binding.bottomDialogFragmentPlaceholder.id, fragment)
+        }
     }
 
     override fun showError(@StringRes stringResId: Int) {
-        baseActivity.viewState.errorEvent.call(stringResId)
+        baseActivity.viewState.onError(stringResId)
     }
 
     override fun showMessage(@StringRes stringResId: Int) {
-        baseActivity.viewState.messageEvent.call(stringResId)
+        baseActivity.viewState.onMessage(stringResId)
     }
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/menu/BaseMenuFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/menu/BaseMenuFragment.kt
index 5228e1cef..158c23ba7 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/menu/BaseMenuFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/menu/BaseMenuFragment.kt
@@ -18,6 +18,7 @@ import javax.inject.Inject
 open class BaseMenuFragment @Inject constructor() : BaseFragment<BaseViewState>() {
     override val contentView by lazy { binding.root }
     override val viewState: BaseMenuViewState by viewModels()
+
     private val binding by lazy { MenuBinding.inflate(layoutInflater) }
     protected var menu: MenuBuilder? = null
 
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/menu/BaseMenuViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/menu/BaseMenuViewState.kt
index ac1bffe4f..e93f98856 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/menu/BaseMenuViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/menu/BaseMenuViewState.kt
@@ -1,14 +1,20 @@
 package com.chooloo.www.chooloolib.ui.base.menu
 
 import android.view.MenuItem
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.chooloo.www.chooloolib.ui.base.BaseViewState
 
 abstract class BaseMenuViewState : BaseViewState() {
-    val title = MutableLiveData<String>()
-    val subtitle = MutableLiveData<String>()
+    protected val _title = MutableLiveData<String>()
+    protected val _subtitle = MutableLiveData<String>()
+
+    val title = _title as LiveData<String>
+    val subtitle = _subtitle as LiveData<String>
+
     abstract val menuResList: List<Int>
 
+
     open fun onMenuItemClick(menuItem: MenuItem) {
         onMenuItemClick(menuItem.itemId)
     }
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/briefcontact/BriefContactFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/briefcontact/BriefContactFragment.kt
index c015de15c..75e073012 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/briefcontact/BriefContactFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/briefcontact/BriefContactFragment.kt
@@ -1,19 +1,21 @@
 package com.chooloo.www.chooloolib.ui.briefcontact
 
 import android.os.Bundle
+import android.view.View.LAYOUT_DIRECTION_LTR
+import android.view.View.LAYOUT_DIRECTION_RTL
 import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.commitNow
 import androidx.fragment.app.viewModels
 import com.chooloo.www.chooloolib.databinding.BriefContactBinding
-import com.chooloo.www.chooloolib.di.factory.fragment.FragmentFactory
 import com.chooloo.www.chooloolib.interactor.dialog.DialogsInteractor
-import com.chooloo.www.chooloolib.interactor.permission.PermissionsInteractor
 import com.chooloo.www.chooloolib.interactor.prompt.PromptsInteractor
 import com.chooloo.www.chooloolib.interactor.telecom.TelecomInteractor
 import com.chooloo.www.chooloolib.ui.accounts.AccountsViewState
 import com.chooloo.www.chooloolib.ui.base.BaseFragment
 import com.chooloo.www.chooloolib.ui.briefcontact.menu.BriefContactMenuViewState
 import com.chooloo.www.chooloolib.ui.phones.PhonesViewState
+import com.chooloo.www.chooloolib.util.isRTL
 import com.squareup.picasso.Picasso
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
@@ -32,8 +34,6 @@ open class BriefContactFragment @Inject constructor() : BaseFragment<BriefContac
 
     @Inject lateinit var prompts: PromptsInteractor
     @Inject lateinit var dialogs: DialogsInteractor
-    @Inject lateinit var fragmentFactory: FragmentFactory
-    @Inject lateinit var permissions: PermissionsInteractor
     @Inject lateinit var telecomInteractor: TelecomInteractor
 
 
@@ -41,32 +41,36 @@ open class BriefContactFragment @Inject constructor() : BaseFragment<BriefContac
         binding.briefContactImage.isVisible = false
 
         binding.apply {
-            briefContactButtonMore.setOnClickListener {
-                viewState.onMoreClick()
-            }
+            briefContactMainActions.apply {
+                briefContactButtonMore.setOnClickListener {
+                    viewState.onMoreClick()
+                }
 
-            briefContactMainActions.briefContactButtonSms.setOnClickListener {
-                viewState.onSmsClick()
-            }
+                briefContactButtonSms.setOnClickListener {
+                    viewState.onSmsClick()
+                }
 
-            briefContactMainActions.contactButtonCall.setOnClickListener {
-                viewState.onCallClick()
-            }
+                briefContactButtonCall.setOnClickListener {
+                    viewState.onCallClick()
+                }
 
-            briefContactMainActions.briefContactButtonEdit.setOnClickListener {
-                viewState.onEditClick()
+                briefContactButtonEdit.setOnClickListener {
+                    viewState.onEditClick()
+                }
             }
         }
 
         viewState.apply {
             isFavorite.observe(this@BriefContactFragment) {
-                menuViewState.isFavorite.value = it
+                menuViewState.onIsFavorite(it)
                 binding.briefContactIconFav.isVisible = it
             }
 
             contactName.observe(this@BriefContactFragment) {
                 binding.briefContactTextName.text = it
-                it?.let(menuViewState.contactName::setValue)
+                it?.let(menuViewState::onContactName)
+                binding.briefContactNameLayout.layoutDirection =
+                    if (it?.isRTL() == true) LAYOUT_DIRECTION_RTL else LAYOUT_DIRECTION_LTR
             }
 
             contactNumber.observe(this@BriefContactFragment) {
@@ -92,18 +96,23 @@ open class BriefContactFragment @Inject constructor() : BaseFragment<BriefContac
             }
 
             onContactId(args.getLong(ARG_CONTACT_ID))
-            menuViewState.contactId.value = args.getLong(ARG_CONTACT_ID)
+
+            menuViewState.apply {
+                finishEvent.observe(this@BriefContactFragment) {
+                    viewState.onFinish()
+                }
+
+                onContactId(args.getLong(ARG_CONTACT_ID))
+            }
         }
 
-        childFragmentManager
-            .beginTransaction()
-            .replace(binding.briefContactAccountsFragmentContainer.id, accountsFragment)
-            .commitNow()
+        childFragmentManager.commitNow {
+            replace(binding.briefContactAccountsFragmentContainer.id, accountsFragment)
+        }
 
-        childFragmentManager
-            .beginTransaction()
-            .replace(binding.briefContactPhonesFragmentContainer.id, phonesFragment)
-            .commitNow()
+        childFragmentManager.commitNow {
+            replace(binding.briefContactPhonesFragmentContainer.id, phonesFragment)
+        }
 
         accountsViewState.isEmpty.observe(this@BriefContactFragment) {
             binding.briefContactAccountsFragmentContainer.isVisible = !it
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/briefcontact/BriefContactViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/briefcontact/BriefContactViewState.kt
index 015f7c842..f1b98b3c1 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/briefcontact/BriefContactViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/briefcontact/BriefContactViewState.kt
@@ -1,17 +1,22 @@
 package com.chooloo.www.chooloolib.ui.briefcontact
 
 import android.net.Uri
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
 import com.chooloo.www.chooloolib.R
+import com.chooloo.www.chooloolib.data.model.ContactAccount
 import com.chooloo.www.chooloolib.interactor.contacts.ContactsInteractor
 import com.chooloo.www.chooloolib.interactor.navigation.NavigationsInteractor
 import com.chooloo.www.chooloolib.interactor.permission.PermissionsInteractor
 import com.chooloo.www.chooloolib.interactor.phoneaccounts.PhonesInteractor
-import com.chooloo.www.chooloolib.model.ContactAccount
 import com.chooloo.www.chooloolib.ui.base.BaseViewState
 import com.chooloo.www.chooloolib.util.DataLiveEvent
 import com.chooloo.www.chooloolib.util.LiveEvent
+import com.chooloo.www.chooloolib.util.MutableDataLiveEvent
+import com.chooloo.www.chooloolib.util.MutableLiveEvent
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
@@ -19,28 +24,34 @@ class BriefContactViewState @Inject constructor(
     private val phones: PhonesInteractor,
     private val contacts: ContactsInteractor,
     private val navigations: NavigationsInteractor,
-    private val permissions: PermissionsInteractor
 ) : BaseViewState() {
-    val contactId = MutableLiveData<Long>()
-    val contactImage = MutableLiveData<Uri>()
-    val isFavorite = MutableLiveData<Boolean>()
-    val contactName = MutableLiveData<String?>()
-    val contactNumber = MutableLiveData<String?>()
-
-    val showMoreEvent = LiveEvent()
-    val callEvent = DataLiveEvent<String>()
-
     private var firstNumber: String? = null
     private var contact: ContactAccount? = null
 
+    private val _contactId = MutableLiveData<Long>()
+    private val _contactImage = MutableLiveData<Uri>()
+    private val _isFavorite = MutableLiveData<Boolean>()
+    private val _contactName = MutableLiveData<String?>()
+    private val _contactNumber = MutableLiveData<String?>()
+    private val _showMoreEvent = MutableLiveEvent()
+    private val _callEvent = MutableDataLiveEvent<String>()
+
+    val contactId = _contactId as LiveData<Long>
+    val contactImage = _contactImage as LiveData<Uri>
+    val isFavorite = _isFavorite as LiveData<Boolean>
+    val contactName = _contactName as LiveData<String?>
+    val contactNumber = _contactNumber as LiveData<String?>
+    val showMoreEvent = _showMoreEvent as LiveEvent
+    val callEvent = _callEvent as DataLiveEvent<String>
+
 
     private fun withFirstNumber(callback: (String?) -> Unit) {
         if (firstNumber != null) {
             callback.invoke(firstNumber)
         } else {
             contact?.let {
-                phones.getContactAccounts(it.id) { phones ->
-                    firstNumber = phones?.getOrNull(0)?.number
+                viewModelScope.launch {
+                    firstNumber = phones.getContactAccounts(it.id).getOrNull(0)?.number
                     callback.invoke(firstNumber)
                 }
             }
@@ -48,22 +59,24 @@ class BriefContactViewState @Inject constructor(
     }
 
     fun onContactId(contactId: Long) {
-        this.contactId.value = contactId
-        contacts.observeContact(contactId) {
-            contact = it
-            contactName.value = it?.name
-            isFavorite.value = it?.starred == true
-            withFirstNumber { contactNumber.value = it }
-            it?.photoUri?.let { uri ->
-                contactImage.value = Uri.parse(uri)
+        _contactId.value = contactId
+        viewModelScope.launch {
+            contacts.getContact(contactId).collect {
+                contact = it
+                _contactName.value = it?.name
+                _isFavorite.value = it?.starred == true
+                withFirstNumber { _contactNumber.value = it }
+                it?.photoUri?.let { uri ->
+                    _contactImage.value = Uri.parse(uri)
+                }
             }
         }
     }
 
     fun onCallClick() {
         withFirstNumber {
-            it?.let(callEvent::call) ?: run {
-                errorEvent.call(R.string.error_no_number_to_call)
+            it?.let(_callEvent::call) ?: run {
+                onError(R.string.error_no_number_to_call)
             }
         }
     }
@@ -76,14 +89,7 @@ class BriefContactViewState @Inject constructor(
         contactId.value?.let(navigations::editContact)
     }
 
-    fun onDelete() {
-        permissions.runWithWriteContactsPermissions {
-            contactId.value?.let(contacts::deleteContact)
-            finishEvent.call()
-        }
-    }
-
     fun onMoreClick() {
-        showMoreEvent.call()
+        _showMoreEvent.call()
     }
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/briefcontact/menu/BriefContactMenuFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/briefcontact/menu/BriefContactMenuFragment.kt
index 7ab7521ad..035eaf967 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/briefcontact/menu/BriefContactMenuFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/briefcontact/menu/BriefContactMenuFragment.kt
@@ -1,9 +1,7 @@
 package com.chooloo.www.chooloolib.ui.briefcontact.menu
 
-import android.view.MenuItem
 import androidx.fragment.app.activityViewModels
 import com.chooloo.www.chooloolib.R
-import com.chooloo.www.chooloolib.di.factory.fragment.FragmentFactory
 import com.chooloo.www.chooloolib.interactor.dialog.DialogsInteractor
 import com.chooloo.www.chooloolib.interactor.prompt.PromptsInteractor
 import com.chooloo.www.chooloolib.ui.base.menu.BaseMenuFragment
@@ -14,31 +12,34 @@ import javax.inject.Inject
 class BriefContactMenuFragment @Inject constructor() : BaseMenuFragment() {
     override val viewState: BriefContactMenuViewState by activityViewModels()
 
-    @Inject lateinit var dialogs: DialogsInteractor
-    @Inject lateinit var prompts: PromptsInteractor
-    @Inject lateinit var fragmentFactory: FragmentFactory
+    @Inject
+    lateinit var dialogs: DialogsInteractor
+
+    @Inject
+    lateinit var prompts: PromptsInteractor
 
 
     override fun onSetup() {
         super.onSetup()
         viewState.apply {
-            showHistoryEvent.observe(this@BriefContactMenuFragment) { ev ->
-                ev.ifNew?.let { prompts.showFragment(fragmentFactory.getRecentsFragment(viewState.contactName.value)) }
-            }
-
             isFavorite.observe(this@BriefContactMenuFragment) {
                 changeItemVisibility(R.id.menu_brief_contact_set_favorite, !it)
                 changeItemVisibility(R.id.menu_brief_contact_unset_favorite, it)
             }
-        }
-    }
 
-    override fun onMenuItemClick(menuItem: MenuItem) {
-        if (menuItem.itemId == R.id.menu_brief_contact_delete) {
-            dialogs.askForValidation(R.string.explain_delete_contact) { bl ->
-                if (bl) viewState.onDelete()
+            showHistoryEvent.observe(this@BriefContactMenuFragment) {
+                it.ifNew?.let {
+                    prompts.showFragment(fragmentFactory.getRecentsHistoryFragment(viewState.contactName.value))
+                }
+            }
+
+            confirmDeleteEvent.observe(this@BriefContactMenuFragment) {
+                it.ifNew?.let {
+                    dialogs.askForValidation(R.string.explain_delete_contact) { bl ->
+                        if (bl) viewState.onDelete()
+                    }
+                }
             }
         }
-        super.onMenuItemClick(menuItem)
     }
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/briefcontact/menu/BriefContactMenuViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/briefcontact/menu/BriefContactMenuViewState.kt
index 0304a71de..04f93940f 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/briefcontact/menu/BriefContactMenuViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/briefcontact/menu/BriefContactMenuViewState.kt
@@ -1,12 +1,14 @@
 package com.chooloo.www.chooloolib.ui.briefcontact.menu
 
+import android.Manifest
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.chooloo.www.chooloolib.R
 import com.chooloo.www.chooloolib.interactor.contacts.ContactsInteractor
 import com.chooloo.www.chooloolib.interactor.permission.PermissionsInteractor
 import com.chooloo.www.chooloolib.ui.base.menu.BaseMenuViewState
-import com.chooloo.www.chooloolib.util.DataLiveEvent
 import com.chooloo.www.chooloolib.util.LiveEvent
+import com.chooloo.www.chooloolib.util.MutableLiveEvent
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
@@ -17,32 +19,55 @@ class BriefContactMenuViewState @Inject constructor(
 ) : BaseMenuViewState() {
     override val menuResList = listOf(R.menu.menu_brief_contact_extra)
 
-    val contactId = MutableLiveData<Long>()
-    val contactName = MutableLiveData<String>()
-    val isFavorite = MutableLiveData<Boolean>()
-    val showHistoryEvent = LiveEvent()
+    private val _contactId = MutableLiveData<Long>()
+    private val _contactName = MutableLiveData<String>()
+    private val _isFavorite = MutableLiveData<Boolean>()
+    private val _showHistoryEvent = MutableLiveEvent()
+    private val _confirmDeleteEvent = MutableLiveEvent()
+
+    val contactId = _contactId as LiveData<Long>
+    val isFavorite = _isFavorite as LiveData<Boolean>
+    val contactName = _contactName as LiveData<String>
+    val showHistoryEvent = _showHistoryEvent as LiveEvent
+    val confirmDeleteEvent = _confirmDeleteEvent as LiveEvent
+
 
     override fun onMenuItemClick(itemId: Int) {
         when (itemId) {
             R.id.menu_brief_contact_show_history -> onShowHistory()
+            R.id.menu_brief_contact_delete -> _confirmDeleteEvent.call()
             R.id.menu_brief_contact_set_favorite -> onSetFavorite(true)
             R.id.menu_brief_contact_unset_favorite -> onSetFavorite(false)
         }
     }
 
     fun onDelete() {
-        permissions.runWithWriteContactsPermissions {
+        permissions.runWithPermissions(arrayOf(Manifest.permission.WRITE_CONTACTS), {
             contactId.value?.let(contacts::deleteContact)
-            finishEvent.call()
-        }
+            onFinish()
+        }, {
+            onError(R.string.error_no_permissions_edit_contacts)
+        })
     }
 
     fun onShowHistory() {
-        showHistoryEvent.call()
+        _showHistoryEvent.call()
     }
 
     fun onSetFavorite(isFavorite: Boolean) {
         contactId.value?.let { contacts.toggleContactFavorite(it, isFavorite) }
-        finishEvent.call()
+        onFinish()
+    }
+
+    fun onIsFavorite(isFavorite: Boolean) {
+        _isFavorite.value = isFavorite
+    }
+
+    fun onContactId(contactId: Long) {
+        _contactId.value = contactId
+    }
+
+    fun onContactName(contactName: String) {
+        _contactName.value = contactName
     }
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/call/CallActivity.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/call/CallActivity.kt
index 2a955c26a..e6d63a5aa 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/call/CallActivity.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/call/CallActivity.kt
@@ -28,11 +28,11 @@ class CallActivity : BaseActivity<CallViewState>() {
     private val dialpadViewState: DialpadViewState by viewModels()
     private val binding by lazy { CallBinding.inflate(layoutInflater) }
 
-    @Inject lateinit var screens:ScreensInteractor
+    @Inject lateinit var screens: ScreensInteractor
     @Inject lateinit var dialogs: DialogsInteractor
     @Inject lateinit var prompts: PromptsInteractor
-    @Inject lateinit var animations: AnimationsInteractor
     @Inject lateinit var fragmentFactory: FragmentFactory
+    @Inject lateinit var animations: AnimationsInteractor
 
 
     override fun onSetup() {
@@ -91,13 +91,18 @@ class CallActivity : BaseActivity<CallViewState>() {
                         showActiveLayout()
                         binding.callActions.showMultiCallUI()
                     }
+
                     UIState.ACTIVE -> {
                         showActiveLayout()
                         binding.callActions.showSingleCallUI()
                     }
+
                     UIState.INCOMING -> {
                         transitionLayoutTo(R.id.constraint_set_incoming_call)
                     }
+
+                    else -> {
+                    }
                 }
             }
 
@@ -142,7 +147,12 @@ class CallActivity : BaseActivity<CallViewState>() {
             }
 
             askForRouteEvent.observe(this@CallActivity) {
-                it.ifNew?.let { dialogs.askForRoute(viewState::onAudioRoutePicked) }
+                it.ifNew?.let {
+                    dialogs.askForRoute {
+                        viewState.onAudioRoutePicked(it)
+                        true
+                    }
+                }
             }
 
             showDialerEvent.observe(this@CallActivity) {
@@ -161,6 +171,7 @@ class CallActivity : BaseActivity<CallViewState>() {
                 it.ifNew?.let {
                     dialogs.askForPhoneAccountHandle(it) {
                         viewState.onPhoneAccountHandleSelected(it)
+                        true
                     }
                 }
             }
@@ -170,7 +181,9 @@ class CallActivity : BaseActivity<CallViewState>() {
                     dialogs.askForPhoneAccountSuggestion(it) {
                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                             viewState.onPhoneAccountHandleSelected(it.phoneAccountHandle)
+                            return@askForPhoneAccountSuggestion true
                         }
+                        false
                     }
                 }
             }
@@ -196,7 +209,6 @@ class CallActivity : BaseActivity<CallViewState>() {
         dialpadViewState.char.observe(this@CallActivity, viewState::onCharKey)
     }
 
-
     private fun showActiveLayout() {
         transitionLayoutTo(R.id.constraint_set_active_call)
         if (binding.callActions.visibility != View.VISIBLE) {
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/call/CallViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/call/CallViewState.kt
index 98e264a11..de167af50 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/call/CallViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/call/CallViewState.kt
@@ -2,12 +2,26 @@ package com.chooloo.www.chooloolib.ui.call
 
 import android.net.Uri
 import android.os.Build
-import android.telecom.Call.Details.*
+import android.telecom.Call.Details.CAPABILITY_HOLD
+import android.telecom.Call.Details.CAPABILITY_MUTE
+import android.telecom.Call.Details.CAPABILITY_SWAP_CONFERENCE
 import android.telecom.PhoneAccountHandle
 import android.telecom.PhoneAccountSuggestion
-import android.telecom.TelecomManager
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
 import com.chooloo.www.chooloolib.R
+import com.chooloo.www.chooloolib.api.service.CallService
+import com.chooloo.www.chooloolib.data.model.Call
+import com.chooloo.www.chooloolib.data.model.Call.State.ACTIVE
+import com.chooloo.www.chooloolib.data.model.Call.State.DISCONNECTED
+import com.chooloo.www.chooloolib.data.model.Call.State.DISCONNECTING
+import com.chooloo.www.chooloolib.data.model.Call.State.HOLDING
+import com.chooloo.www.chooloolib.data.model.Call.State.INCOMING
+import com.chooloo.www.chooloolib.data.model.Call.State.SELECT_PHONE_ACCOUNT
+import com.chooloo.www.chooloolib.data.model.CantHoldCallException
+import com.chooloo.www.chooloolib.data.model.CantMergeCallException
+import com.chooloo.www.chooloolib.data.model.CantSwapCallException
 import com.chooloo.www.chooloolib.interactor.audio.AudiosInteractor
 import com.chooloo.www.chooloolib.interactor.audio.AudiosInteractor.AudioMode.NORMAL
 import com.chooloo.www.chooloolib.interactor.callaudio.CallAudiosInteractor
@@ -17,27 +31,23 @@ import com.chooloo.www.chooloolib.interactor.color.ColorsInteractor
 import com.chooloo.www.chooloolib.interactor.phoneaccounts.PhonesInteractor
 import com.chooloo.www.chooloolib.interactor.proximity.ProximitiesInteractor
 import com.chooloo.www.chooloolib.interactor.string.StringsInteractor
-import com.chooloo.www.chooloolib.model.Call
-import com.chooloo.www.chooloolib.model.Call.State.*
-import com.chooloo.www.chooloolib.model.CantHoldCallException
-import com.chooloo.www.chooloolib.model.CantMergeCallException
-import com.chooloo.www.chooloolib.model.CantSwapCallException
-import com.chooloo.www.chooloolib.service.CallService
 import com.chooloo.www.chooloolib.ui.base.BaseViewState
-import com.chooloo.www.chooloolib.ui.widgets.CallActions
+import com.chooloo.www.chooloolib.ui.callactions.CallActions
 import com.chooloo.www.chooloolib.util.DataLiveEvent
 import com.chooloo.www.chooloolib.util.LiveEvent
+import com.chooloo.www.chooloolib.util.MutableDataLiveEvent
+import com.chooloo.www.chooloolib.util.MutableLiveEvent
 import dagger.hilt.android.lifecycle.HiltViewModel
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.schedulers.Schedulers
+import kotlinx.coroutines.launch
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 @HiltViewModel
 class CallViewState @Inject constructor(
-    private val telecomManger: TelecomManager,
     private val calls: CallsInteractor,
     private val audios: AudiosInteractor,
     private val colors: ColorsInteractor,
@@ -52,32 +62,61 @@ class CallViewState @Inject constructor(
     CallAudiosInteractor.Listener,
     CallActions.CallActionsListener {
 
-    val name = MutableLiveData<String?>()
-    val imageRes = MutableLiveData<Int>()
-    val uiState = MutableLiveData<UIState>()
-    val imageURI = MutableLiveData<Uri?>(null)
-    val bannerText = MutableLiveData<String>()
-    val stateText = MutableLiveData<String?>()
-    val elapsedTime = MutableLiveData<Long>()
-    val stateTextColor = MutableLiveData<Int>()
-
-    val isHoldEnabled = MutableLiveData<Boolean>()
-    val isMuteEnabled = MutableLiveData<Boolean>()
-    val isSwapEnabled = MutableLiveData<Boolean>()
-    val isMergeEnabled = MutableLiveData<Boolean>()
-    val isMuteActivated = MutableLiveData<Boolean>()
-    val isHoldActivated = MutableLiveData<Boolean>()
-    val isManageEnabled = MutableLiveData(false)
-    val isSpeakerEnabled = MutableLiveData(true)
-    val isSpeakerActivated = MutableLiveData<Boolean>()
-    val isBluetoothActivated = MutableLiveData<Boolean>()
-
-    val showDialerEvent = LiveEvent()
-    val showDialpadEvent = LiveEvent()
-    val askForRouteEvent = LiveEvent()
-    val showCallManagerEvent = LiveEvent()
-    val selectPhoneHandleEvent = DataLiveEvent<List<PhoneAccountHandle>>()
-    val selectPhoneSuggestionEvent = DataLiveEvent<List<PhoneAccountSuggestion>>()
+    private val _name = MutableLiveData<String?>()
+    private val _imageRes = MutableLiveData<Int>()
+    private val _uiState = MutableLiveData<UIState>(UIState.ACTIVE)
+    private val _imageURI = MutableLiveData<Uri?>(null)
+    private val _bannerText = MutableLiveData<String?>()
+    private val _stateText = MutableLiveData<String?>()
+    private val _elapsedTime = MutableLiveData<Long?>()
+    private val _stateTextColor = MutableLiveData<Int>()
+
+    private val _isHoldEnabled = MutableLiveData<Boolean>()
+    private val _isMuteEnabled = MutableLiveData<Boolean>()
+    private val _isSwapEnabled = MutableLiveData<Boolean>()
+    private val _isMergeEnabled = MutableLiveData<Boolean>()
+    private val _isMuteActivated = MutableLiveData<Boolean>()
+    private val _isHoldActivated = MutableLiveData<Boolean>()
+    private val _isManageEnabled = MutableLiveData(false)
+    private val _isSpeakerEnabled = MutableLiveData(true)
+    private val _isSpeakerActivated = MutableLiveData<Boolean>()
+    private val _isBluetoothActivated = MutableLiveData<Boolean>()
+
+    private val _showDialerEvent = MutableLiveEvent()
+    private val _showDialpadEvent = MutableLiveEvent()
+    private val _askForRouteEvent = MutableLiveEvent()
+    private val _showCallManagerEvent = MutableLiveEvent()
+    private val _selectPhoneHandleEvent = MutableDataLiveEvent<List<PhoneAccountHandle>>()
+    private val _selectPhoneSuggestionEvent = MutableDataLiveEvent<List<PhoneAccountSuggestion>>()
+
+
+    val name = _name as LiveData<String?>
+    val imageRes = _imageRes as LiveData<Int>
+    val uiState = _uiState as LiveData<UIState>
+    val imageURI = _imageURI as LiveData<Uri?>
+    val bannerText = _bannerText as LiveData<String?>
+    val stateText = _stateText as LiveData<String?>
+    val elapsedTime = _elapsedTime as LiveData<Long?>
+    val stateTextColor = _stateTextColor as LiveData<Int>
+
+    val isHoldEnabled = _isHoldEnabled as LiveData<Boolean>
+    val isMuteEnabled = _isMuteEnabled as LiveData<Boolean>
+    val isSwapEnabled = _isSwapEnabled as LiveData<Boolean>
+    val isMergeEnabled = _isMergeEnabled as LiveData<Boolean>
+    val isMuteActivated = _isMuteActivated as LiveData<Boolean>
+    val isHoldActivated = _isHoldActivated as LiveData<Boolean>
+    val isManageEnabled = _isManageEnabled as LiveData<Boolean>
+    val isSpeakerEnabled = _isSpeakerEnabled as LiveData<Boolean>
+    val isSpeakerActivated = _isSpeakerActivated as LiveData<Boolean>
+    val isBluetoothActivated = _isBluetoothActivated as LiveData<Boolean>
+
+    val showDialerEvent = _showDialerEvent as LiveEvent
+    val showDialpadEvent = _showDialpadEvent as LiveEvent
+    val askForRouteEvent = _askForRouteEvent as LiveEvent
+    val showCallManagerEvent = _showCallManagerEvent as LiveEvent
+    val selectPhoneHandleEvent = _selectPhoneHandleEvent as DataLiveEvent<List<PhoneAccountHandle>>
+    val selectPhoneSuggestionEvent =
+        _selectPhoneSuggestionEvent as DataLiveEvent<List<PhoneAccountSuggestion>>
 
     private var _currentCallId: String? = null
 
@@ -100,7 +139,12 @@ class CallViewState @Inject constructor(
             callAudios.audioRoute?.let(this@CallViewState::onAudioRouteChanged)
         }
 
-        isManageEnabled.value = false
+        _isManageEnabled.value = false
+
+//        // text code
+//        _uiState.value = UIState.INCOMING
+//        _elapsedTime.value = 1L
+//        _stateText.value = strings.getString(R.string.call_status_connecting)
     }
 
     override fun detach() {
@@ -109,27 +153,27 @@ class CallViewState @Inject constructor(
     }
 
     fun onAnswerClick() {
-        _currentCallId?.let { calls.answerCall(it) }
+        _currentCallId?.let(calls::answerCall)
     }
 
     fun onRejectClick() {
-        _currentCallId?.let { calls.rejectCall(it) }
+        _currentCallId?.let(calls::rejectCall)
     }
 
     override fun onSwapClick() {
         try {
-            _currentCallId?.let { calls.swapCall(it) }
+            _currentCallId?.let(calls::swapCall)
         } catch (e: CantSwapCallException) {
-            errorEvent.call(R.string.error_cant_swap_calls)
+            onError(R.string.error_cant_swap_calls)
             e.printStackTrace()
         }
     }
 
     override fun onHoldClick() {
         try {
-            _currentCallId?.let { calls.toggleHold(it) }
+            _currentCallId?.let(calls::toggleHold)
         } catch (e: CantHoldCallException) {
-            errorEvent.call(R.string.error_cant_hold_call)
+            onError(R.string.error_cant_hold_call)
             e.printStackTrace()
         }
     }
@@ -140,25 +184,25 @@ class CallViewState @Inject constructor(
 
     override fun onMergeClick() {
         try {
-            _currentCallId?.let { calls.mergeCall(it) }
+            _currentCallId?.let(calls::mergeCall)
         } catch (e: CantMergeCallException) {
-            errorEvent.call(R.string.error_cant_merge_call)
+            onError(R.string.error_cant_merge_call)
             e.printStackTrace()
         }
     }
 
     override fun onKeypadClick() {
-        showDialpadEvent.call()
+        _showDialpadEvent.call()
     }
 
     override fun onAddCallClick() {
-        showDialerEvent.call()
+        _showDialerEvent.call()
     }
 
     override fun onSpeakerClick() {
         callAudios.apply {
             if (supportedAudioRoutes.contains(AudioRoute.BLUETOOTH)) {
-                askForRouteEvent.call()
+                _askForRouteEvent.call()
             } else {
                 isSpeakerOn = !isSpeakerActivated.value!!
             }
@@ -172,21 +216,21 @@ class CallViewState @Inject constructor(
 
     override fun onNoCalls() {
         audios.audioMode = NORMAL
-        finishEvent.call()
+        onFinish()
     }
 
     override fun onCallChanged(call: Call) {
         if (calls.getFirstState(HOLDING)?.id == _currentCallId) {
-            bannerText.value = null
+            _bannerText.value = null
         } else if (call.isHolding && _currentCallId != call.id && !call.isInConference) {
-            phones.lookupAccount(call.number) {
-                bannerText.value = String.format(
+            viewModelScope.launch {
+                _bannerText.value = String.format(
                     strings.getString(R.string.explain_is_on_hold),
-                    it?.displayString ?: call.number
+                    phones.lookupAccount(call.number)?.displayString ?: call.number
                 )
             }
         } else if (calls.getStateCount(HOLDING) == 0) {
-            bannerText.value = null
+            _bannerText.value = null
         }
     }
 
@@ -194,69 +238,76 @@ class CallViewState @Inject constructor(
         _currentCallId = call.id
 
         if (call.isEnterprise) {
-            imageRes.value = R.drawable.corporate_fare
+            _imageRes.value = R.drawable.corporate_fare
         }
 
         if (call.isIncoming) {
-            uiState.value = UIState.INCOMING
+            _uiState.value = UIState.INCOMING
         }
 
         if (call.isConference) {
-            name.value = strings.getString(R.string.conference)
+            _name.value = strings.getString(R.string.conference)
         } else {
-            phones.lookupAccount(call.number) { account ->
-                account?.photoUri?.let { imageURI.value = Uri.parse(it) }
-                name.value = account?.displayString ?: call.number
+            viewModelScope.launch {
+                val account = phones.lookupAccount(call.number)
+                account?.photoUri?.let { _imageURI.value = Uri.parse(it) }
+                _name.value = account?.displayString ?: call.number
             }
         }
 
-        isHoldActivated.value = call.isHolding
-        isManageEnabled.value = call.isConference
-        isHoldEnabled.value = call.isCapable(CAPABILITY_HOLD)
-        isMuteEnabled.value = call.isCapable(CAPABILITY_MUTE)
-        isSwapEnabled.value = call.isCapable(CAPABILITY_SWAP_CONFERENCE)
-        stateText.value = strings.getString(call.state.stringRes)
+        _isHoldActivated.value = call.isHolding
+        _isManageEnabled.value = call.isConference
+        _isHoldEnabled.value = call.isCapable(CAPABILITY_HOLD)
+        _isMuteEnabled.value = call.isCapable(CAPABILITY_MUTE)
+        _isSwapEnabled.value = call.isCapable(CAPABILITY_SWAP_CONFERENCE)
+        _stateText.value = strings.getString(call.state.stringRes)
 
         when {
-            call.isIncoming -> uiState.value = UIState.INCOMING
-            calls.isMultiCall -> uiState.value = UIState.MULTI
-            else -> uiState.value = UIState.ACTIVE
+            call.isIncoming -> _uiState.value = UIState.INCOMING
+            calls.isMultiCall -> _uiState.value = UIState.MULTI
+            else -> _uiState.value = UIState.ACTIVE
         }
 
         when (call.state) {
-            INCOMING, ACTIVE -> stateTextColor.value =
-                colors.getColor(R.color.green_on_primary_container)
-            HOLDING, DISCONNECTING, DISCONNECTED -> stateTextColor.value =
-                colors.getAttrColor(R.attr.colorError)
+            ACTIVE,
+            INCOMING -> _stateTextColor.value =
+                colors.getColor(R.color.on_positive)
+
+            HOLDING,
+            DISCONNECTING,
+            DISCONNECTED -> _stateTextColor.value =
+                colors.getColor(R.color.on_negative)
+
+            else -> {}
         }
 
         if (call.state == SELECT_PHONE_ACCOUNT && !call.phoneAccountSelected) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                selectPhoneSuggestionEvent.call(call.suggestedPhoneAccounts)
+                _selectPhoneSuggestionEvent.call(call.suggestedPhoneAccounts)
             } else {
-                selectPhoneHandleEvent.call(call.availablePhoneAccounts)
+                _selectPhoneHandleEvent.call(call.availablePhoneAccounts)
             }
         }
     }
 
 
     override fun onMuteChanged(isMuted: Boolean) {
-        isMuteActivated.value = isMuted
+        _isMuteActivated.value = isMuted
     }
 
     override fun onAudioRouteChanged(audioRoute: AudioRoute) {
-        isSpeakerActivated.value = audioRoute == AudioRoute.SPEAKER
-        isBluetoothActivated.value = audioRoute == AudioRoute.BLUETOOTH
+        _isSpeakerActivated.value = audioRoute == AudioRoute.SPEAKER
+        _isBluetoothActivated.value = audioRoute == AudioRoute.BLUETOOTH
     }
 
     private fun displayCallTime() {
         calls.mainCall?.let {
-            elapsedTime.value = if (it.isStarted) it.durationTimeMilis else null
+            _elapsedTime.value = if (it.isStarted) it.durationTimeMilis else null
         }
     }
 
     fun onManageClick() {
-        showCallManagerEvent.call()
+        _showCallManagerEvent.call()
     }
 
     fun onAudioRoutePicked(audioRoute: AudioRoute) {
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/callactions/CallAction.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/callactions/CallAction.kt
new file mode 100644
index 000000000..ee359e680
--- /dev/null
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/callactions/CallAction.kt
@@ -0,0 +1,13 @@
+package com.chooloo.www.chooloolib.ui.callactions
+
+import androidx.annotation.DrawableRes
+
+abstract class CallAction {
+    var tempIconRes: Int? = null
+    var isEnabled: Boolean = true
+    var isActivated: Boolean = false
+    open val checkedIconRes: Int? = null
+
+    abstract val idRes: Int
+    @get:DrawableRes abstract val iconRes: Int
+}
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/callactions/CallActions.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/callactions/CallActions.kt
new file mode 100644
index 000000000..dca29cc39
--- /dev/null
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/callactions/CallActions.kt
@@ -0,0 +1,222 @@
+package com.chooloo.www.chooloolib.ui.callactions
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.recyclerview.widget.GridLayoutManager
+import com.chooloo.www.chooloolib.R
+import com.chooloo.www.chooloolib.adapter.CallActionsAdapter
+import com.chooloo.www.chooloolib.databinding.CallActionsBinding
+import com.chooloo.www.chooloolib.util.GridSpacingItemDecoration
+
+
+class CallActions : ConstraintLayout {
+    private val _binding: CallActionsBinding
+    private var _isBluetoothActivated: Boolean = false
+    private var _callActionsListener: CallActionsListener? = null
+    private val _adapter by lazy { CallActionsAdapter() }
+
+    constructor(context: Context) : this(context, null)
+    constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr
+    ) {
+        _callActionsListener = getEmptyListener()
+
+        _binding = CallActionsBinding.inflate(LayoutInflater.from(context), this, true)
+        _binding.callActionsRecyclerView.apply {
+            layoutManager = GridLayoutManager(context, 3)
+            adapter = _adapter
+            val gridPadding = resources.getDimension(R.dimen.default_spacing_medium).toInt()
+            addItemDecoration(GridSpacingItemDecoration(3, gridPadding, false))
+        }
+
+        _adapter.setOnCallActionClickListener {
+            when (it.idRes) {
+                R.string.call_action_id_hold -> _callActionsListener?.onHoldClick()
+                R.string.call_action_id_mute -> _callActionsListener?.onMuteClick()
+                R.string.call_action_id_swap -> _callActionsListener?.onSwapClick()
+                R.string.call_action_id_add -> _callActionsListener?.onAddCallClick()
+                R.string.call_action_id_merge -> _callActionsListener?.onMergeClick()
+                R.string.call_action_id_keypad -> _callActionsListener?.onKeypadClick()
+                R.string.call_action_id_speaker -> _callActionsListener?.onSpeakerClick()
+            }
+        }
+    }
+
+
+    var isHoldActivated: Boolean
+        get() = _adapter.isCallActionActivated(R.string.call_action_id_hold)
+        set(value) {
+            _adapter.setCallActionActivated(R.string.call_action_id_hold, value)
+        }
+
+    var isMuteActivated: Boolean
+        get() = _adapter.isCallActionActivated(R.string.call_action_id_mute)
+        set(value) {
+            _adapter.setCallActionActivated(R.string.call_action_id_mute, value)
+        }
+
+    var isSpeakerActivated: Boolean
+        get() = _adapter.isCallActionActivated(R.string.call_action_id_speaker)
+        set(value) {
+            _adapter.setCallActionActivated(R.string.call_action_id_speaker, value)
+        }
+
+    var isBluetoothActivated: Boolean
+        get() = _isBluetoothActivated
+        set(value) {
+            _isBluetoothActivated = value
+            _adapter.setCallActionIcon(
+                R.string.call_action_id_speaker,
+                if (value) R.drawable.bluetooth_searching else R.drawable.volume_down
+            )
+            if (!value) {
+                isSpeakerActivated = isSpeakerActivated
+            }
+        }
+
+
+    var isHoldEnabled: Boolean
+        get() = _adapter.isCallActionEnabled(R.string.call_action_id_hold)
+        set(value) {
+            _adapter.setCallActionEnabled(R.string.call_action_id_hold, value)
+        }
+
+    var isMuteEnabled: Boolean
+        get() = _adapter.isCallActionEnabled(R.string.call_action_id_mute)
+        set(value) {
+            _adapter.setCallActionEnabled(R.string.call_action_id_mute, value)
+        }
+
+    var isSwapEnabled: Boolean
+        get() = _adapter.isCallActionEnabled(R.string.call_action_id_swap)
+        set(value) {
+            _adapter.setCallActionEnabled(R.string.call_action_id_swap, value)
+        }
+
+    var isMergeEnabled: Boolean
+        get() = _adapter.isCallActionEnabled(R.string.call_action_id_merge)
+        set(value) {
+            _adapter.setCallActionEnabled(R.string.call_action_id_merge, value)
+        }
+
+    var isSpeakerEnabled: Boolean
+        get() = _adapter.isCallActionEnabled(R.string.call_action_id_speaker)
+        set(value) {
+            _adapter.setCallActionEnabled(R.string.call_action_id_speaker, value)
+        }
+
+
+    fun showSingleCallUI() {
+        _adapter.addCallActions(
+            listOf(
+                callActionAdd,
+                callActionMute,
+                callActionHold,
+                callActionKeypad,
+                callActionSpeaker,
+            )
+        )
+        _adapter.removeCallActions(
+            listOf(
+                callActionSwap,
+                callActionMerge
+            )
+        )
+    }
+
+    fun showMultiCallUI() {
+        _adapter.addCallActions(
+            listOf(
+                callActionAdd,
+                callActionMute,
+                callActionHold,
+                callActionSwap,
+                callActionKeypad,
+                callActionMerge,
+                callActionSpeaker,
+            )
+        )
+    }
+
+    fun setCallActionsListener(callActionsListener: CallActionsListener?) {
+        _callActionsListener = callActionsListener
+    }
+
+
+    private fun getEmptyListener() = object : CallActionsListener {
+        override fun onHoldClick() {}
+        override fun onMuteClick() {}
+        override fun onSwapClick() {}
+        override fun onMergeClick() {}
+        override fun onKeypadClick() {}
+        override fun onSpeakerClick() {}
+        override fun onAddCallClick() {}
+    }
+
+
+    interface CallActionsListener {
+        fun onHoldClick()
+        fun onMuteClick()
+        fun onSwapClick()
+        fun onMergeClick()
+        fun onKeypadClick()
+        fun onSpeakerClick()
+        fun onAddCallClick()
+    }
+
+    private val callActionKeypad by lazy {
+        object : CallAction() {
+            override val iconRes = R.drawable.dialpad
+            override val idRes = R.string.call_action_id_keypad
+        }
+    }
+
+    private val callActionAdd by lazy {
+        object : CallAction() {
+            override val iconRes = R.drawable.add
+            override val idRes = R.string.call_action_id_add
+        }
+    }
+
+    private val callActionMute by lazy {
+        object : CallAction() {
+            override val iconRes = R.drawable.mic
+            override val checkedIconRes = R.drawable.mic_off
+            override val idRes = R.string.call_action_id_mute
+        }
+    }
+    private val callActionSpeaker by lazy {
+        object : CallAction() {
+            override val iconRes = R.drawable.volume_down
+            override val checkedIconRes = R.drawable.volume_up
+            override val idRes = R.string.call_action_id_speaker
+        }
+    }
+
+    private val callActionHold by lazy {
+        object : CallAction() {
+            override val iconRes = R.drawable.pause
+            override val idRes = R.string.call_action_id_hold
+            override val checkedIconRes = R.drawable.play_arrow
+        }
+    }
+
+    private val callActionMerge by lazy {
+        object : CallAction() {
+            override val iconRes = R.drawable.call_merge
+            override val idRes = R.string.call_action_id_merge
+        }
+    }
+
+    private val callActionSwap by lazy {
+        object : CallAction() {
+            override val iconRes = R.drawable.swap_calls
+            override val idRes = R.string.call_action_id_swap
+        }
+    }
+}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/callitems/CallItemsFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/callitems/CallItemsFragment.kt
index 456034457..08bc873f2 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/callitems/CallItemsFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/callitems/CallItemsFragment.kt
@@ -3,7 +3,7 @@ package com.chooloo.www.chooloolib.ui.callitems
 import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
 import com.chooloo.www.chooloolib.adapter.CallItemsAdapter
-import com.chooloo.www.chooloolib.model.Call
+import com.chooloo.www.chooloolib.data.model.Call
 import com.chooloo.www.chooloolib.ui.list.ListFragment
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/callitems/CallItemsViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/callitems/CallItemsViewState.kt
index db7358bde..0eff919c8 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/callitems/CallItemsViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/callitems/CallItemsViewState.kt
@@ -1,31 +1,32 @@
 package com.chooloo.www.chooloolib.ui.callitems
 
-import androidx.lifecycle.LiveData
-import com.chooloo.www.chooloolib.model.Call
-import com.chooloo.www.chooloolib.repository.calls.CallsRepository
+import com.chooloo.www.chooloolib.data.model.Call
+import com.chooloo.www.chooloolib.data.repository.calls.CallsRepository
+import com.chooloo.www.chooloolib.interactor.permission.PermissionsInteractor
 import com.chooloo.www.chooloolib.ui.list.ListViewState
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 @HiltViewModel
 class CallItemsViewState @Inject constructor(
+    permissions: PermissionsInteractor,
     private val callsRepository: CallsRepository
 ) :
-    ListViewState<Call>() {
+    ListViewState<Call>(permissions) {
 
     override fun onItemLeftClick(item: Call) {
         super.onItemLeftClick(item)
         item.leaveConference()
-        finishEvent.call()
+        onFinish()
     }
 
     override fun onItemRightClick(item: Call) {
         super.onItemRightClick(item)
         item.reject()
-        finishEvent.call()
+        onFinish()
     }
 
-    override fun getItemsObservable(callback: (LiveData<List<Call>>) -> Unit) {
-        callback.invoke(callsRepository.getCalls())
-    }
+    override fun getItemsFlow(filter: String?): Flow<List<Call>>? =
+        callsRepository.getCalls()
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/contacts/ContactsFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/contacts/ContactsFragment.kt
index fbe4b0078..08e31b6b6 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/contacts/ContactsFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/contacts/ContactsFragment.kt
@@ -2,9 +2,8 @@ package com.chooloo.www.chooloolib.ui.contacts
 
 import androidx.fragment.app.activityViewModels
 import com.chooloo.www.chooloolib.adapter.ContactsAdapter
-import com.chooloo.www.chooloolib.di.factory.fragment.FragmentFactory
 import com.chooloo.www.chooloolib.interactor.prompt.PromptsInteractor
-import com.chooloo.www.chooloolib.model.ContactAccount
+import com.chooloo.www.chooloolib.data.model.ContactAccount
 import com.chooloo.www.chooloolib.ui.list.ListFragment
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
@@ -15,7 +14,6 @@ open class ContactsFragment @Inject constructor() :
     override val viewState: ContactsViewState by activityViewModels()
 
     @Inject lateinit var prompts: PromptsInteractor
-    @Inject lateinit var fragmentFactory: FragmentFactory
     @Inject override lateinit var adapter: ContactsAdapter
 
 
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/contacts/ContactsViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/contacts/ContactsViewState.kt
index 07b985986..6cbab105a 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/contacts/ContactsViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/contacts/ContactsViewState.kt
@@ -1,50 +1,40 @@
 package com.chooloo.www.chooloolib.ui.contacts
 
 import android.Manifest.permission.READ_CONTACTS
-import androidx.lifecycle.LiveData
 import com.chooloo.www.chooloolib.R
+import com.chooloo.www.chooloolib.data.model.ContactAccount
+import com.chooloo.www.chooloolib.data.repository.contacts.ContactsRepository
 import com.chooloo.www.chooloolib.interactor.permission.PermissionsInteractor
-import com.chooloo.www.chooloolib.livedata.ContactsLiveData
-import com.chooloo.www.chooloolib.model.ContactAccount
-import com.chooloo.www.chooloolib.repository.contacts.ContactsRepository
 import com.chooloo.www.chooloolib.ui.list.ListViewState
 import com.chooloo.www.chooloolib.util.DataLiveEvent
+import com.chooloo.www.chooloolib.util.MutableDataLiveEvent
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 @HiltViewModel
 open class ContactsViewState @Inject constructor(
-    contactsRepository: ContactsRepository,
-    private val permissions: PermissionsInteractor,
+    permissions: PermissionsInteractor,
+    private val contactsRepository: ContactsRepository,
 ) :
-    ListViewState<ContactAccount>() {
+    ListViewState<ContactAccount>(permissions) {
 
     override val noResultsIconRes = R.drawable.group
     override val noResultsTextRes = R.string.error_no_results_contacts
-    override val noPermissionsTextRes = R.string.error_no_permissions_contacts
+    override val permissionsImageRes = R.drawable.group
+    override val permissionsTextRes = R.string.error_no_permissions_contacts
+    override val requiredPermissions = listOf(READ_CONTACTS)
 
-    private val contactsLiveData = contactsRepository.getContacts() as ContactsLiveData
+    private val _showContactEvent = MutableDataLiveEvent<Long>()
 
-    val showContactEvent = DataLiveEvent<Long>()
+    val showContactEvent = _showContactEvent as DataLiveEvent<Long>
 
 
-    override fun onFilterChanged(filter: String?) {
-        super.onFilterChanged(filter)
-        if (permissions.hasSelfPermission(READ_CONTACTS)) {
-            onPermissionsChanged(true)
-            contactsLiveData.filter = filter
-        }
-    }
-
     override fun onItemClick(item: ContactAccount) {
         super.onItemClick(item)
-        showContactEvent.call(item.id)
+        _showContactEvent.call(item.id)
     }
 
-    override fun getItemsObservable(callback: (LiveData<List<ContactAccount>>) -> Unit) {
-        permissions.runWithReadContactsPermissions {
-            onPermissionsChanged(it)
-            if (it) callback.invoke(contactsLiveData)
-        }
-    }
+    override fun getItemsFlow(filter: String?): Flow<List<ContactAccount>>? =
+        contactsRepository.getContacts(filter)
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/contacts/ContactsSuggestionsFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/contacts/suggestions/ContactsSuggestionsFragment.kt
similarity index 86%
rename from chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/contacts/ContactsSuggestionsFragment.kt
rename to chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/contacts/suggestions/ContactsSuggestionsFragment.kt
index 094233a6a..2365fda84 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/contacts/ContactsSuggestionsFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/contacts/suggestions/ContactsSuggestionsFragment.kt
@@ -1,7 +1,8 @@
-package com.chooloo.www.chooloolib.ui.contacts
+package com.chooloo.www.chooloolib.ui.contacts.suggestions
 
 import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
+import com.chooloo.www.chooloolib.ui.contacts.ContactsFragment
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/contacts/ContactsSuggestionsViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/contacts/suggestions/ContactsSuggestionsViewState.kt
similarity index 55%
rename from chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/contacts/ContactsSuggestionsViewState.kt
rename to chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/contacts/suggestions/ContactsSuggestionsViewState.kt
index 7b71a8466..c9fa8288a 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/contacts/ContactsSuggestionsViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/contacts/suggestions/ContactsSuggestionsViewState.kt
@@ -1,7 +1,8 @@
-package com.chooloo.www.chooloolib.ui.contacts
+package com.chooloo.www.chooloolib.ui.contacts.suggestions
 
 import com.chooloo.www.chooloolib.interactor.permission.PermissionsInteractor
-import com.chooloo.www.chooloolib.repository.contacts.ContactsRepository
+import com.chooloo.www.chooloolib.data.repository.contacts.ContactsRepository
+import com.chooloo.www.chooloolib.ui.contacts.ContactsViewState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
@@ -9,4 +10,4 @@ import javax.inject.Inject
 class ContactsSuggestionsViewState @Inject constructor(
     permissions: PermissionsInteractor,
     contactsRepository: ContactsRepository
-) : ContactsViewState(contactsRepository, permissions)
\ No newline at end of file
+) : ContactsViewState(permissions,contactsRepository)
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialer/DialerFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialer/DialerFragment.kt
index 6a9d5e9c9..35f3d0960 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialer/DialerFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialer/DialerFragment.kt
@@ -1,27 +1,24 @@
 package com.chooloo.www.chooloolib.ui.dialer
 
-import android.content.Context
 import android.os.Bundle
 import android.telephony.PhoneNumberFormattingTextWatcher
 import android.view.View
 import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
-import androidx.fragment.app.viewModels
-import com.chooloo.www.chooloolib.di.factory.fragment.FragmentFactory
+import androidx.fragment.app.commitNow
 import com.chooloo.www.chooloolib.interactor.telecom.TelecomInteractor
-import com.chooloo.www.chooloolib.ui.contacts.ContactsSuggestionsViewState
+import com.chooloo.www.chooloolib.ui.contacts.suggestions.ContactsSuggestionsViewState
 import com.chooloo.www.chooloolib.ui.dialpad.DialpadFragment
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class DialerFragment @Inject constructor() : DialpadFragment() {
-    override val viewState: DialerViewState by viewModels()
+    override val viewState: DialerViewState by activityViewModels()
 
     private val suggestionsViewState: ContactsSuggestionsViewState by activityViewModels()
     private val _suggestionsFragment by lazy { fragmentFactory.getContactsSuggestionsFragment() }
 
-    @Inject lateinit var fragmentFactory: FragmentFactory
     @Inject lateinit var telecomInteractor: TelecomInteractor
 
 
@@ -109,19 +106,13 @@ class DialerFragment @Inject constructor() : DialpadFragment() {
             }
         }
 
-        suggestionsViewState.itemsChangedEvent.observe(this@DialerFragment) {
-            it.peekContent()?.let(viewState::onSuggestionsChanged)
-        }
+        suggestionsViewState.items.observe(this@DialerFragment, viewState::onSuggestionsChanged)
 
         args.getString(ARG_NUMBER)?.forEach(viewState::onCharClick)
-    }
 
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        childFragmentManager
-            .beginTransaction()
-            .add(binding.dialpadSuggestionsContainer.id, _suggestionsFragment)
-            .commitNow()
+        childFragmentManager.commitNow {
+            add(binding.dialpadSuggestionsContainer.id, _suggestionsFragment)
+        }
     }
 
     companion object {
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialer/DialerViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialer/DialerViewState.kt
index a23c900ad..d5b5b1e52 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialer/DialerViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialer/DialerViewState.kt
@@ -1,15 +1,19 @@
 package com.chooloo.www.chooloolib.ui.dialer
 
+import android.Manifest
 import android.content.ClipboardManager
 import androidx.lifecycle.MutableLiveData
 import com.chooloo.www.chooloolib.interactor.audio.AudiosInteractor
 import com.chooloo.www.chooloolib.interactor.navigation.NavigationsInteractor
 import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor
 import com.chooloo.www.chooloolib.interactor.recents.RecentsInteractor
-import com.chooloo.www.chooloolib.model.ContactAccount
+import com.chooloo.www.chooloolib.data.model.ContactAccount
+import com.chooloo.www.chooloolib.interactor.permission.PermissionsInteractor
 import com.chooloo.www.chooloolib.ui.dialpad.DialpadViewState
 import com.chooloo.www.chooloolib.util.DataLiveEvent
 import com.chooloo.www.chooloolib.util.LiveEvent
+import com.chooloo.www.chooloolib.util.MutableDataLiveEvent
+import com.chooloo.www.chooloolib.util.MutableLiveEvent
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
@@ -17,17 +21,26 @@ import javax.inject.Inject
 class DialerViewState @Inject constructor(
     audios: AudiosInteractor,
     preferences: PreferencesInteractor,
+    clipboardManager: ClipboardManager,
+    permissions: PermissionsInteractor,
     private val recents: RecentsInteractor,
-    private val clipboardManager: ClipboardManager,
-    private val navigations: NavigationsInteractor
+    private val navigations: NavigationsInteractor,
 ) :
-    DialpadViewState(audios, clipboardManager, preferences) {
+    DialpadViewState(permissions, audios, preferences, clipboardManager) {
 
-    val callVoicemailEvent = LiveEvent()
-    val callNumberEvent = DataLiveEvent<String>()
-    val isSuggestionsVisible = MutableLiveData(false)
-    val isDeleteButtonVisible = MutableLiveData<Boolean>()
-    val isAddContactButtonVisible = MutableLiveData<Boolean>()
+    override val requiredPermissions = listOf(Manifest.permission.CALL_PHONE)
+
+    private val _isSuggestionsVisible = MutableLiveData(false)
+    private val _isDeleteButtonVisible = MutableLiveData<Boolean>()
+    private val _isAddContactButtonVisible = MutableLiveData<Boolean>()
+    private val _callVoicemailEvent = MutableLiveEvent()
+    private val _callNumberEvent = MutableDataLiveEvent<String>()
+
+    val isSuggestionsVisible = _isSuggestionsVisible as MutableLiveData<Boolean>
+    val isDeleteButtonVisible = _isDeleteButtonVisible as MutableLiveData<Boolean>
+    val isAddContactButtonVisible = _isAddContactButtonVisible as MutableLiveData<Boolean>
+    val callVoicemailEvent = _callVoicemailEvent as LiveEvent
+    val callNumberEvent = _callNumberEvent as DataLiveEvent<String>
 
 
     override fun onLongKeyClick(char: Char) = when (char) {
@@ -36,7 +49,7 @@ class DialerViewState @Inject constructor(
             true
         }
         '1' -> {
-            callVoicemailEvent.call()
+            _callVoicemailEvent.call()
             true
         }
         else -> super.onLongKeyClick(char)
@@ -50,29 +63,29 @@ class DialerViewState @Inject constructor(
     }
 
     fun onDeleteClick() {
-        text.value?.dropLast(1)?.let(this::onTextChanged)
+        _text.value?.dropLast(1)?.let(this::onTextChanged)
     }
 
     fun onLongDeleteClick(): Boolean {
         onTextChanged("")
-        text.value = ""
+        _text.value = ""
         return true
     }
 
     fun onCallClick() {
         if (text.value?.isEmpty() == true) {
-            text.value = recents.getLastOutgoingCall()
+            _text.value = recents.getLastOutgoingCall()
         } else {
-            text.value?.let(callNumberEvent::call)
-            finishEvent.call()
+            _text.value?.let(_callNumberEvent::call)
+            onFinish()
         }
     }
 
     fun onAddContactClick() {
-        text.value?.let(navigations::addContact)
+        _text.value?.let(navigations::addContact)
     }
 
     fun onSuggestionsChanged(contacts: List<ContactAccount>) {
-        isSuggestionsVisible.value = contacts.isNotEmpty() && text.value?.isNotEmpty() == true
+        isSuggestionsVisible.value = contacts.isNotEmpty() && _text.value?.isNotEmpty() == true
     }
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialpad/DialpadFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialpad/DialpadFragment.kt
index 3f4269c44..9fb7ad5bf 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialpad/DialpadFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialpad/DialpadFragment.kt
@@ -6,14 +6,15 @@ import androidx.fragment.app.activityViewModels
 import com.chooloo.www.chooloolib.databinding.DialpadBinding
 import com.chooloo.www.chooloolib.interactor.animation.AnimationsInteractor
 import com.chooloo.www.chooloolib.ui.base.BaseFragment
+import com.chooloo.www.chooloolib.ui.permissioned.PermissionedFragment
 import com.chooloo.www.chooloolib.ui.widgets.DialpadKey
 import com.chooloo.www.chooloolib.ui.widgets.TextContextMenuItemListener
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
 @AndroidEntryPoint
-open class DialpadFragment @Inject constructor() : BaseFragment<DialpadViewState>(), TextContextMenuItemListener {
-    override val contentView by lazy { binding.root }
+open class DialpadFragment @Inject constructor() : PermissionedFragment<DialpadViewState>(), TextContextMenuItemListener {
+    override val mainContentView by lazy { binding.root }
     override val viewState: DialpadViewState by activityViewModels()
 
     @Inject lateinit var animationsInteractor: AnimationsInteractor
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialpad/DialpadViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialpad/DialpadViewState.kt
index 72c424d62..99d0de372 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialpad/DialpadViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/dialpad/DialpadViewState.kt
@@ -1,27 +1,36 @@
 package com.chooloo.www.chooloolib.ui.dialpad
 
 import android.content.ClipboardManager
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.chooloo.www.chooloolib.interactor.audio.AudiosInteractor
+import com.chooloo.www.chooloolib.interactor.permission.PermissionsInteractor
 import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor
-import com.chooloo.www.chooloolib.ui.base.BaseViewState
+import com.chooloo.www.chooloolib.ui.permissioned.PermissionedViewState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
 @HiltViewModel
 open class DialpadViewState @Inject constructor(
+    permissions: PermissionsInteractor,
     private val audios: AudiosInteractor,
+    private val preferences: PreferencesInteractor,
     private val clipboardManager: ClipboardManager,
-    private val preferences: PreferencesInteractor
 ) :
-    BaseViewState() {
+    PermissionedViewState(permissions) {
 
-    val text = MutableLiveData("")
-    val char = MutableLiveData<Char>()
+    private val _char = MutableLiveData<Char>()
+    protected val _text = MutableLiveData("")
 
+    val char = _char as LiveData<Char>
+    val text = _text as LiveData<String>
+
+    open fun onTextChanged(text: String) {
+        _text.value = text
+    }
 
     open fun onCharClick(char: Char) {
-        this.char.value = char
+        _char.value = char
         if (preferences.isDialpadTones) audios.playToneByChar(char)
         if (preferences.isDialpadVibrate) audios.vibrate(AudiosInteractor.SHORT_VIBRATE_LENGTH)
         onTextChanged((text.value ?: "") + char)
@@ -34,10 +43,5 @@ open class DialpadViewState @Inject constructor(
         val text = item?.text.toString().replace(Regex("[^+#*0-9]"), "")
         onTextChanged(text)
     }
-
-
-    protected open fun onTextChanged(text: String) {
-        this.text.value = text
-    }
 }
 
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/list/ListFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/list/ListFragment.kt
index 4cd0e490a..46f87f18d 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/list/ListFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/list/ListFragment.kt
@@ -3,18 +3,24 @@ package com.chooloo.www.chooloolib.ui.list
 import androidx.core.view.isVisible
 import com.chooloo.www.chooloolib.adapter.ListAdapter
 import com.chooloo.www.chooloolib.databinding.ItemsBinding
-import com.chooloo.www.chooloolib.ui.base.BaseFragment
+import com.chooloo.www.chooloolib.ui.permissioned.PermissionedFragment
+
+abstract class ListFragment<ItemType, VS : ListViewState<ItemType>> : PermissionedFragment<VS>() {
+    override val mainContentView by lazy { binding.root }
 
-abstract class ListFragment<ItemType, VS : ListViewState<ItemType>> : BaseFragment<VS>() {
-    override val contentView by lazy { binding.root }
     protected val binding by lazy { ItemsBinding.inflate(layoutInflater) }
 
+
     override fun onSetup() {
         viewState.apply {
             isEmpty.observe(this@ListFragment, this@ListFragment::showEmpty)
             emptyMessage.observe(this@ListFragment, binding.empty.emptyText::setText)
             emptyIcon.observe(this@ListFragment, binding.empty.emptyIcon::setImageResource)
 
+            items.observe(this@ListFragment) {
+                adapter.items = it
+            }
+
             filter.observe(this@ListFragment) {
                 adapter.titleFilter = it
             }
@@ -26,14 +32,6 @@ abstract class ListFragment<ItemType, VS : ListViewState<ItemType>> : BaseFragme
             isScrollerVisible.observe(this@ListFragment) {
                 binding.itemsScrollView.fastScroller.isVisible = it
             }
-
-            itemsChangedEvent.observe(this@ListFragment) { ev ->
-                ev.ifNew?.let { adapter.items = it }
-            }
-
-            if (args.getBoolean(ARG_OBSERVE, true)) {
-                getItemsObservable { it.observe(this@ListFragment, viewState::onItemsChanged) }
-            }
         }
 
         adapter.apply {
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/list/ListViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/list/ListViewState.kt
index ae87b0607..ed76d23df 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/list/ListViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/list/ListViewState.kt
@@ -2,56 +2,82 @@ package com.chooloo.www.chooloolib.ui.list
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import com.chooloo.www.chooloolib.ui.base.BaseViewState
+import androidx.lifecycle.viewModelScope
+import com.chooloo.www.chooloolib.interactor.permission.PermissionsInteractor
+import com.chooloo.www.chooloolib.ui.permissioned.PermissionedViewState
 import com.chooloo.www.chooloolib.util.DataLiveEvent
+import com.chooloo.www.chooloolib.util.LiveEvent
+import com.chooloo.www.chooloolib.util.MutableDataLiveEvent
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
 
-abstract class ListViewState<ItemType> : BaseViewState() {
-    val filter = MutableLiveData<String>()
-    val emptyIcon = MutableLiveData<Int>()
-    val emptyMessage = MutableLiveData<Int>()
-    val isEmpty = MutableLiveData(true)
-    val isLoading = MutableLiveData(true)
-    val isScrollerVisible = MutableLiveData<Boolean>()
+abstract class ListViewState<ItemType>(
+    permissions: PermissionsInteractor
+) : PermissionedViewState(permissions) {
+    private var _itemsCollectJob: Job? = null
+    private var _itemsFlow: Flow<List<ItemType>>? = null
 
-    val itemClickedEvent = DataLiveEvent<ItemType>()
-    val itemLongClickedEvent = DataLiveEvent<ItemType>()
-    val itemsChangedEvent = DataLiveEvent<List<ItemType>>()
+    private val _items = MutableLiveData<List<ItemType>>()
+    private val _filter = MutableLiveData<String?>()
+    private val _emptyIcon = MutableLiveData<Int>()
+    private val _emptyMessage = MutableLiveData<Int>()
+    private val _isEmpty = MutableLiveData(true)
+    private val _isLoading = MutableLiveData(true)
+    private val _isScrollerVisible = MutableLiveData<Boolean>()
+    private val _itemClickedEvent = MutableDataLiveEvent<ItemType>()
+    private val _itemLongClickedEvent = MutableDataLiveEvent<ItemType>()
+
+    val items = _items as LiveData<List<ItemType>>
+    val filter = _filter as LiveData<String?>
+    val emptyIcon = _emptyIcon as LiveData<Int>
+    val emptyMessage = _emptyMessage as LiveData<Int>
+    val isEmpty = _isEmpty as LiveData<Boolean>
+    val isLoading = _isLoading as LiveData<Boolean>
+    val isScrollerVisible = _isScrollerVisible as LiveData<Boolean>
+    val itemClickedEvent = _itemClickedEvent as DataLiveEvent<ItemType>
+    val itemLongClickedEvent = _itemLongClickedEvent as DataLiveEvent<ItemType>
 
     protected open val noResultsIconRes: Int? = null
     protected open val noResultsTextRes: Int? = null
-    protected open val noPermissionsTextRes: Int? = null
-    
+
 
     override fun attach() {
-        emptyIcon.value = noResultsIconRes
-        emptyMessage.value = noResultsTextRes
+        _emptyIcon.value = noResultsIconRes
+        _emptyMessage.value = noResultsTextRes
+        updateItemsFlow()
+    }
+
+    protected fun updateItemsFlow() {
+        _itemsCollectJob?.cancel()
+        _itemsCollectJob = viewModelScope.launch {
+            _itemsFlow = getItemsFlow(filter.value)
+            _itemsFlow?.collect(this@ListViewState::onItemsChanged)
+        }
     }
 
     open fun onItemsChanged(items: List<ItemType>) {
-        isLoading.value = false
-        isEmpty.value = items.isEmpty()
-        itemsChangedEvent.call(items)
+        _isLoading.value = false
+        _isEmpty.value = items.isEmpty()
+        _items.value = items
     }
 
     open fun onFilterChanged(filter: String?) {
-        this.filter.value = filter
+        _filter.value = filter
+        updateItemsFlow()
     }
 
     open fun onItemClick(item: ItemType) {
-        itemClickedEvent.call(item)
+        _itemClickedEvent.call(item)
     }
 
     open fun onItemLongClick(item: ItemType) {
-        itemLongClickedEvent.call(item)
-    }
-
-    fun onPermissionsChanged(hasPermissions: Boolean) {
-        emptyMessage.value = if (hasPermissions) noResultsTextRes else noPermissionsTextRes
-        isEmpty.value = !hasPermissions
+        _itemLongClickedEvent.call(item)
     }
 
     open fun onItemLeftClick(item: ItemType) {}
     open fun onItemRightClick(item: ItemType) {}
 
-    abstract fun getItemsObservable(callback: (LiveData<List<ItemType>>) -> Unit)
+    abstract fun getItemsFlow(filter: String?): Flow<List<ItemType>>?
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/permission/PermissionFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/permission/PermissionFragment.kt
new file mode 100644
index 000000000..c16bb25e6
--- /dev/null
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/permission/PermissionFragment.kt
@@ -0,0 +1,31 @@
+package com.chooloo.www.chooloolib.ui.permission
+
+import androidx.fragment.app.viewModels
+import com.chooloo.www.chooloolib.databinding.PermissionBinding
+import com.chooloo.www.chooloolib.ui.base.BaseFragment
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class PermissionFragment @Inject constructor() : BaseFragment<PermissionViewState>() {
+    override val contentView by lazy { _binding.root }
+    override val viewState: PermissionViewState by viewModels(
+        ownerProducer = { requireParentFragment() }
+    )
+
+    private val _binding by lazy { PermissionBinding.inflate(layoutInflater) }
+
+
+    override fun onSetup() {
+        viewState.apply {
+            textRes.observe(this@PermissionFragment, _binding.noPermissionText::setText)
+            imageRes.observe(this@PermissionFragment) {
+                _binding.noPermissionImage.setImageResource(it)
+            }
+        }
+
+        _binding.apply {
+            noPermissionButton.setOnClickListener { viewState.onGrantClick() }
+        }
+    }
+}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/permission/PermissionViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/permission/PermissionViewState.kt
new file mode 100644
index 000000000..6ded4fad3
--- /dev/null
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/permission/PermissionViewState.kt
@@ -0,0 +1,52 @@
+package com.chooloo.www.chooloolib.ui.permission
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.chooloo.www.chooloolib.interactor.permission.PermissionsInteractor
+import com.chooloo.www.chooloolib.ui.base.BaseViewState
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class PermissionViewState @Inject constructor(
+    private val permissions: PermissionsInteractor
+) : BaseViewState() {
+    private val _textRes = MutableLiveData<Int>()
+    private val _imageRes = MutableLiveData<Int>()
+    private var _isGranted = MutableLiveData<Boolean>()
+    private var _permissions: List<String> = emptyList()
+
+    val textRes: LiveData<Int> = _textRes
+    val imageRes: LiveData<Int> = _imageRes
+    val isGranted: LiveData<Boolean> = _isGranted
+
+
+    override fun attach() {
+        super.attach()
+        checkPermission()
+    }
+
+    private fun checkPermission() {
+        viewModelScope.launch {
+            _isGranted.value = permissions.checkPermissions(*_permissions.toTypedArray())
+        }
+    }
+
+    fun onGrantClick() {
+        checkPermission()
+    }
+
+    fun onTextRes(textRes: Int) {
+        _textRes.value = textRes
+    }
+
+    fun onImageRes(imageRes: Int) {
+        _imageRes.value = imageRes
+    }
+
+    fun onPermissions(permissions: List<String>) {
+        _permissions = permissions
+    }
+}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/permissioned/PermissionedFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/permissioned/PermissionedFragment.kt
new file mode 100644
index 000000000..b6158d238
--- /dev/null
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/permissioned/PermissionedFragment.kt
@@ -0,0 +1,72 @@
+package com.chooloo.www.chooloolib.ui.permissioned
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.fragment.app.commit
+import androidx.fragment.app.viewModels
+import com.chooloo.www.chooloolib.databinding.PermissionedBinding
+import com.chooloo.www.chooloolib.ui.base.BaseFragment
+import com.chooloo.www.chooloolib.ui.permission.PermissionViewState
+
+abstract class PermissionedFragment<out VM : PermissionedViewState> : BaseFragment<VM>() {
+
+    override val contentView by lazy { _binding.root }
+
+    private val _permissionViewState: PermissionViewState by viewModels()
+    private val _binding by lazy { PermissionedBinding.inflate(layoutInflater) }
+    private val _permissionFragment by lazy { fragmentFactory.getPermissionFragment() }
+
+
+    override fun onSetupHook() {
+        _permissionViewState.apply {
+            onPermissions(viewState.requiredPermissions)
+            viewState.permissionsTextRes?.let(::onTextRes)
+            viewState.permissionsImageRes?.let(::onImageRes)
+            isGranted.observe(this@PermissionedFragment, viewState::onIsPermissionGranted)
+        }
+
+        viewState.shouldShowMainFragment.observe(this@PermissionedFragment) {
+            if (it) {
+                showMainFragment()
+            } else {
+                showPermissionsFragment()
+            }
+        }
+
+        viewState.attachHook()
+    }
+
+    private fun showMainFragment() {
+        childFragmentManager.findFragmentByTag(PERMISSIONS_FRAGMENT_TAG)?.let { fragment ->
+            childFragmentManager.commit { remove(fragment) }
+        }
+
+        _binding.permissionedPermissionContainer.isVisible = false
+        mainContentView.parent?.let { (it as ViewGroup).removeView(mainContentView) }
+        _binding.root.addView(mainContentView)
+        super.onSetupHook()
+    }
+
+    private fun showPermissionsFragment() {
+        _binding.root.removeView(mainContentView)
+        _binding.permissionedPermissionContainer.isVisible = true
+
+        childFragmentManager.findFragmentByTag(PERMISSIONS_FRAGMENT_TAG)?.let { } ?: run {
+            childFragmentManager.commit {
+                add(
+                    _binding.permissionedPermissionContainer.id,
+                    fragmentFactory.getPermissionFragment(),
+                    PERMISSIONS_FRAGMENT_TAG
+                )
+            }
+        }
+    }
+
+    abstract val mainContentView: View
+
+
+    companion object {
+        const val PERMISSIONS_FRAGMENT_TAG = "permissions_fragment"
+    }
+}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/permissioned/PermissionedViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/permissioned/PermissionedViewState.kt
new file mode 100644
index 000000000..5a805a0d1
--- /dev/null
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/permissioned/PermissionedViewState.kt
@@ -0,0 +1,31 @@
+package com.chooloo.www.chooloolib.ui.permissioned
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import com.chooloo.www.chooloolib.interactor.permission.PermissionsInteractor
+import com.chooloo.www.chooloolib.ui.base.BaseViewState
+
+abstract class PermissionedViewState(
+    private val permissions: PermissionsInteractor
+) : BaseViewState() {
+    private val _isPermissionGranted = MutableLiveData<Boolean>()
+    private val _shouldShowMainFragment = MutableLiveData<Boolean>()
+
+    open val permissionsTextRes: Int? = null
+    open val permissionsImageRes: Int? = null
+    open val requiredPermissions: List<String> = emptyList()
+
+    val isPermissionGranted: LiveData<Boolean> = _isPermissionGranted
+    val shouldShowMainFragment: LiveData<Boolean> = _shouldShowMainFragment
+
+
+    fun attachHook() {
+        _shouldShowMainFragment.value =
+            permissions.hasSelfPermissions(requiredPermissions.toTypedArray())
+    }
+
+    fun onIsPermissionGranted(isGranted: Boolean) {
+        _isPermissionGranted.value = isGranted
+        _shouldShowMainFragment.value = isGranted
+    }
+}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/permissions/PermissionRequestActivity.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/permissions/PermissionRequestActivity.kt
index a55d8434b..91c99f30f 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/permissions/PermissionRequestActivity.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/permissions/PermissionRequestActivity.kt
@@ -1,7 +1,10 @@
 package com.chooloo.www.chooloolib.ui.permissions
 
+import android.content.Intent
 import android.content.pm.PackageManager
+import android.net.Uri
 import android.os.Bundle
+import android.provider.Settings
 import android.view.View
 import androidx.activity.viewModels
 import androidx.core.app.ActivityCompat
@@ -11,12 +14,14 @@ import com.chooloo.www.chooloolib.ui.base.BaseViewState
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
+
 @AndroidEntryPoint
 class PermissionRequestActivity : BaseActivity<BaseViewState>() {
     override val contentView: View? = null
     override val viewState: BaseViewState by viewModels()
 
-    @Inject lateinit var permissions: PermissionsInteractor
+    @Inject
+    lateinit var permissions: PermissionsInteractor
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -63,6 +68,12 @@ class PermissionRequestActivity : BaseActivity<BaseViewState>() {
         finishWithResult(permissionResults)
     }
 
+    private fun goToSettings() {
+        startActivity(Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
+            data = Uri.fromParts("package", packageName, null)
+        })
+    }
+
     private fun finishWithResult(permissionResult: List<PermissionResult> = listOf()) {
         val requestCode = intent?.getIntExtra(REQUEST_CODE_ARGUMENT_KEY, -1) ?: -1
         permissions.entryPermissionResult(permissionResult, requestCode)
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/phones/PhonesFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/phones/PhonesFragment.kt
index c70c6e915..4560112e2 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/phones/PhonesFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/phones/PhonesFragment.kt
@@ -5,7 +5,7 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
 import com.chooloo.www.chooloolib.adapter.PhonesAdapter
 import com.chooloo.www.chooloolib.interactor.telecom.TelecomInteractor
-import com.chooloo.www.chooloolib.model.PhoneAccount
+import com.chooloo.www.chooloolib.data.model.PhoneAccount
 import com.chooloo.www.chooloolib.ui.briefcontact.BriefContactFragment.Companion.ARG_CONTACT_ID
 import com.chooloo.www.chooloolib.ui.list.ListFragment
 import dagger.hilt.android.AndroidEntryPoint
@@ -18,6 +18,7 @@ class PhonesFragment @Inject constructor() : ListFragment<PhoneAccount, PhonesVi
     @Inject override lateinit var adapter: PhonesAdapter
     @Inject lateinit var telecomInteractor: TelecomInteractor
 
+
     override fun onSetup() {
         viewState.onContactId(args.getLong(ARG_CONTACT_ID))
         super.onSetup()
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/phones/PhonesViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/phones/PhonesViewState.kt
index bdde56c90..d3194cd91 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/phones/PhonesViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/phones/PhonesViewState.kt
@@ -1,19 +1,20 @@
 package com.chooloo.www.chooloolib.ui.phones
 
-import android.Manifest.permission.CALL_PHONE
-import android.Manifest.permission.READ_PHONE_STATE
+import android.Manifest.permission.*
 import android.content.ClipData
 import android.content.ClipboardManager
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.chooloo.www.chooloolib.R
+import com.chooloo.www.chooloolib.data.model.PhoneAccount
+import com.chooloo.www.chooloolib.data.repository.phones.PhonesRepository
 import com.chooloo.www.chooloolib.interactor.permission.PermissionsInteractor
-import com.chooloo.www.chooloolib.livedata.PhonesLiveData
-import com.chooloo.www.chooloolib.model.PhoneAccount
-import com.chooloo.www.chooloolib.repository.phones.PhonesRepository
 import com.chooloo.www.chooloolib.ui.list.ListViewState
 import com.chooloo.www.chooloolib.util.DataLiveEvent
+import com.chooloo.www.chooloolib.util.LiveEvent
+import com.chooloo.www.chooloolib.util.MutableDataLiveEvent
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 @HiltViewModel
@@ -22,29 +23,28 @@ class PhonesViewState @Inject constructor(
     private val phonesRepository: PhonesRepository,
     private val clipboardManager: ClipboardManager
 ) :
-    ListViewState<PhoneAccount>() {
+    ListViewState<PhoneAccount>(permissions) {
 
     override val noResultsIconRes = R.drawable.call
     override val noResultsTextRes = R.string.error_no_results_phones
-    override val noPermissionsTextRes = R.string.error_no_permissions_phones
+    override val requiredPermissions = listOf(READ_CONTACTS)
 
-    val callEvent = DataLiveEvent<String>()
-    val contactId = MutableLiveData(0L)
+    private val _contactId = MutableLiveData(0L)
+    private val _callEvent = MutableDataLiveEvent<String>()
 
-    private val phonesLiveData get() = phonesRepository.getPhones(if (contactId.value == 0L) null else contactId.value) as PhonesLiveData
+    val contactId = _contactId as LiveData<Long>
+    val callEvent = _callEvent as DataLiveEvent<String>
 
 
-    override fun onFilterChanged(filter: String?) {
-        super.onFilterChanged(filter)
-        phonesLiveData.filter = filter
-    }
+    override fun getItemsFlow(filter: String?): Flow<List<PhoneAccount>> =
+        phonesRepository.getPhones(if (contactId.value == 0L) null else contactId.value, filter)
 
     override fun onItemRightClick(item: PhoneAccount) {
         super.onItemRightClick(item)
         permissions.runWithPermissions(arrayOf(READ_PHONE_STATE, CALL_PHONE), {
-            callEvent.call(item.number)
+            _callEvent.call(item.number)
         }, {
-            errorEvent.call(R.string.error_no_permissions_make_call)
+            onError(R.string.error_no_permissions_make_call)
         })
     }
 
@@ -52,17 +52,11 @@ class PhonesViewState @Inject constructor(
         clipboardManager.setPrimaryClip(
             ClipData.newPlainText("Copied number", item.number)
         )
-        messageEvent.call(R.string.number_copied_to_clipboard)
-    }
-
-    override fun getItemsObservable(callback: (LiveData<List<PhoneAccount>>) -> Unit) {
-        permissions.runWithReadContactsPermissions {
-            onPermissionsChanged(it)
-            if (it) callback.invoke(phonesLiveData)
-        }
+        onMessage(R.string.number_copied_to_clipboard)
     }
 
     fun onContactId(contactId: Long) {
-        this.contactId.value = contactId
+        _contactId.value = contactId
+        updateItemsFlow()
     }
 }
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/prompt/PromptFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/prompt/PromptFragment.kt
index af791dfbb..998c3d997 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/prompt/PromptFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/prompt/PromptFragment.kt
@@ -9,7 +9,7 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class PromptFragment @Inject constructor() : BaseFragment<PromptViewState>() {
-    private var _onItemClickListener: (Boolean) -> Unit = {}
+    private var _onItemClickListener: (Boolean) -> Boolean = { true }
 
     override val contentView by lazy { binding.root }
     override val viewState: PromptViewState by viewModels()
@@ -19,21 +19,22 @@ class PromptFragment @Inject constructor() : BaseFragment<PromptViewState>() {
 
     override fun onSetup() {
         binding.apply {
-            viewState.title.value = args.getString(ARG_TITLE)
-            viewState.subtitle.value = args.getString(ARG_SUBTITLE)
 
             promptButtonNo.setOnClickListener {
-                viewState.onNoClick()
-                _onItemClickListener.invoke(false)
+                viewState.onActivated(!_onItemClickListener.invoke(false))
             }
 
             promptButtonYes.setOnClickListener {
-                viewState.onYesClick()
-                _onItemClickListener.invoke(true)
+                viewState.onActivated(_onItemClickListener.invoke(true))
             }
         }
 
         viewState.apply {
+            onTitle(args.getString(ARG_TITLE))
+            onSubtitle(args.getString(ARG_SUBTITLE))
+            onActivated(args.getBoolean(ARG_IS_ACTIVATED, true))
+
+
             title.observe(this@PromptFragment) {
                 binding.promptTitle.text = it
             }
@@ -41,10 +42,15 @@ class PromptFragment @Inject constructor() : BaseFragment<PromptViewState>() {
             subtitle.observe(this@PromptFragment) {
                 binding.promptSubtitle.text = it
             }
+
+            isActivated.observe(this@PromptFragment) {
+                binding.promptButtonNo.isActivated = !it
+                binding.promptButtonYes.isActivated = it
+            }
         }
     }
 
-    fun setOnItemClickListener(onItemClickListener: (Boolean) -> Unit) {
+    fun setOnItemClickListener(onItemClickListener: (Boolean) -> Boolean) {
         _onItemClickListener = onItemClickListener
     }
 
@@ -52,12 +58,15 @@ class PromptFragment @Inject constructor() : BaseFragment<PromptViewState>() {
     companion object {
         const val ARG_TITLE = "title"
         const val ARG_SUBTITLE = "subtitle"
+        const val ARG_IS_ACTIVATED = "is_activated"
 
-        fun newInstance(title: String, subtitle: String) = PromptFragment().apply {
-            arguments = Bundle().apply {
-                putString(ARG_TITLE, title)
-                putString(ARG_SUBTITLE, subtitle)
+        fun newInstance(title: String, subtitle: String, isActivated: Boolean) =
+            PromptFragment().apply {
+                arguments = Bundle().apply {
+                    putString(ARG_TITLE, title)
+                    putString(ARG_SUBTITLE, subtitle)
+                    putBoolean(ARG_IS_ACTIVATED, isActivated)
+                }
             }
-        }
     }
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/prompt/PromptViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/prompt/PromptViewState.kt
index db41803ce..d5ba76d4c 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/prompt/PromptViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/prompt/PromptViewState.kt
@@ -1,5 +1,6 @@
 package com.chooloo.www.chooloolib.ui.prompt
 
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.chooloo.www.chooloolib.ui.base.BaseViewState
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -7,15 +8,24 @@ import javax.inject.Inject
 
 @HiltViewModel
 class PromptViewState @Inject constructor() : BaseViewState() {
-    val title = MutableLiveData<String>()
-    val subtitle = MutableLiveData<String>()
+    private val _title = MutableLiveData<String?>()
+    private val _subtitle = MutableLiveData<String?>()
+    private val _isActivated = MutableLiveData(false)
 
-    
-    fun onNoClick() {
-        finishEvent.call()
+    val title: LiveData<String?> get() = _title
+    val subtitle: LiveData<String?> get() = _subtitle
+    val isActivated: LiveData<Boolean> get() = _isActivated
+
+
+    fun onTitle(title: String?) {
+        _title.value = title
+    }
+
+    fun onSubtitle(subtitle: String?) {
+        _subtitle.value = subtitle
     }
 
-    fun onYesClick() {
-        finishEvent.call()
+    fun onActivated(isActivated: Boolean) {
+        _isActivated.value = isActivated
     }
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/RecentFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/RecentFragment.kt
index c3a400762..e2f4529cc 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/RecentFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/RecentFragment.kt
@@ -4,10 +4,7 @@ import android.os.Bundle
 import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
-import com.chooloo.www.chooloolib.R
 import com.chooloo.www.chooloolib.databinding.RecentBinding
-import com.chooloo.www.chooloolib.di.factory.fragment.FragmentFactory
-import com.chooloo.www.chooloolib.interactor.dialog.DialogsInteractor
 import com.chooloo.www.chooloolib.interactor.prompt.PromptsInteractor
 import com.chooloo.www.chooloolib.interactor.telecom.TelecomInteractor
 import com.chooloo.www.chooloolib.ui.base.BaseFragment
@@ -27,51 +24,31 @@ class RecentFragment @Inject constructor() : BaseFragment<RecentViewState>() {
     private val binding by lazy { RecentBinding.inflate(layoutInflater) }
 
     @Inject lateinit var prompts: PromptsInteractor
-    @Inject lateinit var dialogs: DialogsInteractor
-    @Inject lateinit var fragmentFactory: FragmentFactory
     @Inject lateinit var telecomInteractor: TelecomInteractor
 
 
     override fun onSetup() {
         binding.recentContactImage.isVisible = false
 
-        binding.apply {
-            recentButtonMore.setOnClickListener {
-                viewState.onMoreClick()
-            }
-
-            recentMainActions.recentButtonSms.setOnClickListener {
-                viewState.onSms()
-            }
-
-            recentMainActions.recentButtonCall.setOnClickListener {
-                viewState.onCall()
-            }
-
-            recentMainActions.recentButtonContact.setOnClickListener {
-                viewState.onOpenContact()
-            }
-
-            recentMainActions.recentButtonAddContact.setOnClickListener {
-                viewState.onAddContact()
-            }
-
+        binding.recentMainActions.apply {
+            recentButtonSms.setOnClickListener { viewState.onSms() }
+            recentButtonCall.setOnClickListener { viewState.onCall() }
+            recentButtonMore.setOnClickListener { viewState.onMoreClick() }
+            recentButtonContact.setOnClickListener { viewState.onOpenContact() }
+            recentButtonAddContact.setOnClickListener { viewState.onAddContact() }
         }
 
         viewState.apply {
             onRecentId(args.getLong(ARG_RECENT_ID))
-            menuViewState.recentId.value = args.getLong(ARG_RECENT_ID)
+            isBlocked.observe(this@RecentFragment, menuViewState::onIsBlocked)
+            recentNumber.observe(this@RecentFragment, menuViewState::onRecentNumber)
+            typeImage.observe(this@RecentFragment, binding.recentTypeImage::setImageResource)
 
             imageUri.observe(this@RecentFragment) {
                 binding.recentContactImage.isVisible = true
                 Picasso.with(baseActivity).load(it).into(binding.recentContactImage)
             }
 
-            typeImage.observe(this@RecentFragment) {
-                binding.recentTypeImage.setImageResource(it)
-            }
-            typeImage.observe(this@RecentFragment, binding.recentTypeImage::setImageResource)
-
             name.observe(this@RecentFragment) {
                 binding.recentTextName.text = it
             }
@@ -80,14 +57,6 @@ class RecentFragment @Inject constructor() : BaseFragment<RecentViewState>() {
                 binding.recentCaption.text = it
             }
 
-            isBlocked.observe(this@RecentFragment) {
-                menuViewState.isBlocked.value = it
-            }
-
-            recentNumber.observe(this@RecentFragment) {
-                menuViewState.recentNumber.value = it
-            }
-
             isContactVisible.observe(this@RecentFragment) {
                 binding.recentMainActions.recentButtonContact.isVisible = it
             }
@@ -115,19 +84,19 @@ class RecentFragment @Inject constructor() : BaseFragment<RecentViewState>() {
             showRecentEvent.observe(this@RecentFragment) { ev ->
                 ev.ifNew?.let { prompts.showFragment(fragmentFactory.getRecentFragment(it)) }
             }
-
-            confirmRecentDeleteEvent.observe(this@RecentFragment) {
-                it.ifNew?.let {
-                    dialogs.askForValidation(R.string.explain_delete_recent) { result ->
-                        if (result) viewState.onConfirmDelete()
-                    }
-                }
-            }
         }
 
         historyViewState.itemClickedEvent.observe(this) {
             it.ifNew?.let { recent -> viewState.onRecentClick(recent.id) }
         }
+
+        menuViewState.apply {
+            finishEvent.observe(this@RecentFragment) {
+                viewState.onFinish()
+            }
+
+            onRecentId(args.getLong(ARG_RECENT_ID))
+        }
     }
 
     companion object {
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/RecentViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/RecentViewState.kt
index c41ab5bfd..48baf0392 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/RecentViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/RecentViewState.kt
@@ -1,49 +1,53 @@
 package com.chooloo.www.chooloolib.ui.recent
 
 import android.net.Uri
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import com.chooloo.www.chooloolib.interactor.blocked.BlockedInteractor
-import com.chooloo.www.chooloolib.interactor.drawable.DrawablesInteractor
+import androidx.lifecycle.viewModelScope
+import com.chooloo.www.chooloolib.data.model.RecentAccount
 import com.chooloo.www.chooloolib.interactor.navigation.NavigationsInteractor
-import com.chooloo.www.chooloolib.interactor.permission.PermissionsInteractor
 import com.chooloo.www.chooloolib.interactor.phoneaccounts.PhonesInteractor
-import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor
 import com.chooloo.www.chooloolib.interactor.recents.RecentsInteractor
-import com.chooloo.www.chooloolib.model.RecentAccount
 import com.chooloo.www.chooloolib.ui.base.BaseViewState
-import com.chooloo.www.chooloolib.util.DataLiveEvent
-import com.chooloo.www.chooloolib.util.LiveEvent
-import com.chooloo.www.chooloolib.util.getElapsedTimeString
+import com.chooloo.www.chooloolib.util.*
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
 class RecentViewState @Inject constructor(
     private val phones: PhonesInteractor,
     private val recents: RecentsInteractor,
-    private val blocked: BlockedInteractor,
-    private val drawables: DrawablesInteractor,
-    private val preferences: PreferencesInteractor,
     private val navigations: NavigationsInteractor,
-    private val permissions: PermissionsInteractor
 ) :
     BaseViewState() {
-    val name = MutableLiveData<String?>()
-    val imageUri = MutableLiveData<Uri>()
-    val recentId = MutableLiveData(0L)
-    val typeImage = MutableLiveData<Int>()
-    val caption = MutableLiveData<String>()
-    val isBlocked = MutableLiveData<Boolean>()
-    val recentNumber = MutableLiveData<String>()
-
-    val isContactVisible = MutableLiveData(false)
-    val isAddContactVisible = MutableLiveData(false)
-
-    val showMoreEvent = LiveEvent()
-    val callEvent = DataLiveEvent<String>()
-    val confirmRecentDeleteEvent = LiveEvent()
-    val showRecentEvent = DataLiveEvent<Long>()
-    val showContactEvent = DataLiveEvent<Long>()
+    private val _name = MutableLiveData<String?>()
+    private val _imageUri = MutableLiveData<Uri>()
+    private val _recentId = MutableLiveData(0L)
+    private val _typeImage = MutableLiveData<Int>()
+    private val _caption = MutableLiveData<String>()
+    private val _isBlocked = MutableLiveData<Boolean>()
+    private val _recentNumber = MutableLiveData<String>()
+    private val _isContactVisible = MutableLiveData(false)
+    private val _isAddContactVisible = MutableLiveData(false)
+    private val _showMoreEvent = MutableLiveEvent()
+    private val _callEvent = MutableDataLiveEvent<String>()
+    private val _showRecentEvent = MutableDataLiveEvent<Long>()
+    private val _showContactEvent = MutableDataLiveEvent<Long>()
+
+    val name = _name as LiveData<String?>
+    val caption = _caption as LiveData<String>
+    val imageUri = _imageUri as LiveData<Uri>
+    val recentId = _recentId as LiveData<Long>
+    val typeImage = _typeImage as LiveData<Int>
+    val isBlocked = _isBlocked as LiveData<Boolean>
+    val recentNumber = _recentNumber as LiveData<String>
+    val isContactVisible = _isContactVisible as LiveData<Boolean>
+    val isAddContactVisible = _isAddContactVisible as LiveData<Boolean>
+    val showMoreEvent = _showMoreEvent as LiveEvent
+    val callEvent = _callEvent as DataLiveEvent<String>
+    val showRecentEvent = _showRecentEvent as DataLiveEvent<Long>
+    val showContactEvent = _showContactEvent as DataLiveEvent<Long>
 
     private var _recent: RecentAccount? = null
 
@@ -54,23 +58,26 @@ class RecentViewState @Inject constructor(
     }
 
     fun onRecentId(recentId: Long) {
-        this.recentId.value = recentId
-        recents.observeRecent(recentId) {
-            _recent = it
-            recentNumber.value = it?.number
-            name.value =
-                if (_recent!!.cachedName?.isNotEmpty() == true) it?.cachedName else it?.number
-            it?.type?.let { typeImage.value = recents.getCallTypeImage(it) }
-
-            caption.value = "${it?.relativeTime} • ${
-                if (it?.duration ?: -1 > 0L) "${
-                    getElapsedTimeString(it?.duration!!)
-                } •" else ""
-            }"
-            phones.lookupAccount(it?.number) {
-                it?.photoUri?.let { imageUri.value = Uri.parse(it) }
-                isContactVisible.value = it?.name != null
-                isAddContactVisible.value = it?.name == null
+        _recentId.value = recentId
+        viewModelScope.launch {
+            recents.getRecent(recentId).collect {
+                _recent = it
+                it?.number?.let { _recentNumber.value = it }
+                _name.value =
+                    if (_recent?.cachedName?.isNotEmpty() == true) it?.cachedName else it?.number
+                it?.type?.let { _typeImage.value = recents.getCallTypeImage(it) }
+
+                _caption.value = "${it?.relativeTime ?: ""} • ${
+                    if ((it?.duration ?: -1) > 0L) "${
+                        getElapsedTimeString(it?.duration!!)
+                    } •" else ""
+                }"
+
+                phones.lookupAccount(it?.number).also { phoneLookupAccount ->
+                    phoneLookupAccount?.photoUri?.let { pu -> _imageUri.value = Uri.parse(pu) }
+                    _isContactVisible.value = phoneLookupAccount?.name != null
+                    _isAddContactVisible.value = phoneLookupAccount?.name == null
+                }
             }
         }
     }
@@ -80,31 +87,25 @@ class RecentViewState @Inject constructor(
     }
 
     fun onCall() {
-        recentNumber.value?.let { callEvent.call(it) }
+        recentNumber.value?.let(_callEvent::call)
     }
 
     fun onAddContact() {
-        recentNumber.value?.let { navigations.addContact(it) }
+        recentNumber.value?.let(navigations::addContact)
     }
 
     fun onOpenContact() {
-        phones.lookupAccount(recentNumber.value) { account ->
+        viewModelScope.launch {
+            val account = phones.lookupAccount(recentNumber.value)
             account?.contactId?.let(navigations::viewContact)
         }
     }
 
     fun onRecentClick(recentId: Long) {
-        showRecentEvent.call(recentId)
-    }
-
-    fun onConfirmDelete() {
-        recentId.value?.let {
-            recents.deleteRecent(it)
-            finishEvent.call()
-        }
+        _showRecentEvent.call(recentId)
     }
 
     fun onMoreClick() {
-        showMoreEvent.call()
+        _showMoreEvent.call()
     }
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/menu/RecentMenuFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/menu/RecentMenuFragment.kt
index 195c7ee54..541459f38 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/menu/RecentMenuFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/menu/RecentMenuFragment.kt
@@ -3,7 +3,6 @@ package com.chooloo.www.chooloolib.ui.recent.menu
 import android.view.MenuItem
 import androidx.fragment.app.activityViewModels
 import com.chooloo.www.chooloolib.R
-import com.chooloo.www.chooloolib.di.factory.fragment.FragmentFactory
 import com.chooloo.www.chooloolib.interactor.dialog.DialogsInteractor
 import com.chooloo.www.chooloolib.interactor.prompt.PromptsInteractor
 import com.chooloo.www.chooloolib.ui.base.menu.BaseMenuFragment
@@ -14,32 +13,34 @@ import javax.inject.Inject
 class RecentMenuFragment @Inject constructor() : BaseMenuFragment() {
     override val viewState: RecentMenuViewState by activityViewModels()
 
-    @Inject lateinit var prompts: PromptsInteractor
-    @Inject lateinit var dialogs: DialogsInteractor
-    @Inject lateinit var fragmentFactory: FragmentFactory
+    @Inject
+    lateinit var prompts: PromptsInteractor
+
+    @Inject
+    lateinit var dialogs: DialogsInteractor
+
 
     override fun onSetup() {
         super.onSetup()
         viewState.apply {
-            showHistoryEvent.observe(this@RecentMenuFragment) { ev ->
-                ev.ifNew?.let {
-                    prompts.showFragment(fragmentFactory.getRecentsHistoryFragment(viewState.recentNumber.value))
-                }
-            }
-
             isBlocked.observe(this@RecentMenuFragment) {
                 changeItemVisibility(R.id.menu_recent_block, !it)
                 changeItemVisibility(R.id.menu_recent_unblock, it)
             }
-        }
-    }
 
-    override fun onMenuItemClick(menuItem: MenuItem) {
-        if (menuItem.itemId == R.id.menu_brief_contact_delete) {
-            dialogs.askForValidation(R.string.explain_delete_contact) { bl ->
-                if (bl) viewState.onDelete()
+            showHistoryEvent.observe(this@RecentMenuFragment) {
+                it.ifNew?.let {
+                    prompts.showFragment(fragmentFactory.getRecentsHistoryFragment(viewState.recentNumber.value))
+                }
+            }
+
+            confirmDeleteEvent.observe(this@RecentMenuFragment) {
+                it.ifNew?.let {
+                    dialogs.askForValidation(R.string.explain_delete_contact) { bl ->
+                        if (bl) viewState.onDelete()
+                    }
+                }
             }
         }
-        super.onMenuItemClick(menuItem)
     }
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/menu/RecentMenuViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/menu/RecentMenuViewState.kt
index 190df08cb..3767e6936 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/menu/RecentMenuViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recent/menu/RecentMenuViewState.kt
@@ -1,7 +1,9 @@
 package com.chooloo.www.chooloolib.ui.recent.menu
 
 import android.Manifest
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
 import com.chooloo.www.chooloolib.R
 import com.chooloo.www.chooloolib.interactor.blocked.BlockedInteractor
 import com.chooloo.www.chooloolib.interactor.navigation.NavigationsInteractor
@@ -9,7 +11,9 @@ import com.chooloo.www.chooloolib.interactor.permission.PermissionsInteractor
 import com.chooloo.www.chooloolib.interactor.recents.RecentsInteractor
 import com.chooloo.www.chooloolib.ui.base.menu.BaseMenuViewState
 import com.chooloo.www.chooloolib.util.LiveEvent
+import com.chooloo.www.chooloolib.util.MutableLiveEvent
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
@@ -21,10 +25,17 @@ class RecentMenuViewState @Inject constructor(
 ) : BaseMenuViewState() {
     override val menuResList = listOf(R.menu.menu_recent_extra)
 
-    val recentId = MutableLiveData<Long>()
-    val isBlocked = MutableLiveData<Boolean>()
-    val recentNumber = MutableLiveData<String>()
-    val showHistoryEvent = LiveEvent()
+    private val _recentId = MutableLiveData<Long>()
+    private val _isBlocked = MutableLiveData<Boolean>()
+    private val _recentNumber = MutableLiveData<String>()
+    private val _showHistoryEvent = MutableLiveEvent()
+    private val _confirmDeleteEvent = MutableLiveEvent()
+
+    val recentId = _recentId as LiveData<Long>
+    val isBlocked = _isBlocked as LiveData<Boolean>
+    val recentNumber = _recentNumber as LiveData<String>
+    val showHistoryEvent = _showHistoryEvent as LiveEvent
+    val confirmDeleteEvent = _confirmDeleteEvent as LiveEvent
 
     override fun onMenuItemClick(itemId: Int) {
         super.onMenuItemClick(itemId)
@@ -33,11 +44,12 @@ class RecentMenuViewState @Inject constructor(
             R.id.menu_recent_whatsapp -> onOpenWhatsapp()
             R.id.menu_recent_block -> onBlock(true)
             R.id.menu_recent_unblock -> onBlock(false)
+            R.id.menu_recent_delete -> _confirmDeleteEvent.call()
         }
     }
 
     fun onShowHistory() {
-        showHistoryEvent.call()
+        _showHistoryEvent.call()
     }
 
     fun onOpenWhatsapp() {
@@ -47,23 +59,37 @@ class RecentMenuViewState @Inject constructor(
     fun onBlock(isBlock: Boolean) {
         permissions.runWithDefaultDialer(R.string.error_not_default_dialer_blocked) {
             recentNumber.value?.let {
-                if (isBlock) {
-                    blocked.blockNumber(it)
-                } else {
-                    blocked.unblockNumber(it)
+                viewModelScope.launch {
+                    if (isBlock) {
+                        blocked.blockNumber(it)
+                    } else {
+                        blocked.unblockNumber(it)
+                    }
                 }
-                isBlocked.value = isBlock
-                finishEvent.call()
+                _isBlocked.value = isBlock
+                onFinish()
             }
         }
     }
 
     fun onDelete() {
         permissions.runWithPermissions(arrayOf(Manifest.permission.WRITE_CALL_LOG), {
-            recentId.value?.let { recents.deleteRecent(it) }
-            finishEvent.call()
+            recentId.value?.let(recents::deleteRecent)
+            onFinish()
         }, {
-            errorEvent.call(R.string.error_no_permissions_edit_call_log)
+            onError(R.string.error_no_permissions_edit_call_log)
         })
     }
+
+    fun onRecentId(recentId: Long) {
+        _recentId.value = recentId
+    }
+
+    fun onIsBlocked(isBlocked: Boolean) {
+        _isBlocked.value = isBlocked
+    }
+
+    fun onRecentNumber(recentNumber: String) {
+        _recentNumber.value = recentNumber
+    }
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsFragment.kt
index 92765e134..2527e5acf 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsFragment.kt
@@ -3,10 +3,9 @@ package com.chooloo.www.chooloolib.ui.recents
 import android.os.Bundle
 import androidx.fragment.app.activityViewModels
 import com.chooloo.www.chooloolib.adapter.RecentsAdapter
-import com.chooloo.www.chooloolib.di.factory.fragment.FragmentFactory
+import com.chooloo.www.chooloolib.data.model.RecentAccount
 import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor
 import com.chooloo.www.chooloolib.interactor.prompt.PromptsInteractor
-import com.chooloo.www.chooloolib.model.RecentAccount
 import com.chooloo.www.chooloolib.ui.list.ListFragment
 import com.chooloo.www.chooloolib.ui.recentshistory.RecentsHistoryViewState
 import dagger.hilt.android.AndroidEntryPoint
@@ -17,14 +16,15 @@ open class RecentsFragment @Inject constructor() : ListFragment<RecentAccount, R
     @Inject override lateinit var adapter: RecentsAdapter
     override val viewState: RecentsViewState by activityViewModels()
 
+    private val recentsHistoryViewState: RecentsHistoryViewState by activityViewModels()
+
     @Inject lateinit var prompts: PromptsInteractor
-    @Inject lateinit var fragmentFactory: FragmentFactory
     @Inject lateinit var preferences: PreferencesInteractor
-    private val recentsHistoryViewState: RecentsHistoryViewState by activityViewModels()
 
 
     override fun onSetup() {
         super.onSetup()
+
         adapter.groupSimilar = args.getBoolean(ARG_IS_GROUPED, preferences.isGroupRecents)
 
         viewState.showRecentEvent.observe(this@RecentsFragment) { ev ->
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsViewState.kt
index 72145e037..e6acda6d8 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recents/RecentsViewState.kt
@@ -4,62 +4,47 @@ import android.Manifest.permission.READ_CALL_LOG
 import android.Manifest.permission.READ_CONTACTS
 import android.content.ClipData
 import android.content.ClipboardManager
-import androidx.lifecycle.LiveData
 import com.chooloo.www.chooloolib.R
+import com.chooloo.www.chooloolib.data.model.RecentAccount
+import com.chooloo.www.chooloolib.data.repository.recents.RecentsRepository
 import com.chooloo.www.chooloolib.interactor.permission.PermissionsInteractor
-import com.chooloo.www.chooloolib.livedata.RecentsLiveData
-import com.chooloo.www.chooloolib.model.RecentAccount
-import com.chooloo.www.chooloolib.repository.recents.RecentsRepository
 import com.chooloo.www.chooloolib.ui.list.ListViewState
 import com.chooloo.www.chooloolib.util.DataLiveEvent
+import com.chooloo.www.chooloolib.util.MutableDataLiveEvent
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 @HiltViewModel
 open class RecentsViewState @Inject constructor(
-    recentsRepository: RecentsRepository,
-    private val permissions: PermissionsInteractor,
-    private val clipboardManager: ClipboardManager
+    permissions: PermissionsInteractor,
+    private val clipboardManager: ClipboardManager,
+    private val recentsRepository: RecentsRepository,
 ) :
-    ListViewState<RecentAccount>() {
+    ListViewState<RecentAccount>(permissions) {
 
     override val noResultsIconRes = R.drawable.history
     override val noResultsTextRes = R.string.error_no_results_recents
-    override var noPermissionsTextRes = R.string.error_no_permissions_recents
+    override val permissionsImageRes = R.drawable.history
+    override val permissionsTextRes = R.string.error_no_permissions_recents
+    override val requiredPermissions = listOf(READ_CALL_LOG, READ_CONTACTS)
 
-    private val recentsLiveData = recentsRepository.getRecents() as RecentsLiveData
+    private val _showRecentEvent = MutableDataLiveEvent<RecentAccount>()
 
-    val showRecentEvent = DataLiveEvent<RecentAccount>()
+    val showRecentEvent = _showRecentEvent as DataLiveEvent<RecentAccount>
 
 
-    override fun onFilterChanged(filter: String?) {
-        super.onFilterChanged(filter)
-        if (permissions.hasSelfPermissions(arrayOf(READ_CONTACTS, READ_CALL_LOG))) {
-            onPermissionsChanged(true)
-            recentsLiveData.filter = filter
-        }
-    }
-
     override fun onItemClick(item: RecentAccount) {
         super.onItemClick(item)
-        permissions.runWithReadCallLogPermissions { showRecentEvent.call(item) }
+        _showRecentEvent.call(item)
     }
 
     override fun onItemLongClick(item: RecentAccount) {
         super.onItemLongClick(item)
         clipboardManager.setPrimaryClip(ClipData.newPlainText("Copied number", item.number))
-        messageEvent.call(R.string.number_copied_to_clipboard)
+        onMessage(R.string.number_copied_to_clipboard)
     }
 
-    override fun getItemsObservable(callback: (LiveData<List<RecentAccount>>) -> Unit) {
-        permissions.runWithReadCallLogPermissions { clp ->
-            if (!clp) noPermissionsTextRes = R.string.error_no_permissions_recents
-            onPermissionsChanged(clp)
-            permissions.runWithReadContactsPermissions { rcp ->
-                if (!rcp) noPermissionsTextRes = R.string.error_no_permissions_contacts
-                onPermissionsChanged(clp && rcp)
-                if (clp && rcp) callback.invoke(recentsLiveData)
-            }
-        }
-    }
-}
\ No newline at end of file
+    override fun getItemsFlow(filter: String?): Flow<List<RecentAccount>>? =
+        recentsRepository.getRecents(filter)
+}
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recentshistory/RecentsHistoryViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recentshistory/RecentsHistoryViewState.kt
index bfa389689..0f427db3d 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recentshistory/RecentsHistoryViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/recentshistory/RecentsHistoryViewState.kt
@@ -2,7 +2,7 @@ package com.chooloo.www.chooloolib.ui.recentshistory
 
 import android.content.ClipboardManager
 import com.chooloo.www.chooloolib.interactor.permission.PermissionsInteractor
-import com.chooloo.www.chooloolib.repository.recents.RecentsRepository
+import com.chooloo.www.chooloolib.data.repository.recents.RecentsRepository
 import com.chooloo.www.chooloolib.ui.recents.RecentsViewState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
@@ -12,5 +12,5 @@ class RecentsHistoryViewState @Inject constructor(
     permissions: PermissionsInteractor,
     clipboardManager: ClipboardManager,
     recentsRepository: RecentsRepository
-) : RecentsViewState(recentsRepository, permissions, clipboardManager) {
+) : RecentsViewState(permissions, clipboardManager, recentsRepository) {
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/settings/SettingsFragment.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/settings/SettingsFragment.kt
index 30cd1f121..12a28b9cf 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/settings/SettingsFragment.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/settings/SettingsFragment.kt
@@ -1,6 +1,5 @@
 package com.chooloo.www.chooloolib.ui.settings
 
-import android.view.MenuItem
 import androidx.fragment.app.viewModels
 import com.chooloo.www.chooloolib.R
 import com.chooloo.www.chooloolib.interactor.dialog.DialogsInteractor
@@ -23,12 +22,23 @@ open class SettingsFragment @Inject constructor() : BaseMenuFragment() {
             }
 
             askForThemeModeEvent.observe(this@SettingsFragment) {
-                it.ifNew?.let { dialogs.askForThemeMode(viewState::onThemeModeResponse) }
+                it.ifNew?.let {
+                    dialogs.askForThemeMode {
+                        viewState.onThemeModeResponse(it)
+                        true
+                    }
+                }
             }
 
             askForAnimationsEvent.observe(this@SettingsFragment) {
-                it.ifNew?.let {
-                    dialogs.askForBoolean(R.string.hint_animations, viewState::onAnimationsResponse)
+                it.ifNew?.let { isActivated ->
+                    dialogs.askForBoolean(
+                        R.string.hint_animations,
+                        isActivated
+                    ) {
+                        viewState.onAnimationsResponse(it)
+                        true
+                    }
                 }
             }
         }
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/settings/SettingsViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/settings/SettingsViewState.kt
index 2b1becf20..b00031e01 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/settings/SettingsViewState.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/settings/SettingsViewState.kt
@@ -4,13 +4,14 @@ import com.chooloo.www.chooloolib.R
 import com.chooloo.www.chooloolib.interactor.color.ColorsInteractor
 import com.chooloo.www.chooloolib.interactor.navigation.NavigationsInteractor
 import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor
-import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor.Companion.AccentTheme.*
 import com.chooloo.www.chooloolib.interactor.string.StringsInteractor
 import com.chooloo.www.chooloolib.interactor.theme.ThemesInteractor
 import com.chooloo.www.chooloolib.interactor.theme.ThemesInteractor.ThemeMode
 import com.chooloo.www.chooloolib.ui.base.menu.BaseMenuViewState
 import com.chooloo.www.chooloolib.util.DataLiveEvent
 import com.chooloo.www.chooloolib.util.LiveEvent
+import com.chooloo.www.chooloolib.util.MutableDataLiveEvent
+import com.chooloo.www.chooloolib.util.MutableLiveEvent
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
@@ -25,12 +26,16 @@ open class SettingsViewState @Inject constructor(
     BaseMenuViewState() {
     override val menuResList = listOf(R.menu.menu_chooloo)
 
-    val askForThemeModeEvent = LiveEvent()
-    val askForAnimationsEvent = LiveEvent()
-    val askForColorEvent = DataLiveEvent<Int>()
+    private val _askForThemeModeEvent = MutableLiveEvent()
+    private val _askForAnimationsEvent = MutableDataLiveEvent<Boolean>()
+    private val _askForColorEvent = MutableDataLiveEvent<Int>()
+
+    val askForThemeModeEvent = _askForThemeModeEvent as LiveEvent
+    val askForColorEvent = _askForColorEvent as DataLiveEvent<Int>
+    val askForAnimationsEvent = _askForAnimationsEvent as DataLiveEvent<Boolean>
 
     init {
-        title.value = strings.getString(R.string.settings)
+        _title.value = strings.getString(R.string.settings)
     }
 
     override fun onMenuItemClick(itemId: Int) {
@@ -38,21 +43,20 @@ open class SettingsViewState @Inject constructor(
             R.id.menu_chooloo_rate -> navigations.rateApp()
             R.id.menu_chooloo_email -> navigations.sendEmail()
             R.id.menu_chooloo_report_bugs -> navigations.reportBug()
-            R.id.menu_chooloo_theme_mode -> askForThemeModeEvent.call()
-            R.id.menu_chooloo_animations -> askForAnimationsEvent.call()
-            R.id.menu_chooloo_accent_color -> askForColorEvent.call(R.array.accent_colors)
+            R.id.menu_chooloo_theme_mode -> _askForThemeModeEvent.call()
+            R.id.menu_chooloo_animations -> _askForAnimationsEvent.call(preferences.isAnimations)
             else -> super.onMenuItemClick(itemId)
         }
     }
 
     fun onColorResponse(color: Int) {
-        preferences.accentTheme = when (color) {
-            colors.getColor(R.color.red_primary) -> RED
-            colors.getColor(R.color.blue_primary) -> BLUE
-            colors.getColor(R.color.green_primary) -> GREEN
-            colors.getColor(R.color.purple_primary) -> PURPLE
-            else -> DEFAULT
-        }
+//        preferences.accentTheme = when (color) {
+//            colors.getColor(R.color.red_primary) -> RED
+//            colors.getColor(R.color.primary) -> BLUE
+//            colors.getColor(R.color.green_primary) -> GREEN
+//            colors.getColor(R.color.purple_primary) -> PURPLE
+//            else -> DEFAULT
+//        }
         navigations.goToLauncherActivity()
     }
 
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/CallActions.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/CallActions.kt
deleted file mode 100644
index 94b30ed2d..000000000
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/CallActions.kt
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.chooloo.www.chooloolib.ui.widgets
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import androidx.constraintlayout.motion.widget.MotionLayout
-import com.chooloo.www.chooloolib.R
-import com.chooloo.www.chooloolib.databinding.CallActionsBinding
-
-class CallActions : MotionLayout {
-    private val _binding: CallActionsBinding
-    private var _isBluetoothActivated: Boolean = false
-    private var _callActionsListener: CallActionsListener? = null
-
-    constructor(context: Context) : this(context, null)
-    constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
-    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
-        context,
-        attrs,
-        defStyleAttr
-    ) {
-        _callActionsListener = getEmptyListener()
-
-        _binding = CallActionsBinding.inflate(LayoutInflater.from(context), this, true)
-        _binding.callActionSwap.setOnClickListener { _callActionsListener?.onSwapClick() }
-        _binding.callActionHold.setOnClickListener { _callActionsListener?.onHoldClick() }
-        _binding.callActionMute.setOnClickListener { _callActionsListener?.onMuteClick() }
-        _binding.callActionMerge.setOnClickListener { _callActionsListener?.onMergeClick() }
-        _binding.callActionKeypad.setOnClickListener { _callActionsListener?.onKeypadClick() }
-        _binding.callActionSpeaker.setOnClickListener { _callActionsListener?.onSpeakerClick() }
-        _binding.callActionAddCall.setOnClickListener { _callActionsListener?.onAddCallClick() }
-    }
-
-
-    private fun transitionLayoutTo(constraintRes: Int) {
-        if (_binding.root.currentState != constraintRes) {
-            _binding.root.setTransition(_binding.root.currentState, constraintRes)
-            _binding.root.transitionToEnd()
-        }
-    }
-
-
-    var isHoldActivated: Boolean
-        get() = _binding.callActionHold.isChecked
-        set(value) {
-            _binding.callActionHold.isChecked = value
-        }
-
-    var isMuteActivated: Boolean
-        get() = _binding.callActionMute.isChecked
-        set(value) {
-            _binding.callActionMute.isChecked = value
-        }
-
-    var isSpeakerActivated: Boolean
-        get() = _binding.callActionSpeaker.isChecked
-        set(value) {
-            _binding.callActionSpeaker.isChecked = value
-            _binding.callActionSpeaker.setIconResource(if (value) R.drawable.volume_up else R.drawable.volume_down)
-        }
-
-    var isBluetoothActivated: Boolean
-        get() = _isBluetoothActivated
-        set(value) {
-            _isBluetoothActivated = value
-            if (value) {
-                _binding.callActionSpeaker.setIconResource(R.drawable.bluetooth_searching)
-            } else {
-                isSpeakerActivated = isSpeakerActivated
-            }
-        }
-
-
-    var isHoldEnabled: Boolean
-        get() = _binding.callActionHold.isEnabled
-        set(value) {
-            _binding.callActionHold.isEnabled = value
-        }
-
-    var isMuteEnabled: Boolean
-        get() = _binding.callActionMute.isEnabled
-        set(value) {
-            _binding.callActionMute.isEnabled = value
-        }
-
-    var isSwapEnabled: Boolean
-        get() = _binding.callActionSwap.isEnabled
-        set(value) {
-            _binding.callActionSwap.isEnabled = value
-        }
-
-    var isMergeEnabled: Boolean
-        get() = _binding.callActionMerge.isEnabled
-        set(value) {
-            _binding.callActionMerge.isEnabled = value
-        }
-
-    var isSpeakerEnabled: Boolean
-        get() = _binding.callActionSpeaker.isEnabled
-        set(value) {
-            _binding.callActionSpeaker.isEnabled = value
-        }
-
-
-    fun showSingleCallUI() {
-        transitionLayoutTo(R.id.constraint_set_single_call)
-        _binding.callActionSwap.visibility = GONE
-        _binding.callActionMerge.visibility = GONE
-    }
-
-    fun showMultiCallUI() {
-        transitionLayoutTo(R.id.constraint_set_multi_call)
-        _binding.callActionSwap.visibility = VISIBLE
-        _binding.callActionMerge.visibility = VISIBLE
-    }
-
-    fun setCallActionsListener(callActionsListener: CallActionsListener?) {
-        _callActionsListener = callActionsListener
-    }
-
-
-    private fun getEmptyListener() = object : CallActionsListener {
-        override fun onHoldClick() {}
-        override fun onMuteClick() {}
-        override fun onSwapClick() {}
-        override fun onMergeClick() {}
-        override fun onKeypadClick() {}
-        override fun onSpeakerClick() {}
-        override fun onAddCallClick() {}
-    }
-
-
-    interface CallActionsListener {
-        fun onHoldClick()
-        fun onMuteClick()
-        fun onSwapClick()
-        fun onMergeClick()
-        fun onKeypadClick()
-        fun onSpeakerClick()
-        fun onAddCallClick()
-    }
-}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/DialpadKey.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/DialpadKey.kt
index d2e974f33..cd4d18d50 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/DialpadKey.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/DialpadKey.kt
@@ -34,7 +34,7 @@ class DialpadKey : LinearLayout {
         _digitTextView = TextView(context, attrs, defStyleRes).apply {
             layoutParams = LayoutParams(WRAP_CONTENT, WRAP_CONTENT)
 
-            setTextAppearance(R.style.TextAppearance_Material3_HeadlineMedium)
+            setTextAppearance(R.style.TextAppearance_Material3_HeadlineLarge)
             typeface = ResourcesCompat.getFont(context, R.font.google_sans_bold)
         }.also {
             addView(it)
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/IconButton.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/IconButton.kt
index 11ac165ed..4c6966f93 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/IconButton.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/IconButton.kt
@@ -3,18 +3,25 @@ package com.chooloo.www.chooloolib.ui.widgets
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.res.ColorStateList
-import android.graphics.drawable.Drawable
 import android.util.AttributeSet
-import androidx.core.content.ContextCompat.getDrawable
+import android.widget.ImageButton
+import androidx.annotation.ColorInt
+import androidx.annotation.DrawableRes
 import com.chooloo.www.chooloolib.R
 import com.chooloo.www.chooloolib.util.getAttrColor
-import com.google.android.material.button.MaterialButton
 
 
 @SuppressLint("CustomViewStyleable", "WrongConstant")
-class IconButton : MaterialButton {
-    private var _iconDefault: Drawable? = null
-    private var _iconChecked: Drawable? = null
+class IconButton : ImageButton {
+    @DrawableRes private var _iconDefault: Int? = null
+    @DrawableRes private var _iconChecked: Int? = null
+
+    @ColorInt private val _defaultForegroundTint: Int
+    @ColorInt private val _defaultBackgroundTint: Int
+
+    private val _colorBackground by lazy { context.getAttrColor(R.attr.colorSecondaryContainer) }
+    private val _colorForeground by lazy { context.getAttrColor(R.attr.colorOnSecondaryContainer) }
+    private val _colorForegroundDisabled by lazy { context.getAttrColor(R.attr.colorBackgroundVariant) }
 
 
     constructor(context: Context) : this(context, null)
@@ -22,24 +29,54 @@ class IconButton : MaterialButton {
     constructor(
         context: Context,
         attrs: AttributeSet? = null,
-        defStyleRes: Int = 0
+        defStyleRes: Int = R.style.Chooloo_Button_Secondary
     ) : super(context, attrs, defStyleRes) {
-        context.obtainStyledAttributes(attrs, R.styleable.Chooloo_IconButton, defStyleRes, 0).also {
-            val iconRes = it.getResourceId(R.styleable.Chooloo_IconButton_checkedIcon, NO_ID)
-            _iconChecked = if (iconRes == NO_ID) null else getDrawable(context, iconRes)
+        var isActivated = false
+        context.obtainStyledAttributes(attrs, R.styleable.Chooloo_IconButton, 0, defStyleRes).also {
+            val iconRes = it.getResourceId(R.styleable.Chooloo_IconButton_icon, NO_ID)
+            val checkedIconRes = it.getResourceId(R.styleable.Chooloo_IconButton_checkedIcon, NO_ID)
+            isActivated = it.getBoolean(R.styleable.Chooloo_IconButton_activated, false)
+
+            _iconDefault = if (iconRes == NO_ID) null else iconRes
+            _iconChecked = if (checkedIconRes == NO_ID) null else checkedIconRes
         }.recycle()
 
-        _iconDefault = icon
+        _defaultForegroundTint = imageTintList?.defaultColor ?: _colorForeground
+        _defaultBackgroundTint = backgroundTintList?.defaultColor ?: _colorBackground
+
+        setIcon(_iconDefault)
+        refreshColors()
+        setActivated(isActivated)
+    }
+
+    override fun setActivated(activated: Boolean) {
+        super.setActivated(activated)
+        (if (isActivated) _iconChecked else _iconDefault)?.let(::setIcon)
+        refreshColors()
+    }
+
+    private fun refreshColors() {
+        imageTintList =
+            ColorStateList.valueOf(
+                if (isEnabled) {
+                    if (isActivated) _defaultBackgroundTint else _defaultForegroundTint
+                } else {
+                    _colorForegroundDisabled
+                }
+            )
+        backgroundTintList =
+            ColorStateList.valueOf(if (isActivated) _defaultForegroundTint else _defaultBackgroundTint)
+    }
+
+    fun setIcon(@DrawableRes iconRes: Int?) {
+        iconRes?.let(::setImageResource)
+    }
 
-        if (isCheckable && !isChecked && isEnabled) {
-            iconTint = ColorStateList.valueOf(context.getAttrColor(R.attr.colorPrimary))
-        }
+    fun setDefaultIcon(@DrawableRes iconRes: Int?) {
+        _iconDefault = iconRes
     }
 
-    override fun setChecked(checked: Boolean) {
-        super.setChecked(checked)
-        _iconChecked?.let {
-            (if (isChecked) _iconChecked else _iconDefault)?.let { icon = it }
-        }
+    fun setCheckedIcon(@DrawableRes iconRes: Int?) {
+        _iconChecked = iconRes
     }
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/SearchBar.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/SearchBar.kt
index b4570a00a..e6640243a 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/SearchBar.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/SearchBar.kt
@@ -24,8 +24,8 @@ class SearchBar : TextInputLayout {
     private var _textInputEditText: TextInputEditText
     private var _onTextChangedListener: ((text: String) -> Unit?)? = null
 
-    private val colorBackground by lazy { context.getAttrColor(R.attr.colorSurfaceVariant) }
-    private val colorForeground by lazy { context.getAttrColor(R.attr.colorOnSurfaceVariant) }
+    private val colorBackground by lazy { context.getAttrColor(R.attr.colorSecondaryContainer) }
+    private val colorForeground by lazy { context.getAttrColor(R.attr.colorOnSecondaryContainer) }
     private val spacing by lazy { resources.getDimensionPixelSize(R.dimen.default_spacing) }
     private val spacingSmall by lazy { resources.getDimensionPixelSize(R.dimen.default_spacing_small) }
 
@@ -60,8 +60,8 @@ class SearchBar : TextInputLayout {
                 return@InputFilter null
             })
 
-            setTextAppearance(R.style.TextAppearance_Material3_TitleSmall)
             setPadding(spacing, 0, spacingSmall, 0)
+            setTextAppearance(R.style.Chooloo_Text_Title_Small)
             setHintTextColor(ColorStateList.valueOf(colorForeground))
 
             addTextChangedListener(
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/listitemholder/ChoiceItemHolder.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/listitemholder/ChoiceItemHolder.kt
index 68ac6e94b..8b89628cd 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/listitemholder/ChoiceItemHolder.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/listitemholder/ChoiceItemHolder.kt
@@ -2,19 +2,32 @@ package com.chooloo.www.chooloolib.ui.widgets.listitemholder
 
 import com.chooloo.www.chooloolib.R
 import com.chooloo.www.chooloolib.databinding.ListItemBinding
-import com.google.android.material.internal.ViewUtils
+import com.chooloo.www.chooloolib.util.getAttrColor
 
 class ChoiceItemHolder(binding: ListItemBinding) : ListItemHolder(binding) {
     val dimenSpacingSmall by lazy { context.resources.getDimensionPixelSize(R.dimen.default_spacing_small) }
-    val dimenSpacingMedium by lazy { context.resources.getDimensionPixelSize(R.dimen.default_spacing_medium) }
+    private val _defaultBackgroundColor: Int
+    private val _defaultTextColor: Int
 
     init {
         isImageVisible = false
-        isRightButtonVisible = true
 
-        setRightButtonIcon(R.drawable.chevron_right)
-        binding.root.setPadding(dimenSpacingSmall, dimenSpacingSmall, dimenSpacingSmall, dimenSpacingSmall)
-        binding.listItemMainLayout.strokeWidth = ViewUtils.dpToPx(context, 1).toInt()
-        binding.listItemMainConstraintLayout.setPadding(dimenSpacingSmall, dimenSpacingSmall, 0, dimenSpacingSmall)
+        _defaultTextColor = context.getAttrColor(R.attr.colorOnSurfaceVariant)
+        _defaultBackgroundColor = context.getAttrColor(R.attr.colorSurfaceVariant)
+
+        binding.root.setPadding(dimenSpacing, dimenSpacingSmall, dimenSpacing, dimenSpacingSmall)
+        binding.listItemTitle.setTextColor(_defaultTextColor)
+        binding.listItemMainLayout.setCardBackgroundColor(_defaultBackgroundColor)
+        binding.listItemMainConstraintLayout.setPadding(
+            dimenSpacing,
+            dimenSpacing,
+            0,
+            dimenSpacing
+        )
+    }
+
+    fun setSelected(isSelected: Boolean) {
+        binding.listItemMainLayout.setCardBackgroundColor(if (isSelected) context.getAttrColor(R.attr.colorSecondaryContainer) else _defaultBackgroundColor)
+        binding.listItemTitle.setTextColor(if (isSelected) context.getAttrColor(R.attr.colorOnSecondaryContainer) else _defaultTextColor)
     }
 }
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/listitemholder/ListItemHolder.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/listitemholder/ListItemHolder.kt
index 2b80e2560..7854e6088 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/listitemholder/ListItemHolder.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/widgets/listitemholder/ListItemHolder.kt
@@ -1,6 +1,7 @@
 package com.chooloo.www.chooloolib.ui.widgets.listitemholder
 
 import android.content.res.ColorStateList
+import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.text.Spannable
@@ -8,7 +9,9 @@ import android.text.SpannableString
 import android.text.style.ForegroundColorSpan
 import android.view.View
 import android.widget.TextView
+import androidx.annotation.ColorInt
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import com.chooloo.www.chooloolib.R
@@ -16,7 +19,6 @@ import com.chooloo.www.chooloolib.databinding.ListItemBinding
 import com.chooloo.www.chooloolib.util.getAttrColor
 import com.github.abdularis.civ.AvatarImageView.Companion.SHOW_IMAGE
 import com.github.abdularis.civ.AvatarImageView.Companion.SHOW_INITIAL
-import com.squareup.picasso.Picasso
 
 open class ListItemHolder(protected val binding: ListItemBinding) :
     RecyclerView.ViewHolder(binding.root) {
@@ -137,12 +139,12 @@ open class ListItemHolder(protected val binding: ListItemBinding) :
 
     fun setImageUri(imageUri: Uri?) {
         showImageOrInitials = imageUri != null
-        Picasso.with(context).load(imageUri).into(binding.listItemImage)
+        binding.listItemImage.setImageURI(imageUri)
     }
 
     fun setImageResource(imageRes: Int) {
         showImageOrInitials = true
-        Picasso.with(context).load(imageRes).into(binding.listItemImage)
+        binding.listItemImage.setImageResource(imageRes)
     }
 
     fun setImageDrawable(drawable: Drawable) {
@@ -156,11 +158,12 @@ open class ListItemHolder(protected val binding: ListItemBinding) :
     }
 
     fun setLeftButtonIcon(iconRes: Int) {
-        binding.listItemLeftButton.setIconResource(iconRes)
+        binding.listItemLeftButton.setImageResource(iconRes)
     }
 
     fun setLeftButtonIconTint(tintRes: Int) {
-        binding.listItemLeftButton.setIconTintResource(tintRes)
+        binding.listItemLeftButton.imageTintList =
+            ColorStateList.valueOf(ContextCompat.getColor(context, tintRes))
     }
 
     fun setLeftButtonBackgroundTint(tintRes: Int) {
@@ -169,13 +172,19 @@ open class ListItemHolder(protected val binding: ListItemBinding) :
     }
 
     fun setRightButtonIcon(iconRes: Int) {
-        binding.listItemRightButton.setIconResource(iconRes)
+        binding.listItemRightButton.setImageResource(iconRes)
     }
 
     fun setRightButtonIconTint(tintRes: Int) {
-        binding.listItemRightButton.setIconTintResource(tintRes)
+        binding.listItemRightButton.imageTintList =
+            ColorStateList.valueOf(ContextCompat.getColor(context, tintRes))
     }
 
+    fun setRightButtonIconTintColor(@ColorInt color: Int) {
+        binding.listItemRightButton.imageTintList = ColorStateList.valueOf(color)
+    }
+
+
     fun setRightButtonBackgroundTint(tintRes: Int) {
         binding.listItemRightButton.backgroundTintList =
             ColorStateList.valueOf(context.getColor(tintRes))
@@ -189,9 +198,4 @@ open class ListItemHolder(protected val binding: ListItemBinding) :
                     height = size
                 }
     }
-
-    fun setSelected() {
-        binding.listItemMainLayout.strokeColor = context.getAttrColor(R.attr.colorPrimary)
-        binding.listItemTitle.setTextColor(context.getAttrColor(R.attr.colorPrimary))
-    }
 }
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/util/GridSpacingItemDecoration.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/util/GridSpacingItemDecoration.kt
new file mode 100644
index 000000000..4a23e2a1a
--- /dev/null
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/util/GridSpacingItemDecoration.kt
@@ -0,0 +1,37 @@
+package com.chooloo.www.chooloolib.util
+
+import android.graphics.Rect
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+
+class GridSpacingItemDecoration(
+    private val spanCount: Int,
+    private val spacing: Int,
+    private val includeEdge: Boolean
+) : RecyclerView.ItemDecoration() {
+    override fun getItemOffsets(
+        outRect: Rect,
+        view: View,
+        parent: RecyclerView,
+        state: RecyclerView.State
+    ) {
+        val position = parent.getChildAdapterPosition(view); // item position
+        val column = position % spanCount; // item column
+
+        outRect.left =
+            if (includeEdge) spacing - column * spacing / spanCount else column * spacing / spanCount
+        outRect.right =
+            if (includeEdge) (column + 1) * spacing / spanCount else spacing - (column + 1) * spacing / spanCount
+
+        if (includeEdge) {
+            if (position < spanCount) { // top edge
+                outRect.top = spacing;
+            }
+            outRect.bottom = spacing; // item bottom
+        } else {
+            if (position >= spanCount) {
+                outRect.top = spacing; // item top
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/util/LiveEvent.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/util/LiveEvent.kt
index f2e6c2070..79442d8bf 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/util/LiveEvent.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/util/LiveEvent.kt
@@ -1,19 +1,29 @@
 package com.chooloo.www.chooloolib.util
 
-import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.LiveData
 
-class DataLiveEvent<T> : MutableLiveData<Event<T?>> {
+open class DataLiveEvent<T> : LiveData<Event<T?>> {
+    constructor() : super()
+    constructor(value: T) : this(Event(value))
+    constructor(value: Event<T>) : super(value)
+}
+
+class MutableDataLiveEvent<T> : DataLiveEvent<T> {
     constructor() : super()
     constructor(value: T) : this(Event(value))
     constructor(value: Event<T>) : super(value)
 
     fun call(value: T) {
-        this@DataLiveEvent.value = Event(value)
+        this.value = Event(value)
     }
 }
 
-class LiveEvent : MutableLiveData<Event<Int>>() {
+open class LiveEvent : LiveData<Event<Int>>() {
+}
+
+class MutableLiveEvent : LiveEvent() {
     fun call() {
         value = Event(0)
     }
-}
\ No newline at end of file
+}
+
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/util/StringUtils.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/util/StringUtils.kt
index 354ba523d..6e77d842c 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/util/StringUtils.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/util/StringUtils.kt
@@ -2,4 +2,12 @@ package com.chooloo.www.chooloolib.util
 
 
 fun String.initials() =
-    split(' ').mapNotNull { it.firstOrNull()?.toString() }.reduce { acc, s -> acc + s }
\ No newline at end of file
+    split(' ').mapNotNull { it.firstOrNull()?.toString() }.reduce { acc, s -> acc + s }
+
+fun String.isRTL() = if (length < 1) {
+    true
+} else {
+    val directionality = Character.getDirectionality(get(0))
+    directionality == Character.DIRECTIONALITY_RIGHT_TO_LEFT ||
+            directionality == Character.DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC
+}
\ No newline at end of file
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/util/ViewUtils.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/util/ViewUtils.kt
index 3760ce757..bdee81fa2 100644
--- a/chooloolib/src/main/java/com/chooloo/www/chooloolib/util/ViewUtils.kt
+++ b/chooloolib/src/main/java/com/chooloo/www/chooloolib/util/ViewUtils.kt
@@ -7,15 +7,6 @@ import android.util.TypedValue
 import androidx.annotation.ColorInt
 import androidx.core.content.ContextCompat
 
-fun Context.navBarHeight(): Int {
-    val resource = resources.getIdentifier("navigation_bar_height", "dimen", "android")
-    return if (resource > 0) resources.getDimensionPixelSize(resource) else 0
-}
-
-fun Context.hasNavBar(): Boolean {
-    val resource = resources.getIdentifier("config_showNavigationBar", "bool", "android")
-    return resource > 0 && resources.getBoolean(resource)
-}
 
 fun Context.getSizeInDp(px: Int) =
     (px * resources.displayMetrics.density + 0.5f).toInt()
diff --git a/chooloolib/src/main/res/drawable/backspace.xml b/chooloolib/src/main/res/drawable/backspace.xml
new file mode 100644
index 000000000..0b7e9cef9
--- /dev/null
+++ b/chooloolib/src/main/res/drawable/backspace.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M10.75,15.05Q10.95,15.275 11.238,15.275Q11.525,15.275 11.725,15.05L13.8,13L15.85,15.05Q16.075,15.275 16.363,15.275Q16.65,15.275 16.85,15.05Q17.075,14.85 17.075,14.562Q17.075,14.275 16.85,14.05L14.8,12L16.85,9.925Q17.075,9.725 17.075,9.438Q17.075,9.15 16.85,8.95Q16.65,8.725 16.363,8.725Q16.075,8.725 15.85,8.95L13.8,11L11.725,8.95Q11.525,8.725 11.238,8.725Q10.95,8.725 10.75,8.95Q10.525,9.15 10.525,9.438Q10.525,9.725 10.75,9.925L12.8,12L10.75,14.05Q10.525,14.275 10.525,14.562Q10.525,14.85 10.75,15.05ZM9.325,18.35Q8.8,18.35 8.35,18.1Q7.9,17.85 7.625,17.425L4.45,13Q4.15,12.55 4.15,12Q4.15,11.45 4.45,11L7.625,6.55Q7.9,6.125 8.35,5.887Q8.8,5.65 9.325,5.65H18.55Q19.25,5.65 19.75,6.15Q20.25,6.65 20.25,7.375V16.625Q20.25,17.35 19.75,17.85Q19.25,18.35 18.55,18.35ZM5.475,12 L8.8,16.7Q8.875,16.8 9,16.875Q9.125,16.95 9.275,16.95H18.55Q18.65,16.95 18.75,16.85Q18.85,16.75 18.85,16.625V7.375Q18.85,7.25 18.75,7.15Q18.65,7.05 18.55,7.05H9.275Q9.125,7.05 9,7.125Q8.875,7.2 8.8,7.3ZM18.85,12V7.3Q18.85,7.2 18.85,7.125Q18.85,7.05 18.85,7.05Q18.85,7.05 18.85,7.15Q18.85,7.25 18.85,7.375V16.625Q18.85,16.75 18.85,16.85Q18.85,16.95 18.85,16.95Q18.85,16.95 18.85,16.875Q18.85,16.8 18.85,16.7Z"/>
+</vector>
diff --git a/chooloolib/src/main/res/drawable/bubble_background.xml b/chooloolib/src/main/res/drawable/bubble_background.xml
index 342b1cab9..756d12e00 100644
--- a/chooloolib/src/main/res/drawable/bubble_background.xml
+++ b/chooloolib/src/main/res/drawable/bubble_background.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?colorSurface">
-
+    android:color="?colorControlHighlight">
     <item>
         <shape android:shape="rectangle">
             <corners android:radius="@dimen/corner_radius" />
diff --git a/chooloolib/src/main/res/drawable/bubble_background_no_ripple.xml b/chooloolib/src/main/res/drawable/bubble_background_no_ripple.xml
deleted file mode 100644
index 490c5d596..000000000
--- a/chooloolib/src/main/res/drawable/bubble_background_no_ripple.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="@dimen/corner_radius" />
-    <solid android:color="?colorSecondary" />
-</shape>
diff --git a/chooloolib/src/main/res/drawable/call.xml b/chooloolib/src/main/res/drawable/call.xml
index 013a39163..a0a0cd670 100644
--- a/chooloolib/src/main/res/drawable/call.xml
+++ b/chooloolib/src/main/res/drawable/call.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M19.425,20.45Q16.525,20.45 13.663,19.062Q10.8,17.675 8.55,15.425Q6.3,13.175 4.913,10.325Q3.525,7.475 3.525,4.55Q3.525,4.1 3.825,3.8Q4.125,3.5 4.575,3.5H7.825Q8.225,3.5 8.512,3.737Q8.8,3.975 8.875,4.35L9.45,7.3Q9.5,7.675 9.425,7.975Q9.35,8.275 9.1,8.5L6.8,10.75Q8,12.75 9.637,14.375Q11.275,16 13.35,17.2L15.575,14.95Q15.825,14.7 16.163,14.6Q16.5,14.5 16.85,14.55L19.625,15.125Q20,15.2 20.238,15.475Q20.475,15.75 20.475,16.15V19.4Q20.475,19.85 20.175,20.15Q19.875,20.45 19.425,20.45ZM6.1,9.325 L7.875,7.625Q7.925,7.575 7.938,7.512Q7.95,7.45 7.925,7.4L7.5,5.15Q7.475,5.075 7.425,5.037Q7.375,5 7.3,5H5.175Q5.1,5 5.062,5.037Q5.025,5.075 5.025,5.125Q5.1,6.15 5.363,7.212Q5.625,8.275 6.1,9.325ZM18.85,18.9Q18.9,18.9 18.938,18.862Q18.975,18.825 18.975,18.775V16.675Q18.975,16.6 18.938,16.55Q18.9,16.5 18.825,16.475L16.725,16.05Q16.675,16.025 16.625,16.05Q16.575,16.075 16.525,16.1L14.75,17.9Q15.75,18.375 16.825,18.625Q17.9,18.875 18.85,18.9ZM14.775,17.9Q14.775,17.9 14.775,17.9Q14.775,17.9 14.775,17.9Q14.775,17.9 14.775,17.9Q14.775,17.9 14.775,17.9Q14.775,17.9 14.775,17.9Q14.775,17.9 14.775,17.9Q14.775,17.9 14.775,17.9Q14.775,17.9 14.775,17.9ZM6.1,9.325Q6.1,9.325 6.1,9.325Q6.1,9.325 6.1,9.325Q6.1,9.325 6.1,9.325Q6.1,9.325 6.1,9.325Q6.1,9.325 6.1,9.325Q6.1,9.325 6.1,9.325Q6.1,9.325 6.1,9.325Q6.1,9.325 6.1,9.325Z"/>
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19.425,20.45Q16.525,20.45 13.663,19.062Q10.8,17.675 8.55,15.425Q6.3,13.175 4.913,10.325Q3.525,7.475 3.525,4.55Q3.525,4.1 3.825,3.8Q4.125,3.5 4.575,3.5H7.825Q8.225,3.5 8.512,3.737Q8.8,3.975 8.875,4.35L9.45,7.3Q9.5,7.675 9.425,7.975Q9.35,8.275 9.1,8.5L6.8,10.75Q8,12.75 9.637,14.375Q11.275,16 13.35,17.2L15.575,14.95Q15.825,14.7 16.163,14.6Q16.5,14.5 16.85,14.55L19.625,15.125Q20,15.2 20.238,15.475Q20.475,15.75 20.475,16.15V19.4Q20.475,19.85 20.175,20.15Q19.875,20.45 19.425,20.45ZM6.1,9.325 L7.875,7.625Q7.925,7.575 7.938,7.512Q7.95,7.45 7.925,7.4L7.5,5.15Q7.475,5.075 7.425,5.037Q7.375,5 7.3,5H5.175Q5.1,5 5.062,5.037Q5.025,5.075 5.025,5.125Q5.1,6.15 5.363,7.212Q5.625,8.275 6.1,9.325ZM18.85,18.9Q18.9,18.9 18.938,18.862Q18.975,18.825 18.975,18.775V16.675Q18.975,16.6 18.938,16.55Q18.9,16.5 18.825,16.475L16.725,16.05Q16.675,16.025 16.625,16.05Q16.575,16.075 16.525,16.1L14.75,17.9Q15.75,18.375 16.825,18.625Q17.9,18.875 18.85,18.9ZM14.775,17.9Q14.775,17.9 14.775,17.9Q14.775,17.9 14.775,17.9Q14.775,17.9 14.775,17.9Q14.775,17.9 14.775,17.9Q14.775,17.9 14.775,17.9Q14.775,17.9 14.775,17.9Q14.775,17.9 14.775,17.9Q14.775,17.9 14.775,17.9ZM6.1,9.325Q6.1,9.325 6.1,9.325Q6.1,9.325 6.1,9.325Q6.1,9.325 6.1,9.325Q6.1,9.325 6.1,9.325Q6.1,9.325 6.1,9.325Q6.1,9.325 6.1,9.325Q6.1,9.325 6.1,9.325Q6.1,9.325 6.1,9.325Z" />
 </vector>
diff --git a/chooloolib/src/main/res/drawable/circle_background.xml b/chooloolib/src/main/res/drawable/circle_background.xml
new file mode 100644
index 000000000..5cb31f881
--- /dev/null
+++ b/chooloolib/src/main/res/drawable/circle_background.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?colorControlHighlight">
+    <item>
+        <shape android:shape="oval" />
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/chooloolib/src/main/res/drawable/icon_button_color_selector.xml b/chooloolib/src/main/res/drawable/icon_button_color_selector.xml
deleted file mode 100644
index 2472d18bc..000000000
--- a/chooloolib/src/main/res/drawable/icon_button_color_selector.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Disabled -->
-    <item android:alpha="@dimen/material_emphasis_disabled" android:color="?attr/colorOnSurface" android:state_enabled="false" />
-
-    <!-- Uncheckable -->
-    <item android:color="?attr/colorOnContainer" android:state_checkable="false" />
-
-    <!-- Checked Buttons. -->
-    <item android:color="?attr/colorOnSecondaryContainer" android:state_checked="true" />
-
-    <!-- Not-checked Buttons. -->
-    <item android:color="?attr/colorOnSurface" />
-</selector>
diff --git a/chooloolib/src/main/res/drawable/more_vert.xml b/chooloolib/src/main/res/drawable/more_vert.xml
index a07f3abf9..861113087 100644
--- a/chooloolib/src/main/res/drawable/more_vert.xml
+++ b/chooloolib/src/main/res/drawable/more_vert.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?colorOnSecondaryContainer"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,19.275Q11.375,19.275 10.938,18.837Q10.5,18.4 10.5,17.775Q10.5,17.15 10.938,16.712Q11.375,16.275 12,16.275Q12.625,16.275 13.062,16.712Q13.5,17.15 13.5,17.775Q13.5,18.4 13.062,18.837Q12.625,19.275 12,19.275ZM12,13.5Q11.375,13.5 10.938,13.062Q10.5,12.625 10.5,12Q10.5,11.375 10.938,10.938Q11.375,10.5 12,10.5Q12.625,10.5 13.062,10.938Q13.5,11.375 13.5,12Q13.5,12.625 13.062,13.062Q12.625,13.5 12,13.5ZM12,7.725Q11.375,7.725 10.938,7.287Q10.5,6.85 10.5,6.225Q10.5,5.6 10.938,5.162Q11.375,4.725 12,4.725Q12.625,4.725 13.062,5.162Q13.5,5.6 13.5,6.225Q13.5,6.85 13.062,7.287Q12.625,7.725 12,7.725Z"/>
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?colorOnSecondaryContainer"
+        android:pathData="M12,19.275Q11.375,19.275 10.938,18.837Q10.5,18.4 10.5,17.775Q10.5,17.15 10.938,16.712Q11.375,16.275 12,16.275Q12.625,16.275 13.062,16.712Q13.5,17.15 13.5,17.775Q13.5,18.4 13.062,18.837Q12.625,19.275 12,19.275ZM12,13.5Q11.375,13.5 10.938,13.062Q10.5,12.625 10.5,12Q10.5,11.375 10.938,10.938Q11.375,10.5 12,10.5Q12.625,10.5 13.062,10.938Q13.5,11.375 13.5,12Q13.5,12.625 13.062,13.062Q12.625,13.5 12,13.5ZM12,7.725Q11.375,7.725 10.938,7.287Q10.5,6.85 10.5,6.225Q10.5,5.6 10.938,5.162Q11.375,4.725 12,4.725Q12.625,4.725 13.062,5.162Q13.5,5.6 13.5,6.225Q13.5,6.85 13.062,7.287Q12.625,7.725 12,7.725Z" />
 </vector>
diff --git a/chooloolib/src/main/res/drawable/phone_msg.xml b/chooloolib/src/main/res/drawable/phone_msg.xml
new file mode 100644
index 000000000..8880aa5cb
--- /dev/null
+++ b/chooloolib/src/main/res/drawable/phone_msg.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12.375,11.85V4.5Q12.375,4.15 12.625,3.9Q12.875,3.65 13.225,3.65H19.425Q19.8,3.65 20.05,3.9Q20.3,4.15 20.3,4.525V8.65Q20.3,9 20.05,9.25Q19.8,9.5 19.425,9.5H14.725ZM13.775,5.05V8.1ZM13.775,8.1H18.9V5.05H13.775ZM19.275,20.25Q16.45,20.25 13.65,18.875Q10.85,17.5 8.65,15.3Q6.45,13.1 5.075,10.325Q3.7,7.55 3.7,4.7Q3.7,4.275 4,3.975Q4.3,3.675 4.725,3.675H7.85Q8.25,3.675 8.525,3.912Q8.8,4.15 8.875,4.525L9.45,7.375Q9.5,7.725 9.425,8.012Q9.35,8.3 9.1,8.525L6.875,10.725Q8.05,12.75 9.663,14.337Q11.275,15.925 13.375,17.175L15.625,14.9Q15.85,14.675 16.125,14.587Q16.4,14.5 16.725,14.55L19.45,15.1Q19.825,15.175 20.062,15.462Q20.3,15.75 20.3,16.125V19.2Q20.3,19.65 20,19.95Q19.7,20.25 19.275,20.25ZM6.2,9.4 L7.975,7.7Q8.025,7.65 8.038,7.587Q8.05,7.525 8.025,7.475L7.575,5.225Q7.55,5.15 7.513,5.112Q7.475,5.075 7.4,5.075H5.275Q5.2,5.075 5.162,5.112Q5.125,5.15 5.125,5.225Q5.175,6.225 5.45,7.287Q5.725,8.35 6.2,9.4ZM18.775,18.8Q18.825,18.8 18.863,18.763Q18.9,18.725 18.9,18.675V16.575Q18.9,16.5 18.863,16.45Q18.825,16.4 18.75,16.375L16.675,15.925Q16.625,15.925 16.587,15.938Q16.55,15.95 16.5,16L14.7,17.8Q15.675,18.275 16.75,18.525Q17.825,18.775 18.775,18.8ZM14.7,17.8Q14.7,17.8 14.7,17.8Q14.7,17.8 14.7,17.8Q14.7,17.8 14.7,17.8Q14.7,17.8 14.7,17.8Q14.7,17.8 14.7,17.8Q14.7,17.8 14.7,17.8Q14.7,17.8 14.7,17.8Q14.7,17.8 14.7,17.8ZM6.2,9.4Q6.2,9.4 6.2,9.4Q6.2,9.4 6.2,9.4Q6.2,9.4 6.2,9.4Q6.2,9.4 6.2,9.4Q6.2,9.4 6.2,9.4Q6.2,9.4 6.2,9.4Q6.2,9.4 6.2,9.4Q6.2,9.4 6.2,9.4Z"/>
+</vector>
diff --git a/chooloolib/src/main/res/drawable/selector_button_background.xml b/chooloolib/src/main/res/drawable/selector_button_background.xml
new file mode 100644
index 000000000..8bb276212
--- /dev/null
+++ b/chooloolib/src/main/res/drawable/selector_button_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?colorSurface" android:state_activated="true" />
+    <item android:color="@android:color/transparent" />
+</selector>
\ No newline at end of file
diff --git a/chooloolib/src/main/res/drawable/swipe_indicator_background.xml b/chooloolib/src/main/res/drawable/swipe_indicator_background.xml
deleted file mode 100644
index 81c10f958..000000000
--- a/chooloolib/src/main/res/drawable/swipe_indicator_background.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners
-        android:bottomLeftRadius="@dimen/corner_radius"
-        android:bottomRightRadius="@dimen/corner_radius"
-        android:topLeftRadius="@dimen/corner_radius"
-        android:topRightRadius="@dimen/corner_radius" />
-    <solid android:color="#DADADA" />
-</shape>
\ No newline at end of file
diff --git a/chooloolib/src/main/res/layout/bottom_dialog.xml b/chooloolib/src/main/res/layout/bottom_dialog.xml
index 9a0940fff..4fbd2b1b6 100644
--- a/chooloolib/src/main/res/layout/bottom_dialog.xml
+++ b/chooloolib/src/main/res/layout/bottom_dialog.xml
@@ -6,16 +6,6 @@
     android:layout_height="wrap_content"
     android:fitsSystemWindows="true">
 
-    <!--    <View-->
-    <!--        android:id="@+id/bottom_dialog_fragment_swipe_indicator"-->
-    <!--        android:layout_width="@dimen/swipe_indicator_width"-->
-    <!--        android:layout_height="@dimen/swipe_indicator_height"-->
-    <!--        android:layout_margin="@dimen/swipe_indicator_margin"-->
-    <!--        android:background="@drawable/swipe_indicator_background"-->
-    <!--        app:layout_constraintEnd_toEndOf="parent"-->
-    <!--        app:layout_constraintStart_toStartOf="parent"-->
-    <!--        app:layout_constraintTop_toTopOf="parent" />-->
-
     <FrameLayout
         android:id="@+id/bottom_dialog_fragment_placeholder"
         android:layout_width="match_parent"
diff --git a/chooloolib/src/main/res/layout/brief_contact.xml b/chooloolib/src/main/res/layout/brief_contact.xml
index c278e0384..b677d5755 100644
--- a/chooloolib/src/main/res/layout/brief_contact.xml
+++ b/chooloolib/src/main/res/layout/brief_contact.xml
@@ -3,82 +3,82 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:paddingBottom="@dimen/default_spacing"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:paddingBottom="@dimen/default_spacing">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <com.chooloo.www.chooloolib.ui.widgets.IconButton
-            android:id="@+id/brief_contact_button_more"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/default_spacing"
-            style="@style/Chooloo.Button.Icon"
-            app:icon="@drawable/more_vert"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
 
-        <com.chooloo.www.chooloolib.ui.widgets.IconButton
-            android:id="@+id/brief_contact_icon_fav"
-            style="@style/Chooloo.Button.Icon"
-            android:layout_width="wrap_content"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/brief_contact_name_layout"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/default_spacing"
-            android:visibility="gone"
-            app:layout_constraintTop_toTopOf="parent"
-            app:icon="@drawable/star"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <com.google.android.material.imageview.ShapeableImageView
-            android:id="@+id/brief_contact_image"
-            android:layout_width="@dimen/image_size_big"
-            android:layout_height="0dp"
-            android:layout_marginTop="@dimen/default_spacing_big"
-            android:background="?colorPrimary"
-            android:src="@drawable/person"
-            android:tint="?colorSurface"
-            app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/brief_contact_button_more"
-            app:shapeAppearanceOverlay="@style/Chooloo.Image.Profile" />
+            app:layout_constraintTop_toTopOf="parent">
 
-        <TextView
-            android:id="@+id/brief_contact_text_name"
-            android:layout_marginStart="@dimen/default_spacing"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/default_spacing"
-            android:maxLines="2"
-            android:layout_marginEnd="@dimen/default_spacing"
-            android:textAppearance="@style/Chooloo.Text.HeadlineSmall"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/brief_contact_image"
-            tools:text="Jesus" />
+            <ImageView
+                android:id="@+id/brief_contact_icon_fav"
+                android:layout_width="@dimen/icon_button_size_small"
+                android:layout_height="@dimen/icon_button_size_small"
+                android:layout_marginStart="@dimen/default_spacing"
+                android:background="@android:color/transparent"
+                android:src="@drawable/star"
+                android:visibility="gone"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:tint="?colorSecondaryContainer" />
 
-        <TextView
-            android:id="@+id/brief_contact_text_number"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/default_spacing_small"
-            android:textAppearance="@style/Chooloo.Text.Body"
-            app:layout_constraintEnd_toEndOf="@id/brief_contact_text_name"
-            app:layout_constraintStart_toStartOf="@id/brief_contact_text_name"
-            app:layout_constraintTop_toBottomOf="@id/brief_contact_text_name"
-            tools:text="023804932" />
+            <TextView
+                android:id="@+id/brief_contact_text_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/default_spacing_big"
+                android:layout_marginTop="@dimen/default_spacing"
+                android:layout_marginEnd="@dimen/default_spacing"
+                android:maxLines="2"
+                android:textAppearance="@style/Chooloo.Text.Headline"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/brief_contact_icon_fav"
+                tools:text="Jesus" />
+
+            <TextView
+                android:id="@+id/brief_contact_text_number"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/default_spacing_small"
+                android:textAppearance="@style/Chooloo.Text.Body"
+                app:layout_constraintStart_toStartOf="@id/brief_contact_text_name"
+                app:layout_constraintTop_toBottomOf="@id/brief_contact_text_name"
+                tools:text="023804932" />
+
+            <com.google.android.material.imageview.ShapeableImageView
+                android:id="@+id/brief_contact_image"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginEnd="@dimen/default_spacing_big"
+                android:background="?colorSurface"
+                android:backgroundTint="?colorSurface"
+                android:src="@drawable/person"
+                android:tint="?colorOnSurface"
+                app:layout_constraintBottom_toBottomOf="@id/brief_contact_text_number"
+                app:layout_constraintDimensionRatio="1:1"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@id/brief_contact_text_name"
+                app:shapeAppearanceOverlay="@style/Chooloo.Image.Profile" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <include
             android:id="@+id/brief_contact_main_actions"
             layout="@layout/brief_contact_main_actions"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginTop="@dimen/default_spacing_big"
+            android:layout_margin="@dimen/default_spacing"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/brief_contact_text_number" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/brief_contact_name_layout" />
 
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/brief_contact_phones_fragment_container"
@@ -95,8 +95,8 @@
             android:id="@+id/brief_contact_accounts_fragment_container"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            app:layout_constraintEnd_toEndOf="parent"
             android:backgroundTint="?colorSurface"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/brief_contact_phones_fragment_container" />
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/chooloolib/src/main/res/layout/brief_contact_main_actions.xml b/chooloolib/src/main/res/layout/brief_contact_main_actions.xml
index 27e749f64..0adcb6e4e 100644
--- a/chooloolib/src/main/res/layout/brief_contact_main_actions.xml
+++ b/chooloolib/src/main/res/layout/brief_contact_main_actions.xml
@@ -1,43 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:columnCount="4"
+    android:rowCount="1"
+    android:useDefaultMargins="true">
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/contact_button_call"
-        style="@style/Chooloo.Button.FAB.Large"
-        android:layout_width="wrap_content"
+    <com.chooloo.www.chooloolib.ui.widgets.IconButton
+        android:id="@+id/brief_contact_button_call"
+        style="@style/Chooloo.Button.Primary"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/default_spacing"
+        android:layout_columnWeight="1"
+        android:padding="15dp"
+        android:layout_margin="@dimen/default_spacing_small_plus"
         android:contentDescription="@string/content_description_call"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/call" />
+        android:gravity="center"
+        app:icon='@drawable/call' />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
+    <com.chooloo.www.chooloolib.ui.widgets.IconButton
         android:id="@+id/brief_contact_button_edit"
-        style="@style/Chooloo.Button.FAB.Large"
-        android:layout_width="wrap_content"
+        style="@style/Chooloo.Button.Primary"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/default_spacing"
+        android:layout_columnWeight="1"
+        android:layout_margin="@dimen/default_spacing_small_plus"
         android:contentDescription="@string/content_description_edit"
+        android:gravity="center"
+        android:padding="15dp"
+        app:icon="@drawable/edit"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/contact_button_call"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/edit" />
+        app:layout_constraintStart_toEndOf="@id/brief_contact_button_call"
+        app:layout_constraintTop_toTopOf="parent" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
+    <com.chooloo.www.chooloolib.ui.widgets.IconButton
         android:id="@+id/brief_contact_button_sms"
-        style="@style/Chooloo.Button.FAB.Large"
-        android:layout_width="wrap_content"
+        style="@style/Chooloo.Button.Primary"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/default_spacing"
+        android:layout_columnWeight="1"
+        android:layout_margin="@dimen/default_spacing_small_plus"
         android:contentDescription="@string/content_description_sms"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/brief_contact_button_edit"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/chat" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        android:gravity="center"
+        android:padding="15dp"
+        app:icon="@drawable/chat" />
+
+    <com.chooloo.www.chooloolib.ui.widgets.IconButton
+        android:id="@+id/brief_contact_button_more"
+        style="@style/Chooloo.Button.Primary"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_columnWeight="1"
+        android:layout_margin="@dimen/default_spacing_small_plus"
+        android:contentDescription="@string/content_description_menu_button"
+        android:gravity="center"
+        android:padding="15dp"
+        app:icon="@drawable/more_vert" />
+</GridLayout>
diff --git a/chooloolib/src/main/res/layout/call.xml b/chooloolib/src/main/res/layout/call.xml
index 57a39c614..0a1631e70 100644
--- a/chooloolib/src/main/res/layout/call.xml
+++ b/chooloolib/src/main/res/layout/call.xml
@@ -2,9 +2,9 @@
 <androidx.constraintlayout.motion.widget.MotionLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:fitsSystemWindows="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     app:layoutDescription="@xml/call_scene"
     tools:context="com.chooloo.www.chooloolib.ui.call.CallActivity">
 
@@ -31,21 +31,20 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/default_spacing"
-        android:textAppearance="@style/TextAppearance.Material3.LabelMedium"
-        android:visibility="invisible"
+        android:textAppearance="@style/Chooloo.Text.Caption"
         app:layout_constraintEnd_toEndOf="parent"
-        tools:text="94:34"
-        tools:visibility="visible"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="94:34"
+        tools:visibility="visible" />
 
     <!-- call status -->
     <TextView
         android:id="@+id/call_state_text"
-        android:textAppearance="@style/TextAppearance.Material3.LabelLarge"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="3dp"
+        android:textAppearance="@style/Chooloo.Text.Title.Small"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/call_time_text"
@@ -63,10 +62,10 @@
     <!-- caller name -->
     <TextView
         android:id="@+id/call_name_text"
-        android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall"
+        style="@style/Chooloo.Text.Headline"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/default_spacing"
+        android:layout_marginTop="@dimen/default_spacing_big"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/call_image"
@@ -75,10 +74,10 @@
     <!-- conference manage button -->
     <Button
         android:id="@+id/call_manage_button"
+        style="@style/Widget.Material3.Button.TonalButton.Icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/default_spacing_big"
-        style="@style/Widget.Material3.Button.TonalButton.Icon"
         android:src="@drawable/group"
         android:text="@string/action_manage_calls"
         app:layout_constraintEnd_toEndOf="parent"
@@ -86,32 +85,32 @@
         app:layout_constraintTop_toBottomOf="@id/call_name_text" />
 
     <!-- call actions -->
-    <com.chooloo.www.chooloolib.ui.widgets.CallActions
+    <com.chooloo.www.chooloolib.ui.callactions.CallActions
         android:id="@+id/call_actions"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
     <!-- answer button -->
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
+    <com.chooloo.www.chooloolib.ui.widgets.IconButton
         android:id="@+id/call_answer_button"
-        android:layout_width="wrap_content"
-        style="@style/Chooloo.Button.FAB.Large"
+        style="@style/Chooloo.Button.Primary"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/default_spacing_big"
-        android:backgroundTint="@color/positive_background"
+        android:backgroundTint="@color/positive"
         android:contentDescription="@string/content_description_answer_button"
+        android:padding="20dp"
         android:src="@drawable/call"
-        android:tint="@color/positive_foreground" />
+        android:tint="@color/on_positive" />
 
     <!-- hangup button -->
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
+    <com.chooloo.www.chooloolib.ui.widgets.IconButton
         android:id="@+id/call_reject_button"
-        android:layout_width="wrap_content"
-        style="@style/Chooloo.Button.FAB.Large"
-        android:backgroundTint="@color/negative_background"
-        android:tint="@color/negative_foreground"
+        style="@style/Chooloo.Button.Primary"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/default_spacing_big"
+        android:backgroundTint="@color/negative"
         android:contentDescription="@string/content_description_reject_button"
-        app:srcCompat="@drawable/call_end" />
+        android:padding="20dp"
+        android:tint="@color/on_negative"
+        app:icon="@drawable/call_end" />
 </androidx.constraintlayout.motion.widget.MotionLayout>
\ No newline at end of file
diff --git a/chooloolib/src/main/res/layout/call_action.xml b/chooloolib/src/main/res/layout/call_action.xml
new file mode 100644
index 000000000..2f4ee1ea1
--- /dev/null
+++ b/chooloolib/src/main/res/layout/call_action.xml
@@ -0,0 +1,6 @@
+<com.chooloo.www.chooloolib.ui.widgets.IconButton xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/call_action_root"
+    style="@style/Chooloo.Button.Primary.Selectable"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="20dp" />
diff --git a/chooloolib/src/main/res/layout/call_actions.xml b/chooloolib/src/main/res/layout/call_actions.xml
index d1e634901..7eaf01d5d 100644
--- a/chooloolib/src/main/res/layout/call_actions.xml
+++ b/chooloolib/src/main/res/layout/call_actions.xml
@@ -1,69 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.motion.widget.MotionLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:layoutDescription="@xml/call_actions_scene">
+    android:layout_height="wrap_content">
 
-    <!-- mute -->
-    <com.chooloo.www.chooloolib.ui.widgets.IconButton
-        style="@style/Chooloo.Button.Icon.Big"
-        android:id="@+id/call_action_mute"
-        android:checkable="true"
-        android:layout_width="wrap_content"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/call_actions_recycler_view"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:checkedIcon="@drawable/mic_off"
-        app:icon="@drawable/mic" />
-
-    <!-- speaker -->
-    <com.chooloo.www.chooloolib.ui.widgets.IconButton
-        style="@style/Chooloo.Button.Icon.Big"
-        android:id="@+id/call_action_speaker"
-        android:layout_width="wrap_content"
-        android:checkable="true"
-        android:layout_height="wrap_content"
-        app:checkedIcon="@drawable/volume_up"
-        app:icon="@drawable/volume_down" />
-
-    <!-- hold -->
-    <com.chooloo.www.chooloolib.ui.widgets.IconButton
-        style="@style/Chooloo.Button.Icon.Big"
-        android:id="@+id/call_action_hold"
-        android:checkable="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:checkedIcon="@drawable/play_arrow"
-        app:icon="@drawable/pause" />
-
-    <!-- add call -->
-    <com.chooloo.www.chooloolib.ui.widgets.IconButton
-        style="@style/Chooloo.Button.Icon.Big"
-        android:id="@+id/call_action_add_call"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        app:icon="@drawable/add" />
-
-    <!-- keypad -->
-    <com.chooloo.www.chooloolib.ui.widgets.IconButton
-        style="@style/Chooloo.Button.Icon.Big"
-        android:id="@+id/call_action_keypad"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:icon="@drawable/dialpad" />
-
-    <!-- swap -->
-    <com.chooloo.www.chooloolib.ui.widgets.IconButton
-        style="@style/Chooloo.Button.Icon.Big"
-        android:id="@+id/call_action_swap"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:icon="@drawable/swap_calls" />
-
-    <!-- merge -->
-    <com.chooloo.www.chooloolib.ui.widgets.IconButton
-        style="@style/Chooloo.Button.Icon.Big"
-        android:id="@+id/call_action_merge"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:icon="@drawable/call_merge" />
-</androidx.constraintlayout.motion.widget.MotionLayout>
\ No newline at end of file
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/chooloolib/src/main/res/layout/dialpad.xml b/chooloolib/src/main/res/layout/dialpad.xml
index e2c0f8039..49fae1877 100644
--- a/chooloolib/src/main/res/layout/dialpad.xml
+++ b/chooloolib/src/main/res/layout/dialpad.xml
@@ -113,23 +113,24 @@
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/dialpad_button_call"
+        style="@style/Chooloo.Button.FAB.Primary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/default_spacing"
-        style="@style/Chooloo.Button.FAB.Large"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:contentDescription="@string/action_call"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:srcCompat="@drawable/call" />
 
     <com.chooloo.www.chooloolib.ui.widgets.IconButton
         android:id="@+id/dialpad_button_delete"
-        style="@style/Chooloo.Button.Icon.Medium"
+        style="@style/Chooloo.Button.Secondary.Icon"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
+        android:layout_margin="@dimen/default_spacing"
+        android:padding="12dp"
         android:visibility="gone"
-        app:icon="@drawable/keyboard_return"
+        app:icon="@drawable/backspace"
         app:layout_constraintBottom_toBottomOf="@id/dialpad_button_call"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.53"
@@ -139,9 +140,11 @@
 
     <com.chooloo.www.chooloolib.ui.widgets.IconButton
         android:id="@+id/dialpad_button_add_contact"
-        style="@style/Chooloo.Button.Icon.Medium"
+        style="@style/Chooloo.Button.Secondary.Icon"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
+        android:layout_margin="@dimen/default_spacing"
+        android:padding="12dp"
         android:visibility="gone"
         app:icon="@drawable/person_add"
         app:layout_constraintBottom_toBottomOf="@id/dialpad_button_call"
diff --git a/chooloolib/src/main/res/layout/list_item.xml b/chooloolib/src/main/res/layout/list_item.xml
index 59248395d..f12bf6d05 100644
--- a/chooloolib/src/main/res/layout/list_item.xml
+++ b/chooloolib/src/main/res/layout/list_item.xml
@@ -13,7 +13,7 @@
         android:layout_marginStart="@dimen/default_spacing"
         android:layout_marginTop="@dimen/default_spacing"
         android:paddingBottom="@dimen/default_spacing"
-        android:textAppearance="@style/Chooloo.Text.Body"
+        android:textAppearance="@style/Chooloo.Text.Title"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Header" />
@@ -89,9 +89,9 @@
                 app:layout_constraintTop_toTopOf="@id/list_item_caption"
                 app:tint="?android:textColorHint" />
 
-            <com.google.android.material.button.MaterialButton
+            <com.chooloo.www.chooloolib.ui.widgets.IconButton
                 android:id="@+id/list_item_left_button"
-                style="@style/Chooloo.Button.Icon.Small"
+                style="@style/Chooloo.Button.Secondary.Icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/default_spacing_small"
@@ -100,9 +100,9 @@
                 app:layout_constraintEnd_toStartOf="@id/list_item_right_button"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <com.google.android.material.button.MaterialButton
+            <com.chooloo.www.chooloolib.ui.widgets.IconButton
                 android:id="@+id/list_item_right_button"
-                style="@style/Chooloo.Button.Icon.Small"
+                style="@style/Chooloo.Button.Secondary.Icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/default_spacing_medium"
diff --git a/chooloolib/src/main/res/layout/menu.xml b/chooloolib/src/main/res/layout/menu.xml
index f79a4dc5b..780944afd 100644
--- a/chooloolib/src/main/res/layout/menu.xml
+++ b/chooloolib/src/main/res/layout/menu.xml
@@ -9,7 +9,7 @@
     <TextView
         android:id="@+id/menu_title"
         android:layout_width="wrap_content"
-        android:textAppearance="@style/Chooloo.Text.HeadlineSmall"
+        android:textAppearance="@style/Chooloo.Text.Headline"
         android:layout_height="wrap_content"
         android:visibility="gone"
         android:layout_marginStart="@dimen/default_spacing"
diff --git a/chooloolib/src/main/res/layout/permission.xml b/chooloolib/src/main/res/layout/permission.xml
new file mode 100644
index 000000000..3967b5197
--- /dev/null
+++ b/chooloolib/src/main/res/layout/permission.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/no_permission_image"
+        android:layout_width="@dimen/image_size_big"
+        android:layout_height="@dimen/image_size_big"
+        android:contentDescription="TODO"
+        app:layout_constraintBottom_toTopOf="@id/no_permission_text"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:srcCompat="@drawable/person"
+        app:tint="?colorSurfaceVariant"
+        tools:tint="#000000" />
+
+    <TextView
+        android:id="@+id/no_permission_text"
+        style="@style/Chooloo.Text.Title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@id/no_permission_button"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/no_permission_image"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="@string/error_no_permissions_contacts" />
+
+    <Button
+        android:id="@+id/no_permission_button"
+        style="@style/Chooloo.Button.Primary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/default_spacing_small"
+        android:text="@string/grant"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/no_permission_text"
+        app:layout_constraintVertical_chainStyle="packed" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/chooloolib/src/main/res/layout/permissioned.xml b/chooloolib/src/main/res/layout/permissioned.xml
new file mode 100644
index 000000000..8fde870f7
--- /dev/null
+++ b/chooloolib/src/main/res/layout/permissioned.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/permissioned_permission_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</FrameLayout>
\ No newline at end of file
diff --git a/chooloolib/src/main/res/layout/prompt.xml b/chooloolib/src/main/res/layout/prompt.xml
index 868a9d876..5b624966e 100644
--- a/chooloolib/src/main/res/layout/prompt.xml
+++ b/chooloolib/src/main/res/layout/prompt.xml
@@ -1,58 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/prompt_title"
-        android:textAppearance="@style/Chooloo.Text.HeadlineSmall"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/default_spacing"
         android:layout_marginTop="@dimen/default_spacing_small"
-        tools:text="This is a title"
         android:layout_marginEnd="@dimen/default_spacing"
+        android:textAppearance="@style/Chooloo.Text.Headline"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="This is a title" />
 
     <TextView
         android:id="@+id/prompt_subtitle"
-        android:textAppearance="@style/Chooloo.Text.Body"
-        tools:text="This is a subtitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="1dp"
         android:layout_marginTop="@dimen/default_spacing_small"
         android:layout_marginEnd="@dimen/default_spacing"
+        android:textAppearance="@style/Chooloo.Text.Body"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/prompt_title"
-        app:layout_constraintTop_toBottomOf="@id/prompt_title" />
+        app:layout_constraintTop_toBottomOf="@id/prompt_title"
+        tools:text="This is a subtitle" />
 
-    <Button
-        style="@style/Chooloo.Button.Tonal"
-        android:id="@+id/prompt_button_yes"
+    <com.chooloo.www.chooloolib.ui.widgets.IconButton
+        android:id="@+id/prompt_button_no"
+        style="@style/Chooloo.Button.Secondary.Icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/default_spacing_big"
-        android:layout_marginEnd="@dimen/default_spacing_small"
+        android:layout_marginEnd="@dimen/default_spacing_medium"
         android:layout_marginBottom="@dimen/default_spacing"
-        android:text="@string/action_yes"
+        app:icon="@drawable/close"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/prompt_button_no"
+        app:layout_constraintEnd_toStartOf="@id/prompt_button_yes"
         app:layout_constraintTop_toBottomOf="@id/prompt_subtitle" />
 
-    <Button
-        style="@style/Chooloo.Button.Text"
-        android:id="@+id/prompt_button_no"
+    <com.chooloo.www.chooloolib.ui.widgets.IconButton
+        android:id="@+id/prompt_button_yes"
+        style="@style/Chooloo.Button.Secondary.Icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/default_spacing_big"
-        android:layout_marginEnd="@dimen/default_spacing"
+        android:layout_marginEnd="@dimen/default_spacing_big"
         android:layout_marginBottom="@dimen/default_spacing"
-        android:text="@string/action_no"
+        app:activated="true"
+        app:icon="@drawable/ic_check"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/prompt_subtitle" />
diff --git a/chooloolib/src/main/res/layout/recent.xml b/chooloolib/src/main/res/layout/recent.xml
index 276bad7f4..0238cfdfb 100644
--- a/chooloolib/src/main/res/layout/recent.xml
+++ b/chooloolib/src/main/res/layout/recent.xml
@@ -3,83 +3,82 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:paddingBottom="@dimen/default_spacing"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:paddingBottom="@dimen/default_spacing">
 
-    <com.chooloo.www.chooloolib.ui.widgets.IconButton
-        android:id="@+id/recent_button_more"
-        style="@style/Chooloo.Button.Icon.Small"
-        android:layout_width="wrap_content"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/recent_name_layout"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/default_spacing"
-        app:icon="@drawable/more_vert"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <com.google.android.material.imageview.ShapeableImageView
-        android:id="@+id/recent_contact_image"
-        android:layout_width="@dimen/image_size_big"
-        android:layout_height="0dp"
-        android:layout_marginTop="@dimen/default_spacing_big"
-        android:background="?colorPrimary"
-        android:src="@drawable/person"
-        android:tint="?colorSurface"
-        app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/recent_button_more"
-        app:shapeAppearanceOverlay="@style/Chooloo.Image.Profile"
-        tools:visibility="visible" />
+        app:layout_constraintTop_toTopOf="parent">
 
-    <TextView
-        android:id="@+id/recent_text_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/default_spacing"
-        android:layout_marginTop="@dimen/default_spacing"
-        android:layout_marginEnd="@dimen/default_spacing"
-        android:textAlignment="center"
-        android:textAppearance="@style/Chooloo.Text.HeadlineSmall"
-        android:maxLines="2"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/recent_contact_image"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="Jesus" />
+        <TextView
+            android:id="@+id/recent_text_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/default_spacing_big"
+            android:layout_marginTop="@dimen/default_spacing"
+            android:layout_marginEnd="@dimen/default_spacing"
+            android:maxLines="2"
+            android:textAlignment="textStart"
+            android:textAppearance="@style/Chooloo.Text.Headline"
+            app:layout_constraintBottom_toTopOf="@id/recent_caption"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_chainStyle="packed"
+            tools:text="Jesus" />
 
-    <TextView
-        android:id="@+id/recent_caption"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/default_spacing_small"
-        android:textAppearance="@style/Chooloo.Text.Body"
-        app:layout_constraintEnd_toStartOf="@id/recent_type_image"
-        app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/recent_text_name"
-        tools:text="2 minutes ago" />
+        <TextView
+            android:id="@+id/recent_caption"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/default_spacing_small"
+            android:textAppearance="@style/Chooloo.Text.Body"
+            app:layout_constraintStart_toStartOf="@id/recent_text_name"
+            app:layout_constraintTop_toBottomOf="@id/recent_text_name"
+            app:layout_constraintVertical_chainStyle="packed"
+            tools:text="2 minutes ago" />
+
+        <com.google.android.material.imageview.ShapeableImageView
+            android:id="@+id/recent_contact_image"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginEnd="@dimen/default_spacing_big"
+            android:background="?colorSurface"
+            android:backgroundTint="?colorSurface"
+            android:src="@drawable/person"
+            android:tint="?colorOnSurface"
+            app:layout_constraintBottom_toBottomOf="@id/recent_caption"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/recent_text_name"
+            app:shapeAppearanceOverlay="@style/Chooloo.Image.Profile"
+            tools:visibility="visible" />
+
+        <com.google.android.material.imageview.ShapeableImageView
+            android:id="@+id/recent_type_image"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="3dp"
+            android:src="@drawable/call_missed"
+            android:tint="?colorPrimary"
+            app:layout_constraintBottom_toBottomOf="@id/recent_caption"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toEndOf="@id/recent_caption"
+            app:layout_constraintTop_toTopOf="@id/recent_caption" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <com.google.android.material.imageview.ShapeableImageView
-        android:id="@+id/recent_type_image"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginStart="3dp"
-        android:src="@drawable/call_missed"
-        android:tint="?colorPrimary"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintBottom_toBottomOf="@id/recent_caption"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/recent_caption"
-        app:layout_constraintTop_toTopOf="@id/recent_caption" />
 
     <include
         android:id="@+id/recent_main_actions"
-        app:layout_constraintStart_toStartOf="parent"
         layout="@layout/recent_main_actions"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/default_spacing_big"
+        android:layout_margin="@dimen/default_spacing"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/recent_caption" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/recent_name_layout" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/chooloolib/src/main/res/layout/recent_main_actions.xml b/chooloolib/src/main/res/layout/recent_main_actions.xml
index 22bd6c523..7ad9ccefe 100644
--- a/chooloolib/src/main/res/layout/recent_main_actions.xml
+++ b/chooloolib/src/main/res/layout/recent_main_actions.xml
@@ -1,56 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:columnCount="5"
+    android:rowCount="1"
+    android:useDefaultMargins="true">
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
+    <com.chooloo.www.chooloolib.ui.widgets.IconButton
         android:id="@+id/recent_button_call"
-        style="@style/Chooloo.Button.FAB.Large"
-        android:layout_width="wrap_content"
+        style="@style/Chooloo.Button.Primary"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/default_spacing"
+        android:layout_columnWeight="1"
+        android:layout_margin="@dimen/default_spacing_small_plus"
         android:contentDescription="@string/content_description_call_number"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/call" />
+        android:gravity="center"
+        android:padding="15dp"
+        app:icon="@drawable/call" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
+    <com.chooloo.www.chooloolib.ui.widgets.IconButton
         android:id="@+id/recent_button_contact"
-        style="@style/Chooloo.Button.FAB.Large"
-        android:layout_width="wrap_content"
+        style="@style/Chooloo.Button.Primary"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/default_spacing"
+        android:layout_columnWeight="1"
+        android:layout_margin="@dimen/default_spacing_small_plus"
         android:contentDescription="@string/content_description_open_contact"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/recent_button_add_contact"
-        app:layout_constraintStart_toEndOf="@id/recent_button_call"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/person" />
+        android:gravity="center"
+        android:padding="15dp"
+        app:icon="@drawable/person" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
+    <com.chooloo.www.chooloolib.ui.widgets.IconButton
         android:id="@+id/recent_button_add_contact"
-        style="@style/Chooloo.Button.FAB.Large"
-        android:layout_width="wrap_content"
+        style="@style/Chooloo.Button.Primary"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/default_spacing"
+        android:layout_columnWeight="1"
+        android:layout_margin="@dimen/default_spacing_small_plus"
         android:contentDescription="@string/content_description_add_contact"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/recent_button_contact"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/person_add" />
+        android:gravity="center"
+        android:padding="15dp"
+        app:icon="@drawable/person_add" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
+    <com.chooloo.www.chooloolib.ui.widgets.IconButton
         android:id="@+id/recent_button_sms"
-        style="@style/Chooloo.Button.FAB.Large"
-        android:layout_width="wrap_content"
+        style="@style/Chooloo.Button.Primary"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/default_spacing"
+        android:layout_columnWeight="1"
+        android:layout_margin="@dimen/default_spacing_small_plus"
         android:contentDescription="@string/content_description_send_sms"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/recent_button_add_contact"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/chat" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        android:gravity="center"
+        android:padding="15dp"
+        app:icon="@drawable/chat" />
+
+    <com.chooloo.www.chooloolib.ui.widgets.IconButton
+        android:id="@+id/recent_button_more"
+        style="@style/Chooloo.Button.Primary"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_columnWeight="1"
+        android:layout_margin="@dimen/default_spacing_small_plus"
+        android:contentDescription="@string/content_description_menu_button"
+        android:gravity="center"
+        android:padding="15dp"
+        app:icon="@drawable/more_vert" />
+</GridLayout>
\ No newline at end of file
diff --git a/chooloolib/src/main/res/menu/menu_chooloo.xml b/chooloolib/src/main/res/menu/menu_chooloo.xml
index d17cf36df..1fad7823f 100644
--- a/chooloolib/src/main/res/menu/menu_chooloo.xml
+++ b/chooloolib/src/main/res/menu/menu_chooloo.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/menu_chooloo_accent_color"
-        android:contentDescription="@string/in_development"
-        android:enabled="false"
-        android:icon="@drawable/palette"
-        android:title="@string/pref_title_app_color" />
-
     <item
         android:id="@+id/menu_chooloo_theme_mode"
         android:icon="@drawable/invert_colors"
@@ -16,10 +9,12 @@
         android:id="@+id/menu_chooloo_animations"
         android:icon="@drawable/animation"
         android:title="@string/pref_title_animations" />
+
     <item
         android:id="@+id/menu_chooloo_report_bugs"
         android:icon="@drawable/bug_report"
         android:title="@string/pref_title_report_bugs" />
+
     <item
         android:id="@+id/menu_chooloo_rate"
         android:icon="@drawable/grade"
diff --git a/chooloolib/src/main/res/values-fa/strings.xml b/chooloolib/src/main/res/values-fa/strings.xml
index 90e367046..812116c04 100644
--- a/chooloolib/src/main/res/values-fa/strings.xml
+++ b/chooloolib/src/main/res/values-fa/strings.xml
@@ -78,7 +78,7 @@
 
     <!--region call state-->
     <string name="call_status_new">تماس جدید</string>
-    <string name="call_status_dialing">... درحال تماس</string>
+    <string name="call_status_dialing">… درحال تماس</string>
     <string name="call_status_holding">تماس در حالت انتظار</string>
     <string name="call_status_connecting">در حال برقراری</string>
     <string name="call_status_incoming">تماس ورودی</string>
diff --git a/chooloolib/src/main/res/values-night/colors.xml b/chooloolib/src/main/res/values-night/colors.xml
index a6e58bef4..6005cc7fc 100644
--- a/chooloolib/src/main/res/values-night/colors.xml
+++ b/chooloolib/src/main/res/values-night/colors.xml
@@ -1,34 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!--    <color name="positive_background">#d9e7cb</color>-->
-    <!--    <color name="positive_foreground">#131f0d</color>-->
-    <color name="positive_background">#587363</color>
-    <color name="positive_foreground">#A2CFAE</color>
-
-    <!--    <color name="negative_background">#ffdad9</color>-->
-    <!--    <color name="negative_foreground">#2c1516</color>-->
-    <color name="negative_background">#7d5858</color>
-    <color name="negative_foreground">#F5AEA8</color>
-
-    <!--region accent colors-->
-    <color name="blue_primary">#76D1FE</color>
-    <color name="blue_on_primary">#20323C</color>
-    <color name="blue_primary_container">#014C69</color>
-    <color name="blue_on_primary_container">#C1E7FE</color>
-
-    <color name="green_primary">#9cd67e</color>
-    <color name="green_on_primary">#0c3900</color>
-    <color name="green_primary_container">#205107</color>
-    <color name="green_on_primary_container">#9cd67e</color>
-
-    <color name="red_primary">#19686a</color>
-    <color name="red_on_primary">#ffffff</color>
-    <color name="red_primary_container">#a8eff0</color>
-    <color name="red_on_primary_container">#a8eff0</color>
-
-    <color name="purple_primary">#19686a</color>
-    <color name="purple_on_primary">#ffffff</color>
-    <color name="purple_primary_container">#a8eff0</color>
-    <color name="purple_on_primary_container">#a8eff0</color>
-    <!--endregion-->
+    <color name="positive">#378a28</color>
+    <color name="on_positive">#7cd46c</color>
+    <color name="negative">#d40a00</color>
+    <color name="on_negative">#ff9e99</color>
+
+    <color name="primary">#5bdbbe</color>
+    <color name="on_primary">#00382e</color>
+    <color name="primary_container">#005143</color>
+    <color name="on_primary_container">#7af8da</color>
+
+    <color name="secondary">#b1ccc3</color>
+    <color name="on_secondary">#00382e</color>
+    <color name="secondary_container">#334b45</color>
+    <color name="on_secondary_container">#cde8df</color>
+
+    <color name="tertiary">#aacbe3</color>
+    <color name="on_tertiary">#103447</color>
+    <color name="tertiary_container">#2a4a5f</color>
+    <color name="on_tertiary_container">#c7e7ff</color>
+
+    <color name="error">#ffb4ab</color>
+    <color name="on_error">#690005</color>
+    <color name="error_container">#93000a</color>
+    <color name="on_error_container">#ffdad6</color>
+
+    <color name="background">#191c1b</color>
+    <color name="on_background">#e1e3e0</color>
+
+    <color name="surface">#191c1b</color>
+    <color name="on_surface">#e1e3e0</color>
+    <color name="surface_variant">#3f4945</color>
+    <color name="on_surface_variant">#bfc9c4</color>
+
+    <color name="surface_disabled">#43036489</color>
+
+    <color name="background_variant">#3f4945</color>
+    <color name="on_background_variant">#bfc9c4</color>
 </resources>
diff --git a/chooloolib/src/main/res/values-night/themes.xml b/chooloolib/src/main/res/values-night/themes.xml
index cb8ea3259..bd9f4ec56 100644
--- a/chooloolib/src/main/res/values-night/themes.xml
+++ b/chooloolib/src/main/res/values-night/themes.xml
@@ -1,8 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="ChoolooTheme" parent="BaseChoolooTheme">
-        <item name="colorSurfaceVariant">#42474e</item>
-        <item name="colorOnSurfaceVariant">#c2c7ce</item>
+    <style name="ChoolooTheme" parent="Theme.Material3.Dark.NoActionBar">
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:fontFamily">@font/google_sans_medium</item>
+
+        <item name="elevationOverlayEnabled">false</item>
+        <item name="bottomSheetDialogTheme">@style/Chooloo.BottomSheet</item>
+
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorOnPrimary">@color/on_primary</item>
+        <item name="colorPrimaryContainer">@color/primary_container</item>
+        <item name="colorOnPrimaryContainer">@color/on_primary_container</item>
+
+        <item name="colorSecondary">@color/secondary</item>
+        <item name="colorOnSecondary">@color/on_secondary</item>
+        <item name="colorSecondaryContainer">@color/secondary_container</item>
+        <item name="colorOnSecondaryContainer">@color/on_secondary_container</item>
+
+        <item name="colorTertiary">@color/tertiary</item>
+        <item name="colorOnTertiary">@color/on_tertiary</item>
+        <item name="colorTertiaryContainer">@color/tertiary_container</item>
+        <item name="colorOnTertiaryContainer">@color/on_tertiary_container</item>
+
+        <item name="colorError">@color/error</item>
+        <item name="colorOnError">@color/on_error</item>
+        <item name="colorErrorContainer">@color/error_container</item>
+        <item name="colorOnErrorContainer">@color/on_error_container</item>
+
+        <item name="android:colorBackground">@color/background</item>
+        <item name="colorOnBackground">@color/on_background</item>
+
+        <item name="colorSurface">@color/surface</item>
+        <item name="colorOnSurface">@color/on_surface</item>
+        <item name="colorSurfaceVariant">@color/surface_variant</item>
+        <item name="colorOnSurfaceVariant">@color/on_surface_variant</item>
+
+        <item name="colorBackgroundVariant">@color/background_variant</item>
+        <item name="colorOnBackgroundVariant">@color/on_background_variant</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/chooloolib/src/main/res/values-tr/strings.xml b/chooloolib/src/main/res/values-tr/strings.xml
index 5d617f402..4c4a521c6 100644
--- a/chooloolib/src/main/res/values-tr/strings.xml
+++ b/chooloolib/src/main/res/values-tr/strings.xml
@@ -68,7 +68,7 @@
   <!--endregion-->
   <!--region call state-->
   <string name="call_status_new">Yeni Arama</string>
-  <string name="call_status_dialing">Aranıyor...</string>
+  <string name="call_status_dialing">Aranıyor…</string>
   <string name="call_status_holding">Arama Beklemede</string>
   <string name="call_status_connecting">Bağlanıyor…</string>
   <string name="call_status_incoming">Gelen Arama</string>
diff --git a/chooloolib/src/main/res/values-zh-rCN/strings.xml b/chooloolib/src/main/res/values-zh-rCN/strings.xml
index de53a81de..4f715dc40 100644
--- a/chooloolib/src/main/res/values-zh-rCN/strings.xml
+++ b/chooloolib/src/main/res/values-zh-rCN/strings.xml
@@ -41,11 +41,11 @@
     <string name="call_status_new">新电话</string>
     <string name="call_status_dialing">正在拨号</string>
     <string name="call_status_holding">暂停通话</string>
-    <string name="call_status_connecting">连接中...</string>
+    <string name="call_status_connecting">连接中…</string>
     <string name="call_status_incoming">来电</string>
     <string name="call_status_active">正在通话</string>
     <string name="call_status_disconnected">通话结束</string>
-    <string name="call_status_pulling_call">拉电话...</string>
+    <string name="call_status_pulling_call">拉电话…</string>
     <string name="call_status_unknown">通话状态未知</string>
     <string name="call_status_disconnecting">电话停止连接</string>
     <string name="call_status_phone_account">选择手机账号</string>
diff --git a/chooloolib/src/main/res/values/attrs.xml b/chooloolib/src/main/res/values/attrs.xml
index 707472b7f..f6eab539c 100644
--- a/chooloolib/src/main/res/values/attrs.xml
+++ b/chooloolib/src/main/res/values/attrs.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--region styleables-->
-    <declare-styleable name="Chooloo" />
+    <declare-styleable name="Chooloo">
+        <attr name="colorBackgroundVariant" format="color" />
+        <attr name="colorOnBackgroundVariant" format="color" />
+    </declare-styleable>
 
     <declare-styleable name="Chooloo.DialpadKey">
         <attr name="digit" format="string" />
     </declare-styleable>
 
     <declare-styleable name="Chooloo.IconButton">
+        <attr name="icon" format="reference" />
+        <attr name="activated" format="boolean" />
         <attr name="checkedIcon" format="reference" />
     </declare-styleable>
 
diff --git a/chooloolib/src/main/res/values/bools.xml b/chooloolib/src/main/res/values/bools.xml
index ebb5d0c96..95f7073c8 100644
--- a/chooloolib/src/main/res/values/bools.xml
+++ b/chooloolib/src/main/res/values/bools.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <bool name="pref_default_value_animations">true</bool>
-    <bool name="pref_default_value_show_blocked">false</bool>
     <bool name="pref_default_value_dialpad_tones">true</bool>
     <bool name="pref_default_value_group_recents">false</bool>
     <bool name="pref_default_value_dialpad_vibrate">true</bool>
-    <bool name="pref_default_value_should_ask_sim">false</bool>
 </resources>
\ No newline at end of file
diff --git a/chooloolib/src/main/res/values/colors.xml b/chooloolib/src/main/res/values/colors.xml
index 635e77e75..e46bc91b7 100644
--- a/chooloolib/src/main/res/values/colors.xml
+++ b/chooloolib/src/main/res/values/colors.xml
@@ -1,41 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!--    <color name="positive_background">#d9e7cb</color>-->
-    <!--    <color name="positive_foreground">#131f0d</color>-->
-    <color name="positive_background">#E7F4EA</color>
-    <color name="positive_foreground">#4FA266</color>
-
-    <!--    <color name="negative_background">#ffdad9</color>-->
-    <!--    <color name="negative_foreground">#2c1516</color>-->
-    <color name="negative_background">#FCE8E7</color>
-    <color name="negative_foreground">#D54E45</color>
-
-    <!--region accent colors-->
-    <color name="blue_primary">#036489</color>
-    <color name="blue_on_primary">#3f4949</color>
-    <color name="blue_primary_container">#c2E8FF</color>
-    <color name="blue_on_primary_container">#1B3A4A</color>
-
-    <color name="green_primary">#386a20</color>
-    <color name="green_on_primary">#d9e7cb</color>
-    <color name="green_primary_container">#b7f397</color>
-    <color name="green_on_primary_container">#042100</color>
-
-    <color name="red_primary">#ffdad9</color>
-    <color name="red_on_primary">#2c1516</color>
-    <color name="red_primary_container">#a8eff0</color>
-    <color name="red_on_primary_container">#a8eff0</color>
-
-    <color name="purple_primary">#19686a</color>
-    <color name="purple_on_primary">#ffffff</color>
-    <color name="purple_primary_container">#a8eff0</color>
-    <color name="purple_on_primary_container">#a8eff0</color>
-    <!--endregion-->
-
-    <array name="accent_colors">
-        <item>@color/blue_primary</item>
-        <item>@color/green_primary</item>
-        <item>@color/red_primary</item>
-        <item>@color/purple_primary</item>
-    </array>
+    <color name="positive">#7bd46b</color>
+    <color name="on_positive">#215218</color>
+    <color name="negative">#ff6961</color>
+    <color name="on_negative">#a30800</color>
+
+    <color name="primary">#4b635c</color>
+    <color name="on_primary">#ffffff</color>
+    <color name="primary_container">#cde7ed</color>
+    <color name="on_primary_container">#07201a</color>
+
+    <color name="secondary">#4b635c</color>
+    <color name="on_secondary">#ffffff</color>
+    <color name="secondary_container">#cde7ed</color>
+    <color name="on_secondary_container">#07201a</color>
+
+    <color name="tertiary">#545d7e</color>
+    <color name="on_tertiary">#ffffff</color>
+    <color name="tertiary_container">#c7e7ff</color>
+    <color name="on_tertiary_container">#001e2e</color>
+
+    <color name="error">#ba1a1a</color>
+    <color name="on_error">#ffffff</color>
+    <color name="error_container">#ffdad6</color>
+    <color name="on_error_container">#410002</color>
+
+    <color name="background">#fbfcfd</color>
+    <color name="on_background">#191c1d</color>
+
+    <color name="surface">#fbfcfd</color>
+    <color name="on_surface">#191c1d</color>
+    <color name="surface_variant">#dbe4e6</color>
+    <color name="on_surface_variant">#3f484a</color>
+
+    <color name="surface_disabled">#43036489</color>
+
+    <color name="background_variant">#E9F2F4</color>
+    <color name="on_background_variant">#3f484a</color>
 </resources>
diff --git a/chooloolib/src/main/res/values/dimens.xml b/chooloolib/src/main/res/values/dimens.xml
index bfed2e285..7daa7caaa 100644
--- a/chooloolib/src/main/res/values/dimens.xml
+++ b/chooloolib/src/main/res/values/dimens.xml
@@ -14,18 +14,20 @@
     <dimen name="default_spacing_big">28dp</dimen>
     <dimen name="default_spacing_small">6dp</dimen>
     <dimen name="default_spacing_medium">14dp</dimen>
-    <dimen name="default_spacing_list_item">8dp</dimen>
+    <dimen name="default_spacing_small_plus">8dp</dimen>
     <!--endregion-->
 
     <!--region image size-->
     <dimen name="image_size_big">110dp</dimen>
     <dimen name="image_size_medium">45dp</dimen>
     <dimen name="image_size_small">30dp</dimen>
-    <dimen name="corner_radius">18dp</dimen>
+    <dimen name="corner_radius">20dp</dimen>
     <!--endregion-->
 
     <!--region button-->
     <dimen name="button_text_height">47dp</dimen>
+    <dimen name="button_primary_height">70dp</dimen>
+    <dimen name="button_secondary_height">30dp</dimen>
     <!--endregion-->
 
     <!--region bottom sheet dialog -->
@@ -36,7 +38,7 @@
 
     <!--region icon button-->
     <dimen name="icon_button_size_big">80dp</dimen>
-    <dimen name="icon_button_size_small">50dp</dimen>
+    <dimen name="icon_button_size_small">30dp</dimen>
     <dimen name="icon_button_size_normal">65dp</dimen>
     <dimen name="icon_button_padding_big">25dp</dimen>
     <dimen name="icon_button_padding_small">11dp</dimen>
diff --git a/chooloolib/src/main/res/values/strings.xml b/chooloolib/src/main/res/values/strings.xml
index d37523828..1423fc400 100644
--- a/chooloolib/src/main/res/values/strings.xml
+++ b/chooloolib/src/main/res/values/strings.xml
@@ -11,7 +11,9 @@
     <string name="theme_mode_light">Light</string>
     <string name="theme_mode_system">System</string>
     <string name="theme_mode_dynamic">Dynamic</string>
-    <string name="in_development">In Development...</string>
+    <string name="in_development">In Development…</string>
+    <string name="pop_up_notification">Pop-Up Notification</string>
+    <string name="full_screen">Full Screen</string>
     <!--endregion-->
 
     <!--region prompt-->
@@ -55,6 +57,7 @@
     <string name="hint_animations">Show animations</string>
     <string name="hint_search_recents">Search Recents</string>
     <string name="hint_search_contacts">Search Contacts</string>
+    <string name="hint_incoming_call_mode">Incoming Call Mode</string>
     <string name="hint_search_items">Search contacts &amp; recents</string>
     <string name="hint_dialpad_vibrate">Vibrate on dialpad clicks</string>
     <string name="hint_should_ask_sim">Ask for a sim before each call</string>
@@ -67,6 +70,7 @@
     <string name="explain_is_on_hold">%s is on hold</string>
     <string name="explain_choose_theme_mode">Set Koler\'s theme mode, restart the app to see the changes</string>
     <string name="explain_choose_sim_account">Call with a different sim</string>
+    <string name="explain_choose_incoming_call_mode">Incoming call view mode</string>
     <string name="explain_choose_audio_route">Route audio to a different source</string>
     <string name="explain_choose_phone_account">Continue the current call using a specific phone account</string>
     <string name="explain_delete_contact">This contact will be deleted permanently</string>
@@ -87,6 +91,14 @@
     <string name="call_action_speaker_off">Off Speaker</string>
     <!--endregion-->
 
+    <string name="call_action_id_add">call_action_add</string>
+    <string name="call_action_id_mute">call_action_mute</string>
+    <string name="call_action_id_hold">call_action_hold</string>
+    <string name="call_action_id_swap">call_action_swap</string>
+    <string name="call_action_id_merge">call_action_merge</string>
+    <string name="call_action_id_keypad">call_action_keypad</string>
+    <string name="call_action_id_speaker">call_action_speaker</string>
+
     <!--region call state-->
     <string name="call_status_new">New Call</string>
     <string name="call_status_dialing">Dialing…</string>
@@ -104,7 +116,6 @@
     <!--region pref key-->
     <string name="pref_key_rate">rate</string>
     <string name="pref_key_ask_sim">ask_sim</string>
-    <string name="pref_key_color">accent_color</string>
     <string name="pref_key_animations">animations</string>
     <string name="pref_key_theme_mode">theme_mode</string>
     <string name="pref_key_report_bugs">report_bugs</string>
@@ -114,12 +125,12 @@
     <string name="pref_key_dialpad_tones">dialpad_tones</string>
     <string name="pref_key_manage_blocked">manage_blocked</string>
     <string name="pref_key_dialpad_vibrate">dialpad_vibrate</string>
+    <string name="pref_key_incoming_call_mode">incoming_call_mode</string>
     <!--endregion-->
 
     <!--region pref title-->
     <string name="pref_title_rate">Rate</string>
     <string name="pref_title_animations">Animations</string>
-    <string name="pref_title_app_color">Accent Color</string>
     <string name="pref_title_theme_mode">Theme Mode</string>
     <string name="pref_title_email">Email Us</string>
     <string name="pref_title_report_bugs">Report Bugs</string>
@@ -141,9 +152,10 @@
     <string name="error_not_default_dialer_call">Set koler as your default dialer to make calls</string>
 
     <string name="error_no_permissions_edit_call_log">No permission to change call log :)</string>
+    <string name="error_no_permissions_edit_contacts">No permission to change contacts :)</string>
     <string name="error_no_permissions_make_call">No permissions to make a call :(</string>
     <string name="error_no_permissions_phones">I need permission to read contacts :)</string>
-    <string name="error_no_permissions_recents">I need permission to read call log :)</string>
+    <string name="error_no_permissions_recents">I need permission to read call log and contacts :)</string>
     <string name="error_no_permissions_contacts">I need permission to read contacts :)</string>
     <string name="error_no_permissions_contacts_and_call_log">I need permission to read contacts and call log :)</string>
 
@@ -225,4 +237,5 @@
     <string name="content_description_add_contact">Add Contact</string>
     <string name="content_description_open_contact">Open Contact</string>
     <string name="content_description_send_sms">Send SMS</string>
+    <string name="grant">grant</string>
 </resources>
\ No newline at end of file
diff --git a/chooloolib/src/main/res/values/styles.xml b/chooloolib/src/main/res/values/styles.xml
index d724db494..1d1a5c4e9 100644
--- a/chooloolib/src/main/res/values/styles.xml
+++ b/chooloolib/src/main/res/values/styles.xml
@@ -8,18 +8,20 @@
         <item name="android:fontFamily">@font/google_sans_medium</item>
     </style>
 
-    <style name="Chooloo.Text.Headline" parent='TextAppearance.Material3.HeadlineMedium' />
-
-    <style name="Chooloo.Text.HeadlineSmall" parent="TextAppearance.Material3.HeadlineSmall">
-        <item name="fontFamily">@font/google_sans_medium</item>
+    <style name="Chooloo.Text.Headline" parent='TextAppearance.Material3.HeadlineMedium'>
+        <item name="android:textStyle">bold</item>
+        <item name="android:fontFamily">@font/google_sans_bold</item>
     </style>
 
     <style name="Chooloo.Text.Title" parent="TextAppearance.Material3.TitleMedium">
-        <item name="android:fontFamily">@font/google_sans_medium</item>
+        <item name="android:fontFamily">@font/google_sans_bold</item>
+        <item name="android:textStyle">bold</item>
     </style>
 
+    <style name="Chooloo.Text.Title.Small" parent="TextAppearance.Material3.TitleSmall" />
+
     <style name="Chooloo.Text.Body" parent="TextAppearance.Material3.BodySmall">
-        <item name="android:fontFamily">@font/google_sans_medium</item>
+        <item name="android:fontFamily">@font/google_sans_bold</item>
     </style>
 
     <style name="Chooloo.Text.Caption" parent="TextAppearance.Material3.LabelSmall">
@@ -34,7 +36,7 @@
 
     <style name="Chooloo.Image.Profile">
         <item name="android:src">@drawable/person</item>
-        <item name="cornerSize">15%</item>
+        <item name="cornerSize">50%</item>
         <item name="cornerFamily">rounded</item>
     </style>
     <!--endregion-->
@@ -70,58 +72,63 @@
     </style>
 
     <style name="Chooloo.FastScrollView" parent="Chooloo.ListView">
-        <item name="bubbleColor">?colorSecondary</item>
-        <item name="bubbleTextColor">?colorOnSecondary</item>
-        <item name="handleColor">?colorSecondary</item>
+        <item name="hideScrollbar">false</item>
+        <item name="bubbleColor">?colorSurfaceVariant</item>
+        <item name="bubbleTextColor">?colorOnSurfaceVariant</item>
+        <item name="handleColor">?colorSurfaceVariant</item>
     </style>
     <!--endregion-->
 
     <!--region button-->
-    <style name="Chooloo.Button" />
-
-    <style name="Chooloo.Button.Filled" parent="Widget.Material3.Button" />
-
-    <style name="Chooloo.Button.Tonal" parent="Widget.Material3.Button.TonalButton" />
-
-    <style name="Chooloo.Button.Text" parent="Widget.Material3.Button.TextButton" />
-
-    <style name="Chooloo.Button.Outlined" parent="Widget.Material3.Button.OutlinedButton" />
-
-    <style name="Chooloo.Button.Icon" parent="Widget.Material3.Button.IconButton" />
+    <style name="Chooloo.Button">
+        <item name="android:scaleType">fitCenter</item>
+        <item name="android:adjustViewBounds">true</item>
+    </style>
 
-    <style name="Chooloo.Button.Icon.Small" />
+    <style name="Chooloo.Button.Primary">
+        <item name="android:padding">8dp</item>
+        <item name="android:background">@drawable/bubble_background</item>
+        <item name="android:textColor">?colorOnSecondaryContainer</item>
+        <item name="android:tint">?colorOnSecondaryContainer</item>
+        <item name="android:backgroundTint">?colorSecondaryContainer</item>
+    </style>
 
-    <style name="Chooloo.Button.Icon.Small.Filled">
-        <item name="iconTint">?colorOnPrimary</item>
+    <style name="Chooloo.Button.Primary.Selectable">
+        <item name="android:tint">?colorOnSurfaceVariant</item>
+        <item name="android:textColor">?colorOnSurfaceVariant</item>
         <item name="android:backgroundTint">?colorSurfaceVariant</item>
     </style>
 
-    <style name="Chooloo.Button.Icon.Medium">
-        <item name="iconSize">32dp</item>
+    <style name="Chooloo.Button.Primary.Secondary">
+        <item name="android:tint">?colorOnSurface</item>
+        <item name="android:backgroundTint">?colorSurface</item>
     </style>
 
-    <style name="Chooloo.Button.Icon.Medium.Filled">
-        <item name="android:checked">true</item>
+    <style name="Chooloo.Button.Secondary">
+        <item name="android:padding">8dp</item>
+        <item name="android:tint">?colorOnSurfaceVariant</item>
+        <item name="android:backgroundTint">?colorSurfaceVariant</item>
     </style>
 
-    <style name="Chooloo.Button.Icon.Big">
-        <item name="iconTint">@color/m3_text_button_foreground_color_selector</item>
-        <item name="iconSize">55dp</item>
+    <style name="Chooloo.Button.Secondary.Icon">
+        <item name="android:background">@drawable/circle_background</item>
     </style>
 
-    <style name="Chooloo.Button.Icon.Big.Filled">
-        <item name="android:checked">true</item>
+    <style name="Chooloo.Button.FAB" parent="Widget.Material3.FloatingActionButton.Primary">
+        <item name="elevation">0dp</item>
     </style>
 
-    <style name="Chooloo.Button.FAB" parent="Widget.Material3.FloatingActionButton.Large.Primary">
-        <item name="fabCustomSize">70dp</item>
+    <style name="Chooloo.Button.FAB.Primary" parent="Widget.Material3.FloatingActionButton.Large.Primary">
         <item name="elevation">0dp</item>
-        <item name="maxImageSize">21dp</item>
+        <item name="tint">?colorOnSecondaryContainer</item>
+        <item name="backgroundTint">?colorSecondaryContainer</item>
     </style>
 
-    <style name="Chooloo.Button.FAB.Large">
-        <item name="fabCustomSize">77dp</item>
-        <item name="maxImageSize">28dp</item>
+    <style name="Chooloo.Button.FAB.Secondary" parent="Widget.Material3.FloatingActionButton.Secondary">
+        <item name="backgroundTint">?colorSecondaryContainer</item>
+        <item name="tint">?colorOnSecondaryContainer</item>
+        <item name="fabCustomSize">60dp</item>
+        <item name="maxImageSize">30dp</item>
     </style>
     <!--endregion-->
 </resources>
diff --git a/chooloolib/src/main/res/values/themes.xml b/chooloolib/src/main/res/values/themes.xml
index bbf742469..37b0fde00 100644
--- a/chooloolib/src/main/res/values/themes.xml
+++ b/chooloolib/src/main/res/values/themes.xml
@@ -1,91 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="BaseChoolooTheme" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="ChoolooTheme" parent="Theme.Material3.Light.NoActionBar">
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:fontFamily">@font/google_sans_medium</item>
+
         <item name="elevationOverlayEnabled">false</item>
         <item name="bottomSheetDialogTheme">@style/Chooloo.BottomSheet</item>
-        <item name="android:statusBarColor">?colorSurface</item>
 
-        <item name="colorPrimary">@color/blue_primary</item>
-        <item name="colorOnPrimary">@color/blue_on_primary</item>
-        <item name="colorPrimaryContainer">@color/blue_primary_container</item>
-        <item name="colorOnPrimaryContainer">@color/blue_on_primary_container</item>
-        <item name="colorSecondary">@color/blue_primary</item>
-        <item name="colorOnSecondary">@color/blue_on_primary</item>
-        <item name="colorSecondaryContainer">@color/blue_primary_container</item>
-        <item name="colorOnSecondaryContainer">@color/blue_on_primary_container</item>
-        <item name="colorTertiary">@color/blue_primary</item>
-        <item name="colorOnTertiary">@color/blue_on_primary</item>
-        <item name="colorTertiaryContainer">@color/blue_primary_container</item>
-        <item name="colorOnTertiaryContainer">@color/blue_on_primary_container</item>
-    </style>
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorOnPrimary">@color/on_primary</item>
+        <item name="colorPrimaryContainer">@color/primary_container</item>
+        <item name="colorOnPrimaryContainer">@color/on_primary_container</item>
 
-    <style name="ChoolooTheme" parent="BaseChoolooTheme">
-        <item name="colorSurfaceVariant">#A8DCE3E9</item>
-        <item name="colorOnSurfaceVariant">#B5464D53</item>
-        <item name="android:windowLightStatusBar">true</item>
-    </style>
+        <item name="colorSecondary">@color/secondary</item>
+        <item name="colorOnSecondary">@color/on_secondary</item>
+        <item name="colorSecondaryContainer">@color/secondary_container</item>
+        <item name="colorOnSecondaryContainer">@color/on_secondary_container</item>
 
-    <style name="Accent" />
+        <item name="colorTertiary">@color/tertiary</item>
+        <item name="colorOnTertiary">@color/on_tertiary</item>
+        <item name="colorTertiaryContainer">@color/tertiary_container</item>
+        <item name="colorOnTertiaryContainer">@color/on_tertiary_container</item>
 
-    <style name="Accent.Blue">
-        <item name="colorPrimary">@color/blue_primary</item>
-        <item name="colorOnPrimary">@color/blue_on_primary</item>
-        <item name="colorPrimaryContainer">@color/blue_primary_container</item>
-        <item name="colorOnPrimaryContainer">@color/blue_on_primary_container</item>
-        <item name="colorSecondary">@color/blue_primary</item>
-        <item name="colorOnSecondary">@color/blue_on_primary</item>
-        <item name="colorSecondaryContainer">@color/blue_primary_container</item>
-        <item name="colorOnSecondaryContainer">@color/blue_on_primary_container</item>
-        <item name="colorTertiary">@color/blue_primary</item>
-        <item name="colorOnTertiary">@color/blue_on_primary</item>
-        <item name="colorTertiaryContainer">@color/blue_primary_container</item>
-        <item name="colorOnTertiaryContainer">@color/blue_on_primary_container</item>
-    </style>
+        <item name="colorError">@color/error</item>
+        <item name="colorOnError">@color/on_error</item>
+        <item name="colorErrorContainer">@color/error_container</item>
+        <item name="colorOnErrorContainer">@color/on_error_container</item>
 
-    <style name="Accent.Green">
-        <item name="colorPrimary">@color/green_primary</item>
-        <item name="colorOnPrimary">@color/green_on_primary</item>
-        <item name="colorPrimaryContainer">@color/green_primary_container</item>
-        <item name="colorOnPrimaryContainer">@color/green_on_primary_container</item>
-        <item name="colorSecondary">?colorPrimary</item>
-        <item name="colorOnSecondary">?colorOnPrimary</item>
-        <item name="colorSecondaryContainer">?colorOnPrimaryContainer</item>
-        <item name="colorOnSecondaryContainer">?colorOnPrimaryContainer</item>
-        <item name="colorTertiary">?colorPrimary</item>
-        <item name="colorOnTertiary">?colorOnPrimary</item>
-        <item name="colorTertiaryContainer">?colorPrimaryContainer</item>
-        <item name="colorOnTertiaryContainer">?colorOnPrimaryContainer</item>
-    </style>
+        <item name="android:colorBackground">@color/background</item>
+        <item name="colorOnBackground">@color/on_background</item>
 
-    <style name="Accent.Red">
-        <item name="colorPrimary">@color/red_primary</item>
-        <item name="colorOnPrimary">@color/red_on_primary</item>
-        <item name="colorPrimaryContainer">@color/red_primary_container</item>
-        <item name="colorOnPrimaryContainer">@color/red_on_primary_container</item>
-        <item name="colorSecondary">?colorPrimary</item>
-        <item name="colorOnSecondary">?colorOnPrimary</item>
-        <item name="colorSecondaryContainer">?colorOnPrimaryContainer</item>
-        <item name="colorOnSecondaryContainer">?colorOnPrimaryContainer</item>
-        <item name="colorTertiary">?colorPrimary</item>
-        <item name="colorOnTertiary">?colorOnPrimary</item>
-        <item name="colorTertiaryContainer">?colorPrimaryContainer</item>
-        <item name="colorOnTertiaryContainer">?colorOnPrimaryContainer</item>
-    </style>
+        <item name="colorSurface">@color/surface</item>
+        <item name="colorOnSurface">@color/on_surface</item>
+        <item name="colorSurfaceVariant">@color/surface_variant</item>
+        <item name="colorOnSurfaceVariant">@color/on_surface_variant</item>
 
-    <style name="Accent.Purple">
-        <item name="colorPrimary">@color/purple_primary</item>
-        <item name="colorOnPrimary">@color/purple_on_primary</item>
-        <item name="colorPrimaryContainer">@color/purple_primary_container</item>
-        <item name="colorOnPrimaryContainer">@color/purple_on_primary_container</item>
-        <item name="colorSecondary">?colorPrimary</item>
-        <item name="colorOnSecondary">?colorOnPrimary</item>
-        <item name="colorSecondaryContainer">?colorOnPrimaryContainer</item>
-        <item name="colorOnSecondaryContainer">?colorOnPrimaryContainer</item>
-        <item name="colorTertiary">?colorPrimary</item>
-        <item name="colorOnTertiary">?colorOnPrimary</item>
-        <item name="colorTertiaryContainer">?colorPrimaryContainer</item>
-        <item name="colorOnTertiaryContainer">?colorOnPrimaryContainer</item>
+        <item name="colorBackgroundVariant">@color/background_variant</item>
+        <item name="colorOnBackgroundVariant">@color/on_background_variant</item>
     </style>
 </resources>
diff --git a/chooloolib/src/main/res/xml-land/preferences_chooloo.xml b/chooloolib/src/main/res/xml-land/preferences_chooloo.xml
index e3fedde59..7ce7a1738 100644
--- a/chooloolib/src/main/res/xml-land/preferences_chooloo.xml
+++ b/chooloolib/src/main/res/xml-land/preferences_chooloo.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <Preference
-        android:key="@string/pref_key_color"
-        android:title="@string/pref_title_app_color" />
-
     <SwitchPreference
         android:defaultValue="@bool/pref_default_value_animations"
         android:key="@string/pref_key_animations"
diff --git a/chooloolib/src/main/res/xml/call_actions_scene.xml b/chooloolib/src/main/res/xml/call_actions_scene.xml
index 821c7be50..b287fddc0 100644
--- a/chooloolib/src/main/res/xml/call_actions_scene.xml
+++ b/chooloolib/src/main/res/xml/call_actions_scene.xml
@@ -9,32 +9,32 @@
     <ConstraintSet android:id="@+id/constraint_set_single_call">
         <Constraint
             android:id="@+id/call_action_mute"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="parent"
+            android:layout_width="@dimen/button_primary_height"
+            android:layout_height="@dimen/button_primary_height"
             android:layout_marginTop="@dimen/default_spacing"
             app:layout_constraintEnd_toStartOf="@id/call_action_speaker"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
         <Constraint
             android:id="@+id/call_action_speaker"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/button_primary_height"
+            android:layout_height="@dimen/button_primary_height"
             android:layout_marginTop="@dimen/default_spacing"
             app:layout_constraintEnd_toStartOf="@id/call_action_hold"
             app:layout_constraintStart_toEndOf="@id/call_action_mute"
             app:layout_constraintTop_toTopOf="parent" />
         <Constraint
             android:id="@+id/call_action_hold"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/button_primary_height"
+            android:layout_height="@dimen/button_primary_height"
             android:layout_marginTop="@dimen/default_spacing"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/call_action_speaker"
             app:layout_constraintTop_toTopOf="parent" />
         <Constraint
             android:id="@+id/call_action_add_call"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/button_primary_height"
+            android:layout_height="@dimen/button_primary_height"
             android:layout_marginTop="@dimen/default_spacing_big"
             android:layout_marginBottom="@dimen/default_spacing_big"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -43,8 +43,8 @@
             app:layout_constraintTop_toBottomOf="@id/call_action_mute" />
         <Constraint
             android:id="@+id/call_action_keypad"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/button_primary_height"
+            android:layout_height="@dimen/button_primary_height"
             android:layout_marginTop="@dimen/default_spacing_big"
             android:layout_marginBottom="@dimen/default_spacing_big"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -53,15 +53,15 @@
             app:layout_constraintTop_toBottomOf="@id/call_action_speaker" />
         <Constraint
             android:id="@+id/call_action_merge"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/button_primary_height"
+            android:layout_height="@dimen/button_primary_height"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:visibilityMode="ignore" />
         <Constraint
             android:id="@+id/call_action_swap"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/button_primary_height"
+            android:layout_height="@dimen/button_primary_height"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:visibilityMode="ignore" />
@@ -70,32 +70,32 @@
     <ConstraintSet android:id="@+id/constraint_set_multi_call">
         <Constraint
             android:id="@+id/call_action_mute"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/button_primary_height"
+            android:layout_height="@dimen/button_primary_height"
             android:layout_marginTop="@dimen/default_spacing"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toStartOf="@id/call_action_speaker"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
         <Constraint
             android:id="@+id/call_action_speaker"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/button_primary_height"
+            android:layout_height="@dimen/button_primary_height"
             android:layout_marginTop="@dimen/default_spacing"
             app:layout_constraintEnd_toStartOf="@id/call_action_keypad"
             app:layout_constraintStart_toEndOf="@id/call_action_mute"
             app:layout_constraintTop_toTopOf="parent" />
         <Constraint
             android:id="@+id/call_action_keypad"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/button_primary_height"
+            android:layout_height="@dimen/button_primary_height"
             android:layout_marginTop="@dimen/default_spacing"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/call_action_speaker"
             app:layout_constraintTop_toTopOf="parent" />
         <Constraint
             android:id="@+id/call_action_swap"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/button_primary_height"
+            android:layout_height="@dimen/button_primary_height"
             android:layout_marginTop="@dimen/default_spacing_big"
             android:layout_marginBottom="@dimen/default_spacing_big"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -105,8 +105,8 @@
             app:visibilityMode="ignore" />
         <Constraint
             android:id="@+id/call_action_merge"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/button_primary_height"
+            android:layout_height="@dimen/button_primary_height"
             android:layout_marginTop="@dimen/default_spacing_big"
             android:layout_marginBottom="@dimen/default_spacing_big"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -116,8 +116,8 @@
             app:visibilityMode="ignore" />
         <Constraint
             android:id="@+id/call_action_hold"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/button_primary_height"
+            android:layout_height="@dimen/button_primary_height"
             android:layout_marginTop="@dimen/default_spacing_big"
             android:layout_marginBottom="@dimen/default_spacing_big"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -126,8 +126,8 @@
             app:layout_constraintTop_toBottomOf="@id/call_action_keypad" />
         <Constraint
             android:id="@+id/call_action_add_call"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/button_primary_height"
+            android:layout_height="@dimen/button_primary_height"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
diff --git a/chooloolib/src/main/res/xml/call_scene.xml b/chooloolib/src/main/res/xml/call_scene.xml
index 6e6baaba2..252a6a180 100644
--- a/chooloolib/src/main/res/xml/call_scene.xml
+++ b/chooloolib/src/main/res/xml/call_scene.xml
@@ -44,32 +44,34 @@
             app:layout_constraintTop_toBottomOf="@id/call_name_text"
             app:layout_constraintVertical_bias="0.0"
             app:visibilityMode="ignore" />
+        <Constraint
+            android:id="@+id/call_actions"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
         <Constraint
             android:id="@+id/call_answer_button"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/default_spacing_big"
             android:layout_marginLeft="@dimen/default_spacing_big"
             android:layout_marginBottom="@dimen/default_spacing_big"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintWidth_percent="0.26" />
         <Constraint
             android:id="@+id/call_reject_button"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/default_spacing_big"
             android:layout_marginRight="@dimen/default_spacing_big"
             android:layout_marginBottom="@dimen/default_spacing_big"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-        <Constraint
-            android:id="@+id/call_actions"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintWidth_percent="0.26" />
     </ConstraintSet>
 
     <ConstraintSet android:id="@+id/constraint_set_active_call">
@@ -110,20 +112,6 @@
             app:layout_constraintTop_toBottomOf="@id/call_name_text"
             app:layout_constraintVertical_bias="0.0"
             app:visibilityMode="ignore" />
-        <Constraint
-            android:id="@+id/call_reject_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/default_spacing_big"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-        <Constraint
-            android:id="@+id/call_answer_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
         <Constraint
             android:id="@+id/call_actions"
             android:layout_width="match_parent"
@@ -134,5 +122,21 @@
             app:layout_constraintBottom_toTopOf="@id/call_reject_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
+        <Constraint
+            android:id="@+id/call_reject_button"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/default_spacing_big"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintWidth_percent="0.26" />
+        <Constraint
+            android:id="@+id/call_answer_button"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintWidth_percent="0.26" />
     </ConstraintSet>
 </MotionScene>
\ No newline at end of file
diff --git a/chooloolib/src/main/res/xml/preferences_chooloo.xml b/chooloolib/src/main/res/xml/preferences_chooloo.xml
index e3fedde59..7ce7a1738 100644
--- a/chooloolib/src/main/res/xml/preferences_chooloo.xml
+++ b/chooloolib/src/main/res/xml/preferences_chooloo.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <Preference
-        android:key="@string/pref_key_color"
-        android:title="@string/pref_title_app_color" />
-
     <SwitchPreference
         android:defaultValue="@bool/pref_default_value_animations"
         android:key="@string/pref_key_animations"
diff --git a/gradle.properties b/gradle.properties
index dfbfad847..43ac3e62a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,6 +10,7 @@ android.enableJetifier=true
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 kotlin.code.style=official
+org.gradle.unsafe.configuration-cache=true
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d7135ad80..5251aca18 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
+#Wed Dec 21 23:51:01 IST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+org.gradle.jvmargs=-Xmx1536M --add-exports\=java.base/sun.nio.ch\=ALL-UNNAMED --add-opens\=java.base/java.lang\=ALL-UNNAMED --add-opens\=java.base/java.lang.reflect\=ALL-UNNAMED --add-opens\=java.base/java.io\=ALL-UNNAMED --add-exports\=jdk.unsupported/sun.misc\=ALL-UNNAMED
 zipStoreBase=GRADLE_USER_HOME
-org.gradle.jvmargs=-Xmx1536M --add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED
\ No newline at end of file
+zipStorePath=wrapper/dists
diff --git a/koler/build.gradle b/koler/build.gradle
index 41637a86d..7a368486d 100644
--- a/koler/build.gradle
+++ b/koler/build.gradle
@@ -1,24 +1,21 @@
 plugins {
-    id 'com.android.application'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'dagger.hilt.android.plugin'
+    id "com.android.application"
+    id "kotlin-android"
+    id "kotlin-kapt"
+    id "dagger.hilt.android.plugin"
 }
 
 android {
-    compileSdk 31
+    namespace "com.chooloo.www.koler"
+    compileSdk rootProject.ext.sdkVersion
 
     defaultConfig {
-        versionCode 79
-        versionName "v1.5.0"
-
-        minSdk 25
-        targetSdk 31
-
+        versionCode 80
+        versionName "v1.6.0"
+        targetSdk rootProject.ext.sdkVersion
+        minSdk rootProject.ext.minSdkVersion
         applicationId "com.chooloo.www.koler"
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments += ["room.schemaLocation": "$projectDir/schemas".toString()]
@@ -26,105 +23,93 @@ android {
         }
     }
 
-    dataBinding {
-        //noinspection DataBindingWithoutKapt
-        enabled = true
-    }
-
     buildTypes {
         release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
+        targetCompatibility JavaVersion.VERSION_18
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-    }
-
-    buildFeatures {
-        viewBinding true
-    }
-
-    lintOptions {
-        checkReleaseBuilds false
+        jvmTarget = JavaVersion.VERSION_18.toString()
     }
 
-    hilt {
-        enableAggregatingTask true
-    }
-
-    kapt {
-        correctErrorTypes true
-    }
+    kotlin { jvmToolchain(18) }
+    dataBinding { enabled true }
+    kapt { correctErrorTypes true }
+    lint { checkReleaseBuilds false }
+    buildFeatures { viewBinding true }
+    hilt { enableAggregatingTask true }
 }
 
 dependencies {
     kapt(
-            'com.google.dagger:hilt-compiler:2.38.1',
-            'androidx.hilt:hilt-compiler:1.0.0-alpha01'
+            "androidx.hilt:hilt-compiler:1.0.0",
+            "com.google.dagger:hilt-compiler:${rootProject.ext.hiltVersion}"
     )
 
     annotationProcessor(
-            'androidx.room:room-compiler:2.4.1'
+            "androidx.room:room-compiler:2.5.0"
     )
 
     testImplementation(
-            'junit:junit:4.13.2',
-            'androidx.room:room-testing:2.2.6'
+            "junit:junit:4.13.2",
+            "androidx.room:room-testing:2.2.6"
     )
 
     androidTestImplementation(
-            'androidx.test:core:1.3.0',
-            'androidx.test:runner:1.3.0',
-            'androidx.test.ext:junit:1.1.2',
-            'com.jraska.livedata:testing:1.0.0',
-            'org.mockito:mockito-android:2.24.0',
-            'androidx.arch.core:core-testing:2.1.0',
+            "androidx.test:core:1.3.0",
+            "androidx.test:runner:1.3.0",
+            "androidx.test.ext:junit:1.1.2",
+            "com.jraska.livedata:testing:1.0.0",
+            "org.mockito:mockito-android:2.24.0",
+            "androidx.arch.core:core-testing:2.1.0",
             "androidx.compose.ui:ui-test-junit4:1.0.4",
-            'androidx.test.espresso:espresso-core:3.3.0'
+            "androidx.test.espresso:espresso-core:3.3.0"
     )
 
     implementation(
             project(":chooloolib"),
-            fileTree(include: ['*.jar'], dir: 'libs'),
-            'androidx.wear:wear:1.1.0',
-            'androidx.core:core-ktx:1.6.0',
-            'dev.sasikanth:colorsheet:1.0.1',
-            'androidx.room:room-runtime:2.2.6',
-            'androidx.cardview:cardview:1.0.0',
-            'io.reactivex.rxjava2:rxjava:2.1.16',
-            'androidx.appcompat:appcompat:1.2.0',
-            'com.jakewharton.timber:timber:4.7.1',
-            'androidx.activity:activity-ktx:1.1.0',
-            'io.github.l4digital:fastscroll:2.0.1',
-            'androidx.arch.core:core-common:2.1.0',
-            'io.reactivex.rxjava2:rxandroid:2.0.1',
-            'androidx.annotation:annotation:1.1.0',
-            'androidx.fragment:fragment-ktx:1.1.0',
-            'com.github.skydoves:androidveil:1.1.1',
-            'androidx.arch.core:core-runtime:2.1.0',
-            'com.google.dagger:hilt-android:2.38.1',
-            'com.reddit:indicator-fast-scroll:1.4.0',
-            'androidx.legacy:legacy-support-v4:1.0.0',
-            'androidx.preference:preference-ktx:1.1.1',
-            'org.jetbrains.kotlin:kotlin-stdlib:1.4.21',
-            'androidx.biometric:biometric:1.2.0-alpha02',
-            'com.google.android.material:material:1.3.0',
-            'com.android.support:recyclerview-v7:23.2.1',
-            'com.github.abdularis:circularimageview:1.5',
-            'androidx.navigation:navigation-ui-ktx:2.3.3',
-            'androidx.lifecycle:lifecycle-extensions:2.2.0',
-            'com.daimajia.androidanimations:library:2.4@aar',
-            'androidx.constraintlayout:constraintlayout:2.0.4',
-            'com.pushtorefresh.storio3:content-resolver:3.0.0',
-            'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0',
-            'androidx.navigation:navigation-fragment-ktx:2.3.3',
-            'com.googlecode.libphonenumber:libphonenumber:8.12.18'
+            fileTree(include: ["*.jar"], dir: "libs"),
+
+            // ktx
+            "androidx.fragment:fragment-ktx:1.5.5",
+            "androidx.activity:activity-ktx:1.6.1",
+            "androidx.preference:preference-ktx:1.2.0",
+            "androidx.navigation:navigation-ui-ktx:2.5.3",
+            "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1",
+            "androidx.navigation:navigation-fragment-ktx:2.5.3",
+            "androidx.core:core-ktx:${rootProject.ext.coreKtxVersion}",
+
+            "dev.sasikanth:colorsheet:1.0.1",
+            "androidx.room:room-runtime:2.2.6",
+            "androidx.cardview:cardview:1.0.0",
+            "io.reactivex.rxjava2:rxjava:2.1.16",
+            "com.jakewharton.timber:timber:4.7.1",
+            "io.github.l4digital:fastscroll:2.0.1",
+            "androidx.arch.core:core-common:2.1.0",
+            "io.reactivex.rxjava2:rxandroid:2.0.1",
+            "androidx.annotation:annotation:1.1.0",
+            "com.github.skydoves:androidveil:1.1.1",
+            "androidx.arch.core:core-runtime:2.1.0",
+            "com.reddit:indicator-fast-scroll:1.4.0",
+            "androidx.legacy:legacy-support-v4:1.0.0",
+            "org.jetbrains.kotlin:kotlin-stdlib:1.4.21",
+            "androidx.biometric:biometric:1.2.0-alpha02",
+            "com.google.android.material:material:1.3.0",
+            "com.android.support:recyclerview-v7:23.2.1",
+            "com.github.abdularis:circularimageview:1.5",
+            "androidx.lifecycle:lifecycle-extensions:2.2.0",
+            "com.daimajia.androidanimations:library:2.4@aar",
+            "androidx.constraintlayout:constraintlayout:2.1.4",
+            "com.pushtorefresh.storio3:content-resolver:3.0.0",
+            "com.googlecode.libphonenumber:libphonenumber:8.12.18",
+            "com.google.dagger:hilt-android:${rootProject.ext.hiltVersion}",
+            "androidx.appcompat:appcompat:${rootProject.ext.appCompatVersion}",
     )
 }
diff --git a/koler/debug/output-metadata.json b/koler/debug/output-metadata.json
new file mode 100644
index 000000000..4b7b608a2
--- /dev/null
+++ b/koler/debug/output-metadata.json
@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.cloudsource.www.ringcent",
+  "variantName": "debug",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 2,
+      "versionName": "2.0",
+      "outputFile": "app-debug.apk"
+    }
+  ],
+  "elementType": "File"
+}
\ No newline at end of file
diff --git a/koler/src/main/AndroidManifest.xml b/koler/src/main/AndroidManifest.xml
index 0738c14c5..dbceaf6b0 100644
--- a/koler/src/main/AndroidManifest.xml
+++ b/koler/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.chooloo.www.koler">
+    xmlns:tools="http://schemas.android.com/tools">
 
 
     <uses-permission android:name="android.permission.VIBRATE" />
@@ -17,6 +16,7 @@
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />
     <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.ANSWER_PHONE_CALLS" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission
@@ -39,8 +39,8 @@
 
         <activity
             android:name=".ui.main.MainActivity"
-            android:exported="true"
             android:configChanges="orientation|screenSize|keyboardHidden"
+            android:exported="true"
             android:screenOrientation="unspecified">
 
             <intent-filter>
diff --git a/koler/src/main/java/com/chooloo/www/koler/KolerApp.kt b/koler/src/main/java/com/chooloo/www/koler/KolerApp.kt
index b3374db02..d2b55e216 100644
--- a/koler/src/main/java/com/chooloo/www/koler/KolerApp.kt
+++ b/koler/src/main/java/com/chooloo/www/koler/KolerApp.kt
@@ -2,22 +2,18 @@ package com.chooloo.www.koler
 
 import android.telecom.TelecomManager
 import androidx.preference.PreferenceManager
-import com.chooloo.www.chooloolib.BaseApp
-import com.chooloo.www.chooloolib.interactor.theme.ThemesInteractor
+import com.chooloo.www.chooloolib.ChoolooApp
 import com.chooloo.www.chooloolib.notification.CallNotification
 import dagger.hilt.android.HiltAndroidApp
 import javax.inject.Inject
 
 @HiltAndroidApp
-open class KolerApp : BaseApp() {
+open class KolerApp : ChoolooApp() {
     @Inject lateinit var telecomManager: TelecomManager
     @Inject lateinit var callNotification: CallNotification
 
     override fun onCreate() {
         super.onCreate()
         PreferenceManager.setDefaultValues(this, R.xml.preferences_koler, false)
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-            callNotification.createNotificationChannel()
-        }
     }
 }
\ No newline at end of file
diff --git a/koler/src/main/java/com/chooloo/www/koler/ui/main/MainActivity.kt b/koler/src/main/java/com/chooloo/www/koler/ui/main/MainActivity.kt
index 29aab8a48..c8587960f 100644
--- a/koler/src/main/java/com/chooloo/www/koler/ui/main/MainActivity.kt
+++ b/koler/src/main/java/com/chooloo/www/koler/ui/main/MainActivity.kt
@@ -9,6 +9,7 @@ import com.chooloo.www.chooloolib.interactor.prompt.PromptsInteractor
 import com.chooloo.www.chooloolib.interactor.screen.ScreensInteractor
 import com.chooloo.www.chooloolib.ui.base.BaseActivity
 import com.chooloo.www.chooloolib.ui.contacts.ContactsViewState
+import com.chooloo.www.chooloolib.ui.dialer.DialerViewState
 import com.chooloo.www.chooloolib.ui.recents.RecentsViewState
 import com.chooloo.www.koler.R
 import com.chooloo.www.koler.databinding.MainBinding
@@ -22,6 +23,7 @@ class MainActivity : BaseActivity<MainViewState>() {
     override val contentView by lazy { binding.root }
     override val viewState: MainViewState by viewModels()
 
+    private val _dialerViewState: DialerViewState by viewModels()
     private val recentsViewState: RecentsViewState by viewModels()
     private val contactsViewState: ContactsViewState by viewModels()
     private val binding by lazy { MainBinding.inflate(layoutInflater) }
@@ -67,7 +69,7 @@ class MainActivity : BaseActivity<MainViewState>() {
             mainViewPager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
                 override fun onPageSelected(position: Int) {
                     super.onPageSelected(position)
-                    viewState.currentPageIndex.value = position
+                    viewState.onPageSelected(position)
                 }
             })
         }
@@ -95,9 +97,8 @@ class MainActivity : BaseActivity<MainViewState>() {
 
             showDialerEvent.observe(this@MainActivity) { ev ->
                 ev.ifNew?.let {
-                    prompts.showFragment(
-                        choolooFragmentFactory.getDialerFragment(it)
-                    )
+                    prompts.showFragment(choolooFragmentFactory.getDialerFragment())
+                    _dialerViewState.onTextChanged(it)
                 }
             }
         }
diff --git a/koler/src/main/java/com/chooloo/www/koler/ui/main/MainViewState.kt b/koler/src/main/java/com/chooloo/www/koler/ui/main/MainViewState.kt
index 117b4aaba..52fcd13ca 100644
--- a/koler/src/main/java/com/chooloo/www/koler/ui/main/MainViewState.kt
+++ b/koler/src/main/java/com/chooloo/www/koler/ui/main/MainViewState.kt
@@ -1,16 +1,16 @@
 package com.chooloo.www.koler.ui.main
 
-import android.content.ClipData
 import android.content.Intent
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.chooloo.www.chooloolib.interactor.permission.PermissionsInteractor
 import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor
 import com.chooloo.www.chooloolib.interactor.string.StringsInteractor
-import com.chooloo.www.chooloolib.model.ContactAccount
-import com.chooloo.www.chooloolib.model.RecentAccount
 import com.chooloo.www.chooloolib.ui.base.BaseViewState
 import com.chooloo.www.chooloolib.util.DataLiveEvent
 import com.chooloo.www.chooloolib.util.LiveEvent
+import com.chooloo.www.chooloolib.util.MutableDataLiveEvent
+import com.chooloo.www.chooloolib.util.MutableLiveEvent
 import com.chooloo.www.koler.R
 import dagger.hilt.android.lifecycle.HiltViewModel
 import java.net.URLDecoder
@@ -24,41 +24,51 @@ class MainViewState @Inject constructor(
 ) :
     BaseViewState() {
 
-    val searchText = MutableLiveData<String?>()
-    val searchHint = MutableLiveData<String?>()
-    val currentPageIndex = MutableLiveData(0)
-    val isSearching = MutableLiveData(false)
+    private val _searchText = MutableLiveData<String?>()
+    private val _searchHint = MutableLiveData<String?>()
+    private val _currentPageIndex = MutableLiveData(0)
+    private val _isSearching = MutableLiveData(false)
+    private val _showMenuEvent = MutableLiveEvent()
+    private val _showDialerEvent = MutableDataLiveEvent<String>()
 
-    val showMenuEvent = LiveEvent()
-    val showDialerEvent = DataLiveEvent<String>()
+    val searchText = _searchText as LiveData<String?>
+    val searchHint = _searchHint as LiveData<String?>
+    val currentPageIndex = _currentPageIndex as LiveData<Int>
+    val isSearching = _isSearching as LiveData<Boolean>
+    val showMenuEvent = _showMenuEvent as LiveEvent
+    val showDialerEvent = _showDialerEvent as DataLiveEvent<String>
 
 
     override fun attach() {
         super.attach()
         permissions.checkDefaultDialer {}
-        currentPageIndex.value = preferences.defaultPage.index
-        searchHint.value = strings.getString(R.string.hint_search_items)
+        _currentPageIndex.value = preferences.defaultPage.index
+        _searchHint.value = strings.getString(R.string.hint_search_items)
     }
 
     fun onMenuClick() {
-        showMenuEvent.call()
+        _showMenuEvent.call()
     }
 
     fun onDialpadFabClick() {
-        showDialerEvent.call("")
+        _showDialerEvent.call("")
     }
 
     fun onViewIntent(intent: Intent) {
         try {
             val intentText = URLDecoder.decode(intent.dataString ?: "", "utf-8")
-            showDialerEvent.call(intentText.substringAfter("tel:"))
+            _showDialerEvent.call(intentText.substringAfter("tel:").trim())
         } catch (e: Exception) {
-            errorEvent.call(R.string.error_couldnt_get_number_from_intent)
+            onError(R.string.error_couldnt_get_number_from_intent)
         }
     }
 
     fun onSearchFocusChange(isFocus: Boolean) {
-        isSearching.value = isFocus
-        searchHint.value = if (isFocus) "" else strings.getString(R.string.hint_search_items)
+        _isSearching.value = isFocus
+        _searchHint.value = if (isFocus) "" else strings.getString(R.string.hint_search_items)
+    }
+
+    fun onPageSelected(pageIndex: Int) {
+        _currentPageIndex.value = pageIndex
     }
 }
\ No newline at end of file
diff --git a/koler/src/main/java/com/chooloo/www/koler/ui/settings/SettingsFragment.kt b/koler/src/main/java/com/chooloo/www/koler/ui/settings/SettingsFragment.kt
index fdc01f48f..4c038d6f4 100644
--- a/koler/src/main/java/com/chooloo/www/koler/ui/settings/SettingsFragment.kt
+++ b/koler/src/main/java/com/chooloo/www/koler/ui/settings/SettingsFragment.kt
@@ -15,30 +15,56 @@ class SettingsFragment @Inject constructor() : ChoolooSettingsFragment() {
 
         viewState.apply {
             askForDefaultPageEvent.observe(this@SettingsFragment) {
-                it.ifNew?.let { dialogs.askForDefaultPage(viewState::onDefaultPageResponse) }
+                it.ifNew?.let {
+                    dialogs.askForDefaultPage {
+                        viewState.onDefaultPageResponse(it)
+                        true
+                    }
+                }
             }
 
             askForDialpadTonesEvent.observe(this@SettingsFragment) {
-                it.ifNew?.let {
-                    dialogs.askForBoolean(R.string.hint_dialpad_tones, viewState::onDialpadTones)
+                it.ifNew?.let { isActivated ->
+                    dialogs.askForBoolean(
+                        R.string.hint_dialpad_tones,
+                        isActivated
+                    ) {
+                        viewState.onDialpadTones(it)
+                        true
+                    }
                 }
             }
 
             askForDialpadVibrateEvent.observe(this@SettingsFragment) {
-                it.ifNew?.let {
+                it.ifNew?.let { isActivated ->
                     dialogs.askForBoolean(
                         R.string.hint_dialpad_vibrate,
-                        viewState::onDialpadVibrate
-                    )
+                        isActivated
+                    ) {
+                        viewState.onDialpadVibrate(it)
+                        true
+                    }
                 }
             }
 
             askForGroupRecentsEvent.observe(this@SettingsFragment) {
-                it.ifNew?.let {
+                it.ifNew?.let { isActivated ->
                     dialogs.askForBoolean(
                         R.string.hint_group_recents,
-                        viewState::onGroupRecents
-                    )
+                        isActivated
+                    ) {
+                        viewState.onGroupRecents(it)
+                        true
+                    }
+                }
+            }
+
+            askForIncomingCallModeEvent.observe(this@SettingsFragment) {
+                it.ifNew?.let {
+                    dialogs.askForIncomingCallMode {
+                        viewState.onIncomingCallMode(it)
+                        true
+                    }
                 }
             }
         }
diff --git a/koler/src/main/java/com/chooloo/www/koler/ui/settings/SettingsViewState.kt b/koler/src/main/java/com/chooloo/www/koler/ui/settings/SettingsViewState.kt
index 165a78e04..7fdb43c0f 100644
--- a/koler/src/main/java/com/chooloo/www/koler/ui/settings/SettingsViewState.kt
+++ b/koler/src/main/java/com/chooloo/www/koler/ui/settings/SettingsViewState.kt
@@ -3,11 +3,15 @@ package com.chooloo.www.koler.ui.settings
 import com.chooloo.www.chooloolib.interactor.color.ColorsInteractor
 import com.chooloo.www.chooloolib.interactor.navigation.NavigationsInteractor
 import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor
+import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor.Companion.IncomingCallMode
 import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor.Companion.Page
 import com.chooloo.www.chooloolib.interactor.string.StringsInteractor
 import com.chooloo.www.chooloolib.interactor.theme.ThemesInteractor
 import com.chooloo.www.chooloolib.ui.settings.SettingsViewState
+import com.chooloo.www.chooloolib.util.DataLiveEvent
 import com.chooloo.www.chooloolib.util.LiveEvent
+import com.chooloo.www.chooloolib.util.MutableDataLiveEvent
+import com.chooloo.www.chooloolib.util.MutableLiveEvent
 import com.chooloo.www.koler.R
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
@@ -24,17 +28,26 @@ class SettingsViewState @Inject constructor(
 
     override val menuResList = arrayListOf(R.menu.menu_koler) + super.menuResList
 
-    val askForDefaultPageEvent = LiveEvent()
-    val askForGroupRecentsEvent = LiveEvent()
-    val askForDialpadTonesEvent = LiveEvent()
-    val askForDialpadVibrateEvent = LiveEvent()
+    private val _askForDefaultPageEvent = MutableLiveEvent()
+    private val _askForIncomingCallModeEvent = MutableLiveEvent()
+    private val _askForDialpadTonesEvent = MutableDataLiveEvent<Boolean>()
+    private val _askForGroupRecentsEvent = MutableDataLiveEvent<Boolean>()
+    private val _askForDialpadVibrateEvent = MutableDataLiveEvent<Boolean>()
+
+    val askForDefaultPageEvent = _askForDefaultPageEvent as LiveEvent
+    val askForIncomingCallModeEvent = _askForIncomingCallModeEvent as LiveEvent
+    val askForGroupRecentsEvent = _askForGroupRecentsEvent as DataLiveEvent<Boolean>
+    val askForDialpadTonesEvent = _askForDialpadTonesEvent as DataLiveEvent<Boolean>
+    val askForDialpadVibrateEvent = _askForDialpadVibrateEvent as DataLiveEvent<Boolean>
+
 
     override fun onMenuItemClick(itemId: Int) {
         when (itemId) {
-            R.id.menu_koler_default_page -> askForDefaultPageEvent.call()
-            R.id.menu_koler_dialpad_tones -> askForDialpadTonesEvent.call()
-            R.id.menu_koler_group_recents -> askForGroupRecentsEvent.call()
-            R.id.menu_koler_dialpad_vibrate -> askForDialpadVibrateEvent.call()
+            R.id.menu_koler_default_page -> _askForDefaultPageEvent.call()
+            R.id.menu_koler_incoming_call_mode -> _askForIncomingCallModeEvent.call()
+            R.id.menu_koler_dialpad_tones -> _askForDialpadTonesEvent.call(preferences.isDialpadTones)
+            R.id.menu_koler_group_recents -> _askForGroupRecentsEvent.call(preferences.isGroupRecents)
+            R.id.menu_koler_dialpad_vibrate -> _askForDialpadVibrateEvent.call(preferences.isDialpadVibrate)
             else -> super.onMenuItemClick(itemId)
         }
     }
@@ -56,4 +69,8 @@ class SettingsViewState @Inject constructor(
         preferences.isGroupRecents = response
         navigations.goToLauncherActivity()
     }
+
+    fun onIncomingCallMode(response: IncomingCallMode) {
+        preferences.incomingCallMode = response
+    }
 }
diff --git a/koler/src/main/res/layout/main.xml b/koler/src/main/res/layout/main.xml
index 331c426cc..7a4aac115 100644
--- a/koler/src/main/res/layout/main.xml
+++ b/koler/src/main/res/layout/main.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.motion.widget.MotionLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
@@ -10,13 +9,11 @@
     <!-- menu button -->
     <com.chooloo.www.chooloolib.ui.widgets.IconButton
         android:id="@+id/main_menu_button"
+        style="@style/Chooloo.Button.Secondary.Icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:contentDescription="@string/content_description_menu_button"
-        app:icon="@drawable/more_vert"
-        style="@style/Chooloo.Button.Icon.Small"
-        tools:layout_editor_absoluteX="346dp"
-        tools:layout_editor_absoluteY="18dp" />
+        app:icon="@drawable/more_vert" />
 
     <!-- tabs -->
     <com.chooloo.www.chooloolib.ui.widgets.Tabs
@@ -43,8 +40,8 @@
     <!-- dialer button -->
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/main_dialpad_button"
+        style="@style/Chooloo.Button.FAB.Primary"
         android:layout_width="wrap_content"
-        style="@style/Chooloo.Button.FAB"
         android:layout_height="wrap_content"
         android:contentDescription="@string/content_description_dialer_button"
         app:srcCompat="@drawable/dialpad" />
diff --git a/koler/src/main/res/menu/menu_koler.xml b/koler/src/main/res/menu/menu_koler.xml
index 777d3dd45..4b71c952d 100644
--- a/koler/src/main/res/menu/menu_koler.xml
+++ b/koler/src/main/res/menu/menu_koler.xml
@@ -19,4 +19,9 @@
         android:id="@+id/menu_koler_group_recents"
         android:icon="@drawable/recent_actors"
         android:title="@string/pref_title_group_recents" />
+
+    <item
+        android:id="@+id/menu_koler_incoming_call_mode"
+        android:icon="@drawable/phone_msg"
+        android:title="@string/pref_title_incoming_call_mode" />
 </menu>
\ No newline at end of file
diff --git a/koler/src/main/res/values/strings.xml b/koler/src/main/res/values/strings.xml
index 5012aa558..eb3e98045 100644
--- a/koler/src/main/res/values/strings.xml
+++ b/koler/src/main/res/values/strings.xml
@@ -4,6 +4,7 @@
     <string name="pref_title_ask_sim">Should ask for sim</string>
     <string name="pref_title_dialpad_tones">Dialpad click tones</string>
     <string name="pref_title_group_recents">Group similar recents</string>
+    <string name="pref_title_incoming_call_mode">Incoming Call Mode</string>
     <string name="pref_title_dialpad_vibrate">Vibrate on dialpad clicks</string>
     <string name="content_description_dialer_button">dialer button</string>
 </resources>
\ No newline at end of file
diff --git a/koler/src/main/res/xml/main_scene.xml b/koler/src/main/res/xml/main_scene.xml
index 2093d686e..b6a9cce9d 100644
--- a/koler/src/main/res/xml/main_scene.xml
+++ b/koler/src/main/res/xml/main_scene.xml
@@ -64,8 +64,8 @@
             android:id="@+id/main_dialpad_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/default_spacing_big"
             android:layout_marginEnd="@dimen/default_spacing_big"
+            android:layout_marginBottom="@dimen/default_spacing_big"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
     </ConstraintSet>
@@ -121,8 +121,8 @@
             android:id="@+id/main_dialpad_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/default_spacing_medium"
             android:layout_marginEnd="@dimen/default_spacing_medium"
+            android:layout_marginBottom="@dimen/default_spacing_medium"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
     </ConstraintSet>
diff --git a/kontacts/build.gradle b/kontacts/build.gradle
index c71483fae..e5eb7977c 100644
--- a/kontacts/build.gradle
+++ b/kontacts/build.gradle
@@ -1,114 +1,116 @@
 plugins {
-    id 'com.android.application'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'dagger.hilt.android.plugin'
+    id "com.android.application"
+    id "kotlin-android"
+    id "kotlin-kapt"
+    id "dagger.hilt.android.plugin"
+    id "org.jetbrains.kotlin.android"
 }
 
 android {
-    compileSdk 31
+    namespace "com.chooloo.www.kontacts"
+    compileSdk rootProject.ext.sdkVersion
 
     defaultConfig {
-        applicationId "com.chooloo.www.kontacts"
-        minSdk 25
-        targetSdk 31
         versionCode 1
         versionName "1.0"
+        applicationId "com.chooloo.www.kontacts"
+        targetSdk rootProject.ext.sdkVersion
+        minSdk rootProject.ext.minSdkVersion
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    dataBinding {
-        //noinspection DataBindingWithoutKapt
-        enabled = true
-    }
-
-    buildFeatures {
-        viewBinding true
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments += ["room.schemaLocation": "$projectDir/schemas".toString()]
+            }
+        }
     }
 
     buildTypes {
         release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
+        targetCompatibility JavaVersion.VERSION_18
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_18.toString()
     }
 
-    hilt {
-        enableAggregatingTask true
-    }
-
-    kapt {
-        correctErrorTypes true
-    }
+    kotlin { jvmToolchain(18) }
+    dataBinding { enabled true }
+    kapt { correctErrorTypes true }
+    lint { checkReleaseBuilds false }
+    buildFeatures { viewBinding true }
+    hilt { enableAggregatingTask true }
 }
 
 dependencies {
     kapt(
-            'com.google.dagger:hilt-compiler:2.38.1',
-            'androidx.hilt:hilt-compiler:1.0.0-alpha01'
+            "androidx.hilt:hilt-compiler:1.0.0",
+            "com.google.dagger:hilt-compiler:${rootProject.ext.hiltVersion}"
+    )
+
+    annotationProcessor(
+            "androidx.room:room-compiler:2.5.0"
     )
 
     testImplementation(
-            'junit:junit:4.+',
-            'androidx.room:room-testing:2.2.6'
+            "junit:junit:4.13.2",
+            "androidx.room:room-testing:2.2.6"
     )
 
     androidTestImplementation(
-            'androidx.test:core:1.3.0',
-            'androidx.test:runner:1.3.0',
-            'androidx.test.ext:junit:1.1.2',
-            'com.jraska.livedata:testing:1.0.0',
-            'org.mockito:mockito-android:2.24.0',
-            'androidx.arch.core:core-testing:2.1.0',
+            "androidx.test:core:1.3.0",
+            "androidx.test:runner:1.3.0",
+            "androidx.test.ext:junit:1.1.2",
+            "com.jraska.livedata:testing:1.0.0",
+            "org.mockito:mockito-android:2.24.0",
+            "androidx.arch.core:core-testing:2.1.0",
             "androidx.compose.ui:ui-test-junit4:1.0.4",
-            'androidx.test.espresso:espresso-core:3.3.0'
+            "androidx.test.espresso:espresso-core:3.3.0"
     )
 
     implementation(
             project(":chooloolib"),
-            fileTree(include: ['*.jar'], dir: 'libs'),
-            'androidx.wear:wear:1.1.0',
-            'androidx.core:core-ktx:1.6.0',
-            'dev.sasikanth:colorsheet:1.0.1',
-            'androidx.room:room-runtime:2.2.6',
-            'androidx.cardview:cardview:1.0.0',
-            'io.reactivex.rxjava2:rxjava:2.1.16',
-            'androidx.appcompat:appcompat:1.2.0',
-            'com.jakewharton.timber:timber:4.7.1',
-            'androidx.activity:activity-ktx:1.1.0',
-            'io.github.l4digital:fastscroll:2.0.1',
-            'androidx.arch.core:core-common:2.1.0',
-            'io.reactivex.rxjava2:rxandroid:2.0.1',
-            'androidx.annotation:annotation:1.1.0',
-            'androidx.fragment:fragment-ktx:1.1.0',
-            'com.github.skydoves:androidveil:1.1.1',
-            'androidx.arch.core:core-runtime:2.1.0',
-            'com.google.dagger:hilt-android:2.38.1',
-            'com.reddit:indicator-fast-scroll:1.4.0',
-            'androidx.legacy:legacy-support-v4:1.0.0',
-            'androidx.preference:preference-ktx:1.1.1',
-            'org.jetbrains.kotlin:kotlin-stdlib:1.4.21',
-            'androidx.biometric:biometric:1.2.0-alpha02',
-            'com.google.android.material:material:1.3.0',
-            'com.android.support:recyclerview-v7:23.2.1',
-            'com.github.abdularis:circularimageview:1.5',
-            'androidx.navigation:navigation-ui-ktx:2.3.3',
-            'androidx.lifecycle:lifecycle-extensions:2.2.0',
-            'com.daimajia.androidanimations:library:2.4@aar',
-            'androidx.constraintlayout:constraintlayout:2.0.4',
-            'com.pushtorefresh.storio3:content-resolver:3.0.0',
-            'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0',
-            'androidx.navigation:navigation-fragment-ktx:2.3.3',
-            'com.googlecode.libphonenumber:libphonenumber:8.12.18'
+            fileTree(include: ["*.jar"], dir: "libs"),
+
+            // ktx
+            "androidx.fragment:fragment-ktx:1.5.5",
+            "androidx.activity:activity-ktx:1.6.1",
+            "androidx.preference:preference-ktx:1.2.0",
+            "androidx.navigation:navigation-ui-ktx:2.5.3",
+            "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1",
+            "androidx.navigation:navigation-fragment-ktx:2.5.3",
+            "androidx.core:core-ktx:${rootProject.ext.coreKtxVersion}",
+
+            "dev.sasikanth:colorsheet:1.0.1",
+            "androidx.room:room-runtime:2.2.6",
+            "androidx.cardview:cardview:1.0.0",
+            "io.reactivex.rxjava2:rxjava:2.1.16",
+            "com.jakewharton.timber:timber:4.7.1",
+            "io.github.l4digital:fastscroll:2.0.1",
+            "androidx.arch.core:core-common:2.1.0",
+            "io.reactivex.rxjava2:rxandroid:2.0.1",
+            "androidx.annotation:annotation:1.1.0",
+            "com.github.skydoves:androidveil:1.1.1",
+            "androidx.arch.core:core-runtime:2.1.0",
+            "com.reddit:indicator-fast-scroll:1.4.0",
+            "androidx.legacy:legacy-support-v4:1.0.0",
+            "org.jetbrains.kotlin:kotlin-stdlib:1.4.21",
+            "androidx.biometric:biometric:1.2.0-alpha02",
+            "com.google.android.material:material:1.3.0",
+            "com.android.support:recyclerview-v7:23.2.1",
+            "com.github.abdularis:circularimageview:1.5",
+            "androidx.lifecycle:lifecycle-extensions:2.2.0",
+            "com.daimajia.androidanimations:library:2.4@aar",
+            "androidx.constraintlayout:constraintlayout:2.1.4",
+            "com.pushtorefresh.storio3:content-resolver:3.0.0",
+            "com.googlecode.libphonenumber:libphonenumber:8.12.18",
+            "com.google.dagger:hilt-android:${rootProject.ext.hiltVersion}",
+            "androidx.appcompat:appcompat:${rootProject.ext.appCompatVersion}",
     )
 }
diff --git a/kontacts/src/main/AndroidManifest.xml b/kontacts/src/main/AndroidManifest.xml
index 7f8e453d0..7b84ae36d 100644
--- a/kontacts/src/main/AndroidManifest.xml
+++ b/kontacts/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.chooloo.www.kontacts">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.READ_CALL_LOG" />
diff --git a/kontacts/src/main/java/com/chooloo/www/kontacts/KontactsApp.kt b/kontacts/src/main/java/com/chooloo/www/kontacts/KontactsApp.kt
index c19b1db4d..aa8a1f622 100644
--- a/kontacts/src/main/java/com/chooloo/www/kontacts/KontactsApp.kt
+++ b/kontacts/src/main/java/com/chooloo/www/kontacts/KontactsApp.kt
@@ -1,7 +1,7 @@
 package com.chooloo.www.kontacts
 
-import com.chooloo.www.chooloolib.BaseApp
+import com.chooloo.www.chooloolib.ChoolooApp
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
-class KontactsApp : BaseApp()
\ No newline at end of file
+class KontactsApp : ChoolooApp()
\ No newline at end of file
diff --git a/kontacts/src/main/java/com/chooloo/www/kontacts/ui/contact/ContactFragment.kt b/kontacts/src/main/java/com/chooloo/www/kontacts/ui/contact/ContactFragment.kt
index 6ef65f082..b38ee5541 100644
--- a/kontacts/src/main/java/com/chooloo/www/kontacts/ui/contact/ContactFragment.kt
+++ b/kontacts/src/main/java/com/chooloo/www/kontacts/ui/contact/ContactFragment.kt
@@ -2,10 +2,9 @@ package com.chooloo.www.kontacts.ui.contact
 
 import android.os.Bundle
 import androidx.fragment.app.activityViewModels
-import com.chooloo.www.chooloolib.di.factory.fragment.FragmentFactory
+import androidx.fragment.app.commit
 import com.chooloo.www.chooloolib.interactor.prompt.PromptsInteractor
 import com.chooloo.www.chooloolib.interactor.telecom.TelecomInteractor
-import com.chooloo.www.chooloolib.ui.accounts.AccountsFragment
 import com.chooloo.www.chooloolib.ui.base.BaseFragment
 import com.chooloo.www.kontacts.databinding.ContactBinding
 import dagger.hilt.android.AndroidEntryPoint
@@ -17,18 +16,17 @@ class ContactFragment : BaseFragment<ContactViewState>() {
     override val viewState: ContactViewState by activityViewModels()
 
     private val binding by lazy { ContactBinding.inflate(layoutInflater) }
-    private val accountsFragment by lazy { fragmentFactory.getAccountsFragment() }
 
-    @Inject lateinit var prompts: PromptsInteractor
-    @Inject lateinit var fragmentFactory: FragmentFactory
-    @Inject lateinit var telecomInteractor: TelecomInteractor
+    @Inject
+    lateinit var prompts: PromptsInteractor
+
+    @Inject
+    lateinit var telecomInteractor: TelecomInteractor
 
 
     override fun onSetup() {
         viewState.apply {
-            contactId.observe(this@ContactFragment) {
-                setRawContactsFragment(accountsFragment)
-            }
+            contactId.observe(this@ContactFragment, ::setRawContactsFragment)
 
             callEvent.observe(this@ContactFragment) {
                 it.ifNew?.let(telecomInteractor::callNumber)
@@ -51,7 +49,6 @@ class ContactFragment : BaseFragment<ContactViewState>() {
 
         binding.apply {
             contactButtonSms.setOnClickListener { viewState.onSmsClick() }
-            contactButtonCall.setOnClickListener { viewState.onCallClick() }
             contactButtonEdit.setOnClickListener { viewState.onEditClick() }
             contactButtonDelete.setOnClickListener { viewState.onDeleteClick() }
             contactButtonHistory.setOnClickListener { viewState.onHistoryClick() }
@@ -61,11 +58,11 @@ class ContactFragment : BaseFragment<ContactViewState>() {
         arguments?.getLong(ARG_CONTACT_ID)?.let { viewState.onContactId(it) }
     }
 
-    private fun setRawContactsFragment(accountsFragment: AccountsFragment) {
-        childFragmentManager
-            .beginTransaction()
-            .replace(binding.contactPhonesContainer.id, accountsFragment)
-            .commit()
+    private fun setRawContactsFragment(contactId: Long) {
+        val accountsFragment = fragmentFactory.getAccountsFragment(contactId)
+        childFragmentManager.commit {
+            replace(binding.contactPhonesContainer.id, accountsFragment)
+        }
     }
 
     companion object {
diff --git a/kontacts/src/main/java/com/chooloo/www/kontacts/ui/contact/ContactViewState.kt b/kontacts/src/main/java/com/chooloo/www/kontacts/ui/contact/ContactViewState.kt
index 1d2866619..164562409 100644
--- a/kontacts/src/main/java/com/chooloo/www/kontacts/ui/contact/ContactViewState.kt
+++ b/kontacts/src/main/java/com/chooloo/www/kontacts/ui/contact/ContactViewState.kt
@@ -2,14 +2,16 @@ package com.chooloo.www.kontacts.ui.contact
 
 import android.net.Uri
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.chooloo.www.chooloolib.data.model.ContactAccount
+import com.chooloo.www.chooloolib.data.model.PhoneAccount
 import com.chooloo.www.chooloolib.interactor.contacts.ContactsInteractor
 import com.chooloo.www.chooloolib.interactor.navigation.NavigationsInteractor
 import com.chooloo.www.chooloolib.interactor.phoneaccounts.PhonesInteractor
-import com.chooloo.www.chooloolib.model.ContactAccount
-import com.chooloo.www.chooloolib.model.PhoneAccount
 import com.chooloo.www.chooloolib.ui.base.BaseViewState
 import com.chooloo.www.chooloolib.util.DataLiveEvent
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
@@ -21,8 +23,8 @@ class ContactViewState @Inject constructor(
     val callEvent = DataLiveEvent<String>()
     val contactId = MutableLiveData<Long>()
     val contactImage = MutableLiveData<Uri>()
-    val contactName = MutableLiveData<String>()
     var isFavorite = MutableLiveData<Boolean>()
+    val contactName = MutableLiveData<String>()
     val showHistoryEvent = DataLiveEvent<String>()
 
     private var contact: ContactAccount? = null
@@ -30,18 +32,20 @@ class ContactViewState @Inject constructor(
 
     private fun withFirstNumber(callback: (PhoneAccount) -> Unit) {
         contact?.let {
-            phones.getContactAccounts(it.id) {
-                it?.getOrNull(0)?.let(callback::invoke)
+            viewModelScope.launch {
+                phones.getContactAccounts(it.id).getOrNull(0)?.let(callback::invoke)
             }
         }
     }
 
     fun onContactId(contactId: Long) {
-        contacts.observeContact(contactId) { ca ->
-            contact = ca
-            contactName.value = ca?.name
-            isFavorite.value = ca?.starred == true
-            ca?.photoUri?.let { contactImage.value = Uri.parse(it) }
+        viewModelScope.launch {
+            contacts.getContact(contactId).collect { contact ->
+                this@ContactViewState.contact = contact
+                contactName.value = contact?.name ?: "Unknown"
+                isFavorite.value = contact?.starred == true
+                contact?.photoUri?.let { contactImage.value = Uri.parse(it) }
+            }
         }
     }
 
@@ -67,7 +71,7 @@ class ContactViewState @Inject constructor(
     fun onDeleteClick() {
         contact?.let {
             contacts.deleteContact(it.id)
-            finishEvent.call()
+            onFinish()
         }
     }
 }
\ No newline at end of file
diff --git a/kontacts/src/main/java/com/chooloo/www/kontacts/ui/main/MainActivity.kt b/kontacts/src/main/java/com/chooloo/www/kontacts/ui/main/MainActivity.kt
index c7ef7f714..e49d5861f 100644
--- a/kontacts/src/main/java/com/chooloo/www/kontacts/ui/main/MainActivity.kt
+++ b/kontacts/src/main/java/com/chooloo/www/kontacts/ui/main/MainActivity.kt
@@ -1,6 +1,7 @@
 package com.chooloo.www.kontacts.ui.main
 
 import androidx.activity.viewModels
+import androidx.fragment.app.commit
 import com.chooloo.www.chooloolib.interactor.prompt.PromptsInteractor
 import com.chooloo.www.chooloolib.ui.base.BaseActivity
 import com.chooloo.www.kontacts.R
@@ -57,10 +58,9 @@ class MainActivity : BaseActivity<MainViewState>() {
             }
         }
 
-        supportFragmentManager
-            .beginTransaction()
-            .replace(binding.mainFragmentContainer.id, contactsFragment)
-            .commit()
+        supportFragmentManager.commit {
+            replace(binding.mainFragmentContainer.id, contactsFragment)
+        }
 
         viewState.onIntent(intent)
     }
diff --git a/kontacts/src/main/java/com/chooloo/www/kontacts/ui/main/MainViewState.kt b/kontacts/src/main/java/com/chooloo/www/kontacts/ui/main/MainViewState.kt
index 183758748..3754478e0 100644
--- a/kontacts/src/main/java/com/chooloo/www/kontacts/ui/main/MainViewState.kt
+++ b/kontacts/src/main/java/com/chooloo/www/kontacts/ui/main/MainViewState.kt
@@ -5,7 +5,7 @@ import android.content.Intent.ACTION_VIEW
 import android.net.Uri
 import androidx.lifecycle.MutableLiveData
 import com.chooloo.www.chooloolib.interactor.navigation.NavigationsInteractor
-import com.chooloo.www.chooloolib.model.ContactAccount
+import com.chooloo.www.chooloolib.data.model.ContactAccount
 import com.chooloo.www.chooloolib.ui.base.BaseViewState
 import com.chooloo.www.chooloolib.util.DataLiveEvent
 import com.chooloo.www.chooloolib.util.LiveEvent
diff --git a/kontacts/src/main/java/com/chooloo/www/kontacts/ui/quickcontact/QuickContactViewState.kt b/kontacts/src/main/java/com/chooloo/www/kontacts/ui/quickcontact/QuickContactViewState.kt
index 66c6d25f7..0eff67c46 100644
--- a/kontacts/src/main/java/com/chooloo/www/kontacts/ui/quickcontact/QuickContactViewState.kt
+++ b/kontacts/src/main/java/com/chooloo/www/kontacts/ui/quickcontact/QuickContactViewState.kt
@@ -17,11 +17,11 @@ class QuickContactViewState @Inject constructor(
         intent.data?.let {
             showContactEvent.call(ContentUris.parseId(it))
         } ?: run {
-            finishEvent.call()
+            onFinish()
         }
     }
 
     fun onFragmentFinish() {
-        finishEvent.call()
+        onFinish()
     }
 }
\ No newline at end of file
diff --git a/kontacts/src/main/res/layout/contact.xml b/kontacts/src/main/res/layout/contact.xml
index 0050867d2..09e6e9b26 100644
--- a/kontacts/src/main/res/layout/contact.xml
+++ b/kontacts/src/main/res/layout/contact.xml
@@ -29,7 +29,7 @@
     <com.chooloo.www.chooloolib.ui.widgets.IconButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/contact_button_call"
+        android:id="@+id/brief_contact_button_call"
         app:layout_constraintEnd_toStartOf="@id/contact_button_edit"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/contact_name"
@@ -41,7 +41,7 @@
         android:layout_height="@dimen/icon_button_size_normal"
         android:layout_marginTop="@dimen/default_spacing_big"
         android:icon="@drawable/edit"
-        app:layout_constraintStart_toEndOf="@id/contact_button_call"
+        app:layout_constraintStart_toEndOf="@id/brief_contact_button_call"
         app:layout_constraintTop_toBottomOf="@id/contact_name"
         app:layout_constraintEnd_toStartOf="@id/contact_button_delete" />
 
@@ -75,7 +75,7 @@
         android:text="@string/action_show_history"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/contact_button_call" />
+        app:layout_constraintTop_toBottomOf="@id/brief_contact_button_call" />
 
     <Button
         android:id="@+id/contact_button_whatsapp"
@@ -84,12 +84,12 @@
         android:layout_marginStart="@dimen/default_spacing_small"
         android:layout_marginTop="@dimen/default_spacing"
         android:layout_marginEnd="@dimen/default_spacing"
-        android:backgroundTint="@color/green_primary_container"
+        android:backgroundTint="@color/positive"
         android:text="@string/action_open_whatsapp"
-        android:textColor="@color/green_on_primary_container"
+        android:textColor="@color/positive"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/contact_button_history"
-        app:layout_constraintTop_toBottomOf="@id/contact_button_call" />
+        app:layout_constraintTop_toBottomOf="@id/brief_contact_button_call" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/contact_phones_container"
diff --git a/kontacts/src/main/res/layout/main.xml b/kontacts/src/main/res/layout/main.xml
index 9ba245aa0..f9c6a3e62 100644
--- a/kontacts/src/main/res/layout/main.xml
+++ b/kontacts/src/main/res/layout/main.xml
@@ -12,8 +12,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:contentDescription="@string/content_description_menu_button"
-        android:tint="?colorOnBackground"
-        app:backgroundTint="?colorPrimarySurface"
         app:borderWidth="0dp"
         app:icon="@drawable/more_vert" />
 
diff --git a/kontacts/src/main/res/xml/contact_scene.xml b/kontacts/src/main/res/xml/contact_scene.xml
index ecd43a84c..dfe26b453 100644
--- a/kontacts/src/main/res/xml/contact_scene.xml
+++ b/kontacts/src/main/res/xml/contact_scene.xml
@@ -20,7 +20,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/contact_image" />
         <Constraint
-            android:id="@+id/contact_button_call"
+            android:id="@+id/brief_contact_button_call"
             android:layout_width="@dimen/icon_button_size_normal"
             android:layout_height="@dimen/icon_button_size_normal"
             android:layout_marginTop="@dimen/default_spacing_big"
@@ -33,7 +33,7 @@
             android:layout_height="@dimen/icon_button_size_normal"
             android:layout_marginTop="@dimen/default_spacing_big"
             app:layout_constraintEnd_toStartOf="@id/brief_contact_button_delete"
-            app:layout_constraintStart_toEndOf="@id/contact_button_call" />
+            app:layout_constraintStart_toEndOf="@id/brief_contact_button_call" />
         <Constraint
             android:id="@+id/brief_contact_button_delete"
             android:layout_width="@dimen/icon_button_size_normal"