diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
new file mode 100644
index 00000000..4bd6c97d
--- /dev/null
+++ b/.github/workflows/build-release.yml
@@ -0,0 +1,54 @@
+name: Build and release app
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - 'v*.*'
+
+jobs:
+  build:
+    name: Build, sign and release app
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: "zulu"
+          java-version: "17"
+          cache: "gradle"
+
+      - name: Build APK
+        run: ./gradlew assembleRelease --no-daemon
+
+      - name: Sign APK
+        uses: ilharp/sign-android-release@v1
+        id: sign
+        with:
+          signingKey: ${{ secrets.KEYSTORE }}
+          keyAlias: ${{ secrets.SIGNING_KEY_ALIAS }}
+          keyStorePassword: ${{ secrets.SIGNING_STORE_PASSWORD }}
+          keyPassword: ${{ secrets.SIGNING_KEY_PASSWORD }}
+
+      - name: Rename signed APK
+        run: |
+          mv "${{ steps.sign.outputs.signedFile }}" "app-release.apk"
+
+      - name: Create changelog
+        id: changelog
+        uses: requarks/changelog-action@v1
+        with:
+          token: ${{ github.token }}
+          tag: ${{ github.ref_name }}
+
+      - name: Create release
+        uses: softprops/action-gh-release@v2
+        with:
+          body: ${{ steps.changelog.outputs.changes }}
+          files: "app-release.apk"
+          fail_on_unmatched_files: true
+          make_latest: true
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b589d56e..b86273d9 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0897082f..7b3006b6 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,6 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 103e00cb..6195b36e 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,32 +1,68 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewDeviceShouldUseNewSpec" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
   </profile>
 </component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2188b52b..d3ede73a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="EntryPointsManager">
     <list size="1">
@@ -5,7 +6,52 @@
     </list>
   </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="androidx.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="androidx.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="15">
+          <item index="0" class="java.lang.String" itemvalue="org.jspecify.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="3" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="4" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
+          <item index="7" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="8" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="9" class="java.lang.String" itemvalue="jakarta.annotation.Nullable" />
+          <item index="10" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="11" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="12" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="13" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
+          <item index="14" class="java.lang.String" itemvalue="android.annotation.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="14">
+          <item index="0" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="1" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="2" class="java.lang.String" itemvalue="org.jspecify.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="jakarta.annotation.Nonnull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
+          <item index="6" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="7" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
+          <item index="8" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="10" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="11" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="12" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
+          <item index="13" class="java.lang.String" itemvalue="android.annotation.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 58892360..638757b6 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,16 +1,22 @@
 plugins {
     id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.kapt")
+    kotlin("android")
+    id("com.google.devtools.ksp")
+    id("kotlin-parcelize")
+    id("org.jetbrains.kotlin.plugin.serialization") version "1.9.23"
 }
 
 android {
     namespace = "com.bnyro.contacts"
-    compileSdk = 33
+    compileSdk = 34
+
+    androidResources {
+        generateLocaleConfig = true
+    }
 
     defaultConfig {
         applicationId = "com.bnyro.contacts"
-        minSdk = 21
+        minSdk = 23
         targetSdk = 33
         versionCode = 28
         versionName = "9.0"
@@ -20,10 +26,8 @@ android {
             useSupportLibrary = true
         }
 
-        kapt {
-            arguments {
-                arg("room.schemaLocation", "$projectDir/schemas")
-            }
+        ksp {
+            arg("room.schemaLocation", "$projectDir/schemas")
         }
     }
 
@@ -52,7 +56,7 @@ android {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.2"
+        kotlinCompilerExtensionVersion = "1.5.11"
     }
     packagingOptions {
         resources {
@@ -64,43 +68,57 @@ android {
 dependencies {
     val compose_version: String by rootProject.extra
     // Core & Lifecycle
-    implementation("androidx.core:core-ktx:1.10.1")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
+    implementation("androidx.core:core-ktx:1.12.0")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0")
     implementation("androidx.documentfile:documentfile:1.0.1")
-    implementation("androidx.work:work-runtime-ktx:2.8.1")
+    implementation("androidx.work:work-runtime-ktx:2.9.0")
 
     // Compose & UI
-    implementation("androidx.activity:activity-compose:1.7.2")
-    implementation("androidx.compose.ui:ui:$compose_version")
-    implementation("androidx.compose.ui:ui-tooling-preview:$compose_version")
-    implementation("androidx.compose.material3:material3:1.2.0-alpha02")
-    implementation("androidx.compose.material:material-icons-extended:1.4.3")
+    implementation("androidx.activity:activity-compose:1.9.0")
+    implementation(platform("androidx.compose:compose-bom:2024.05.00"))
+    implementation("androidx.compose.ui:ui")
+    implementation("androidx.compose.ui:ui-graphics")
+    implementation("androidx.compose.ui:ui-tooling-preview")
+    implementation("androidx.compose.material3:material3")
+    implementation("androidx.compose.material:material-icons-extended:1.6.7")
     implementation("com.github.nanihadesuka:LazyColumnScrollbar:1.9.0")
+    implementation("androidx.navigation:navigation-compose:2.8.0-alpha08")
 
     // VCard
     implementation("com.googlecode.ez-vcard:ez-vcard:0.11.3")
     implementation("net.lingala.zip4j:zip4j:2.11.5")
 
     // Image parsing
-    implementation("androidx.exifinterface:exifinterface:1.3.6")
+    implementation("androidx.exifinterface:exifinterface:1.3.7")
+    implementation("io.coil-kt:coil-compose:2.6.0")
 
     // Phone number formatting
-    implementation("com.googlecode.libphonenumber:libphonenumber:8.2.0")
+    implementation("com.googlecode.libphonenumber:libphonenumber:8.13.35")
+
+    // Biometrics
+    implementation("androidx.biometric:biometric-ktx:1.2.0-alpha05")
 
     // Markdown support for notes
     implementation("com.halilibo.compose-richtext:richtext-ui-material3:0.17.0")
     implementation("com.halilibo.compose-richtext:richtext-commonmark:0.17.0")
 
     // Room database
-    implementation("androidx.room:room-ktx:2.5.1")
-    kapt("androidx.room:room-compiler:2.5.1")
+    val roomVersion = "2.6.1"
+
+    implementation("androidx.room:room-runtime:$roomVersion")
+    implementation("androidx.room:room-ktx:$roomVersion")
+    annotationProcessor("androidx.room:room-compiler:$roomVersion")
+    ksp("androidx.room:room-compiler:$roomVersion")
+
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
 
     // Testing
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-    androidTestImplementation("androidx.compose.ui:ui-test-junit4:$compose_version")
-    debugImplementation("androidx.compose.ui:ui-tooling:$compose_version")
-    debugImplementation("androidx.compose.ui:ui-test-manifest:$compose_version")
+    androidTestImplementation(platform("androidx.compose:compose-bom:2024.05.00"))
+    androidTestImplementation("androidx.compose.ui:ui-test-junit4")
+    debugImplementation("androidx.compose.ui:ui-tooling")
+    debugImplementation("androidx.compose.ui:ui-test-manifest")
 }
diff --git a/app/schemas/com.bnyro.contacts.db.AppDatabase/2.json b/app/schemas/com.bnyro.contacts.data.database.AppDatabase/2.json
similarity index 100%
rename from app/schemas/com.bnyro.contacts.db.AppDatabase/2.json
rename to app/schemas/com.bnyro.contacts.data.database.AppDatabase/2.json
diff --git a/app/schemas/com.bnyro.contacts.db.AppDatabase/3.json b/app/schemas/com.bnyro.contacts.data.database.AppDatabase/3.json
similarity index 100%
rename from app/schemas/com.bnyro.contacts.db.AppDatabase/3.json
rename to app/schemas/com.bnyro.contacts.data.database.AppDatabase/3.json
diff --git a/app/schemas/com.bnyro.contacts.db.AppDatabase/4.json b/app/schemas/com.bnyro.contacts.data.database.AppDatabase/4.json
similarity index 100%
rename from app/schemas/com.bnyro.contacts.db.AppDatabase/4.json
rename to app/schemas/com.bnyro.contacts.data.database.AppDatabase/4.json
diff --git a/app/schemas/com.bnyro.contacts.data.database.AppDatabase/5.json b/app/schemas/com.bnyro.contacts.data.database.AppDatabase/5.json
new file mode 100644
index 00000000..e0aa2a74
--- /dev/null
+++ b/app/schemas/com.bnyro.contacts.data.database.AppDatabase/5.json
@@ -0,0 +1,171 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 5,
+    "identityHash": "d90f0abe705f87ae3f5682c2f4b7c8a8",
+    "entities": [
+      {
+        "tableName": "localContacts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `displayName` TEXT, `firstName` TEXT, `surName` TEXT, `nickName` TEXT, `title` TEXT, `organization` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "displayName",
+            "columnName": "displayName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstName",
+            "columnName": "firstName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "surName",
+            "columnName": "surName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "nickName",
+            "columnName": "nickName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "organization",
+            "columnName": "organization",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "valuableTypes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `contactId` INTEGER NOT NULL, `category` INTEGER NOT NULL, `value` TEXT NOT NULL, `type` INTEGER)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contactId",
+            "columnName": "contactId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "localSms",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `address` TEXT NOT NULL, `body` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, `threadId` INTEGER NOT NULL, `type` INTEGER NOT NULL, `simNumber` INTEGER DEFAULT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "body",
+            "columnName": "body",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "threadId",
+            "columnName": "threadId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "simNumber",
+            "columnName": "simNumber",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "NULL"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd90f0abe705f87ae3f5682c2f4b7c8a8')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/com.bnyro.contacts.data.database.AppDatabase/6.json b/app/schemas/com.bnyro.contacts.data.database.AppDatabase/6.json
new file mode 100644
index 00000000..668ea914
--- /dev/null
+++ b/app/schemas/com.bnyro.contacts.data.database.AppDatabase/6.json
@@ -0,0 +1,178 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 6,
+    "identityHash": "45dcecae89c80128ab3c91537794287f",
+    "entities": [
+      {
+        "tableName": "localContacts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `displayName` TEXT, `firstName` TEXT, `surName` TEXT, `nickName` TEXT, `title` TEXT, `organization` TEXT, `favorite` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "displayName",
+            "columnName": "displayName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstName",
+            "columnName": "firstName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "surName",
+            "columnName": "surName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "nickName",
+            "columnName": "nickName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "organization",
+            "columnName": "organization",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "favorite",
+            "columnName": "favorite",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "valuableTypes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `contactId` INTEGER NOT NULL, `category` INTEGER NOT NULL, `value` TEXT NOT NULL, `type` INTEGER)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contactId",
+            "columnName": "contactId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "localSms",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `address` TEXT NOT NULL, `body` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, `threadId` INTEGER NOT NULL, `type` INTEGER NOT NULL, `simNumber` INTEGER DEFAULT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "body",
+            "columnName": "body",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "threadId",
+            "columnName": "threadId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "simNumber",
+            "columnName": "simNumber",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "NULL"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '45dcecae89c80128ab3c91537794287f')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 92ce6102..8423160e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -28,6 +28,17 @@
     <!-- Sms notifications -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
+    <!-- Dialing support -->
+    <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
+    <uses-permission android:name="android.permission.ANSWER_PHONE_CALLS" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <uses-permission android:name="android.permission.CALL_PHONE" />
+    <uses-permission android:name="android.permission.READ_CALL_LOG" />
+    <uses-permission android:name="android.permission.WRITE_CALL_LOG" />
+    <uses-permission
+        android:name="android.permission.MODIFY_PHONE_STATE"
+        tools:ignore="ProtectedPermissions" />
+
     <!-- Opt out from network permissions declared by whatever dependency -->
     <uses-permission
         android:name="android.permission.ACCESS_NETWORK_STATE"
@@ -46,7 +57,9 @@
 
         <activity
             android:name=".ui.activities.MainActivity"
-            android:exported="true">
+            android:exported="true"
+            android:launchMode="singleTop"
+            android:windowSoftInputMode="adjustResize">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -140,6 +153,24 @@
                 <data android:scheme="mms" />
                 <data android:scheme="mmsto" />
             </intent-filter>
+
+            <!-- Receive phone calls -->
+            <intent-filter>
+                <action android:name="android.intent.action.DIAL" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.DIAL" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="tel" />
+            </intent-filter>
+
         </activity>
 
         <activity
@@ -179,6 +210,10 @@
 
         </activity>
 
+        <activity
+            android:name=".ui.activities.CallActivity"
+            android:exported="false" />
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
@@ -190,7 +225,7 @@
         </provider>
 
         <receiver
-            android:name=".receivers.SmsReceiver"
+            android:name=".util.receivers.SmsReceiver"
             android:exported="true"
             android:permission="android.permission.BROADCAST_SMS">
 
@@ -200,20 +235,21 @@
         </receiver>
 
         <receiver
-            android:name=".receivers.ReplyReceiver"
+            android:name=".util.receivers.ReplyReceiver"
             android:exported="false" />
 
         <receiver
-            android:name=".receivers.DeleteSmsReceiver"
+            android:name=".util.receivers.DeleteSmsReceiver"
             android:exported="false" />
 
         <receiver
-            android:name=".receivers.CopyTextReceiver"
+            android:name=".util.receivers.CopyTextReceiver"
             android:exported="false" />
 
+
         <!-- BroadcastReceiver that listens for incoming MMS messages -->
         <receiver
-            android:name=".receivers.MmsReceiver"
+            android:name=".util.receivers.MmsReceiver"
             android:exported="true"
             android:permission="android.permission.BROADCAST_WAP_PUSH">
 
@@ -225,7 +261,7 @@
 
         <!-- Service that delivers messages from the phone "quick response" -->
         <service
-            android:name=".services.HeadlessSmsSendService"
+            android:name=".util.services.HeadlessSmsSendService"
             android:exported="true"
             android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE">
 
@@ -239,6 +275,20 @@
                 <data android:scheme="mmsto" />
             </intent-filter>
         </service>
+
+        <service
+            android:name=".util.services.CallService"
+            android:exported="true"
+            android:foregroundServiceType="phoneCall"
+            android:permission="android.permission.BIND_INCALL_SERVICE">
+            <meta-data
+                android:name="android.telecom.IN_CALL_SERVICE_UI"
+                android:value="true" />
+
+            <intent-filter>
+                <action android:name="android.telecom.InCallService" />
+            </intent-filter>
+        </service>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/App.kt b/app/src/main/java/com/bnyro/contacts/App.kt
index 7cdcf386..40418c58 100644
--- a/app/src/main/java/com/bnyro/contacts/App.kt
+++ b/app/src/main/java/com/bnyro/contacts/App.kt
@@ -1,16 +1,18 @@
 package com.bnyro.contacts
 
 import android.app.Application
-import com.bnyro.contacts.db.DatabaseHolder
-import com.bnyro.contacts.repo.DeviceContactsRepository
-import com.bnyro.contacts.repo.DeviceSmsRepo
-import com.bnyro.contacts.repo.LocalContactsRepository
-import com.bnyro.contacts.repo.LocalSmsRepo
-import com.bnyro.contacts.repo.SmsRepository
+import com.bnyro.contacts.data.database.DatabaseHolder
+import com.bnyro.contacts.domain.repositories.CallLogRepository
+import com.bnyro.contacts.domain.repositories.DeviceContactsRepository
+import com.bnyro.contacts.domain.repositories.DeviceSmsRepo
+import com.bnyro.contacts.domain.repositories.LocalContactsRepository
+import com.bnyro.contacts.domain.repositories.LocalSmsRepo
+import com.bnyro.contacts.domain.repositories.PhoneLookupRepository
+import com.bnyro.contacts.domain.repositories.SmsRepository
 import com.bnyro.contacts.util.NotificationHelper
 import com.bnyro.contacts.util.Preferences
 import com.bnyro.contacts.util.ShortcutHelper
-import com.bnyro.contacts.workers.BackupWorker
+import com.bnyro.contacts.util.workers.BackupWorker
 
 class App : Application() {
     val deviceContactsRepository by lazy {
@@ -19,7 +21,12 @@ class App : Application() {
     val localContactsRepository by lazy {
         LocalContactsRepository(this)
     }
-
+    val callLogRepository by lazy {
+        CallLogRepository(this)
+    }
+    val phoneLookupRepository by lazy {
+        PhoneLookupRepository(this)
+    }
     lateinit var smsRepo: SmsRepository
 
     fun initSmsRepo() {
diff --git a/app/src/main/java/com/bnyro/contacts/data/database/AppDatabase.kt b/app/src/main/java/com/bnyro/contacts/data/database/AppDatabase.kt
new file mode 100644
index 00000000..9399d050
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/data/database/AppDatabase.kt
@@ -0,0 +1,24 @@
+package com.bnyro.contacts.data.database
+
+import androidx.room.AutoMigration
+import androidx.room.Database
+import androidx.room.RoomDatabase
+import com.bnyro.contacts.data.database.dao.LocalContactsDao
+import com.bnyro.contacts.data.database.dao.LocalSmsDao
+import com.bnyro.contacts.data.database.obj.DbDataItem
+import com.bnyro.contacts.data.database.obj.LocalContact
+import com.bnyro.contacts.data.database.obj.SmsData
+
+@Database(
+    entities = [LocalContact::class, DbDataItem::class, SmsData::class],
+    autoMigrations = [
+        AutoMigration(2, 3),
+        AutoMigration(3, 4),
+        AutoMigration(4, 5)
+    ],
+    version = 6
+)
+abstract class AppDatabase : RoomDatabase() {
+    abstract fun localContactsDao(): LocalContactsDao
+    abstract fun localSmsDao(): LocalSmsDao
+}
diff --git a/app/src/main/java/com/bnyro/contacts/db/DatabaseHolder.kt b/app/src/main/java/com/bnyro/contacts/data/database/DatabaseHolder.kt
similarity index 62%
rename from app/src/main/java/com/bnyro/contacts/db/DatabaseHolder.kt
rename to app/src/main/java/com/bnyro/contacts/data/database/DatabaseHolder.kt
index fb8f2d49..9b6784d1 100644
--- a/app/src/main/java/com/bnyro/contacts/db/DatabaseHolder.kt
+++ b/app/src/main/java/com/bnyro/contacts/data/database/DatabaseHolder.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.db
+package com.bnyro.contacts.data.database
 
 import android.content.Context
 import androidx.room.Room
@@ -10,23 +10,29 @@ object DatabaseHolder {
     lateinit var Db: AppDatabase
 
     private val MIGRATION_1_2 = object : Migration(1, 2) {
-        override fun migrate(database: SupportSQLiteDatabase) {
-            database.execSQL(
+        override fun migrate(db: SupportSQLiteDatabase) {
+            db.execSQL(
                 "ALTER TABLE localContacts ADD COLUMN nickName TEXT DEFAULT NULL"
             )
-            database.execSQL(
+            db.execSQL(
                 "ALTER TABLE localContacts ADD COLUMN organization TEXT DEFAULT NULL"
             )
         }
     }
 
+    private val MIGRATION_5_6 = object : Migration(5, 6) {
+        override fun migrate(db: SupportSQLiteDatabase) {
+            db.execSQL("ALTER TABLE localContacts ADD COLUMN favorite INTEGER NOT NULL DEFAULT 0")
+        }
+    }
+
     fun init(context: Context) {
         Db = Room.databaseBuilder(
             context,
             AppDatabase::class.java,
             DB_NAME
         )
-            .addMigrations(MIGRATION_1_2)
+            .addMigrations(MIGRATION_1_2, MIGRATION_5_6)
             .build()
     }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/db/dao/LocalContactsDao.kt b/app/src/main/java/com/bnyro/contacts/data/database/dao/LocalContactsDao.kt
similarity index 69%
rename from app/src/main/java/com/bnyro/contacts/db/dao/LocalContactsDao.kt
rename to app/src/main/java/com/bnyro/contacts/data/database/dao/LocalContactsDao.kt
index 5dda03b5..8970f92c 100644
--- a/app/src/main/java/com/bnyro/contacts/db/dao/LocalContactsDao.kt
+++ b/app/src/main/java/com/bnyro/contacts/data/database/dao/LocalContactsDao.kt
@@ -1,12 +1,12 @@
-package com.bnyro.contacts.db.dao
+package com.bnyro.contacts.data.database.dao
 
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.Query
 import androidx.room.Transaction
-import com.bnyro.contacts.db.obj.ContactWithData
-import com.bnyro.contacts.db.obj.DbDataItem
-import com.bnyro.contacts.db.obj.LocalContact
+import com.bnyro.contacts.data.database.obj.ContactWithData
+import com.bnyro.contacts.data.database.obj.DbDataItem
+import com.bnyro.contacts.data.database.obj.LocalContact
 
 @Dao
 interface LocalContactsDao {
@@ -20,6 +20,9 @@ interface LocalContactsDao {
     @Insert
     suspend fun insertData(vararg data: DbDataItem)
 
+    @Query("UPDATE localContacts SET favorite = :favorite WHERE id = :id ")
+    suspend fun setFavorite(id: Long, favorite: Boolean)
+
     @Query("DELETE FROM localContacts WHERE id = :id")
     suspend fun deleteContactByID(id: Long)
 
diff --git a/app/src/main/java/com/bnyro/contacts/db/dao/LocalSmsDao.kt b/app/src/main/java/com/bnyro/contacts/data/database/dao/LocalSmsDao.kt
similarity index 68%
rename from app/src/main/java/com/bnyro/contacts/db/dao/LocalSmsDao.kt
rename to app/src/main/java/com/bnyro/contacts/data/database/dao/LocalSmsDao.kt
index fbb5c3c1..e832bf4d 100644
--- a/app/src/main/java/com/bnyro/contacts/db/dao/LocalSmsDao.kt
+++ b/app/src/main/java/com/bnyro/contacts/data/database/dao/LocalSmsDao.kt
@@ -1,9 +1,9 @@
-package com.bnyro.contacts.db.dao
+package com.bnyro.contacts.data.database.dao
 
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.Query
-import com.bnyro.contacts.db.obj.SmsData
+import com.bnyro.contacts.data.database.obj.SmsData
 import kotlinx.coroutines.flow.Flow
 
 @Dao
@@ -20,6 +20,6 @@ interface LocalSmsDao {
     @Insert
     suspend fun createSms(smsData: SmsData): Long
 
-    @Query("SELECT * FROM localSms WHERE address = :address")
-    suspend fun getSmsByAddress(address: String): List<SmsData>
+    @Query("SELECT threadId FROM localSms WHERE address = :address LIMIT 1")
+    suspend fun getThreadId(address: String): Long?
 }
diff --git a/app/src/main/java/com/bnyro/contacts/db/obj/ContactWithData.kt b/app/src/main/java/com/bnyro/contacts/data/database/obj/ContactWithData.kt
similarity index 86%
rename from app/src/main/java/com/bnyro/contacts/db/obj/ContactWithData.kt
rename to app/src/main/java/com/bnyro/contacts/data/database/obj/ContactWithData.kt
index a45c95db..cf8c7e71 100644
--- a/app/src/main/java/com/bnyro/contacts/db/obj/ContactWithData.kt
+++ b/app/src/main/java/com/bnyro/contacts/data/database/obj/ContactWithData.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.db.obj
+package com.bnyro.contacts.data.database.obj
 
 import androidx.room.Embedded
 import androidx.room.Relation
diff --git a/app/src/main/java/com/bnyro/contacts/db/obj/DbDataItem.kt b/app/src/main/java/com/bnyro/contacts/data/database/obj/DbDataItem.kt
similarity index 85%
rename from app/src/main/java/com/bnyro/contacts/db/obj/DbDataItem.kt
rename to app/src/main/java/com/bnyro/contacts/data/database/obj/DbDataItem.kt
index 2deb7ed1..c550bbbb 100644
--- a/app/src/main/java/com/bnyro/contacts/db/obj/DbDataItem.kt
+++ b/app/src/main/java/com/bnyro/contacts/data/database/obj/DbDataItem.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.db.obj
+package com.bnyro.contacts.data.database.obj
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
diff --git a/app/src/main/java/com/bnyro/contacts/db/obj/LocalContact.kt b/app/src/main/java/com/bnyro/contacts/data/database/obj/LocalContact.kt
similarity index 66%
rename from app/src/main/java/com/bnyro/contacts/db/obj/LocalContact.kt
rename to app/src/main/java/com/bnyro/contacts/data/database/obj/LocalContact.kt
index cc764186..904b8996 100644
--- a/app/src/main/java/com/bnyro/contacts/db/obj/LocalContact.kt
+++ b/app/src/main/java/com/bnyro/contacts/data/database/obj/LocalContact.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.db.obj
+package com.bnyro.contacts.data.database.obj
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
@@ -12,5 +12,7 @@ data class LocalContact(
     @ColumnInfo val firstName: String? = null,
     @ColumnInfo val surName: String? = null,
     @ColumnInfo val nickName: String? = null,
-    @ColumnInfo val organization: String? = null
+    @ColumnInfo val title: String? = null,
+    @ColumnInfo val organization: String? = null,
+    @ColumnInfo(defaultValue = "0") val favorite: Boolean = false
 )
diff --git a/app/src/main/java/com/bnyro/contacts/db/obj/SmsData.kt b/app/src/main/java/com/bnyro/contacts/data/database/obj/SmsData.kt
similarity index 59%
rename from app/src/main/java/com/bnyro/contacts/db/obj/SmsData.kt
rename to app/src/main/java/com/bnyro/contacts/data/database/obj/SmsData.kt
index 535506a5..c15af74c 100644
--- a/app/src/main/java/com/bnyro/contacts/db/obj/SmsData.kt
+++ b/app/src/main/java/com/bnyro/contacts/data/database/obj/SmsData.kt
@@ -1,8 +1,9 @@
-package com.bnyro.contacts.db.obj
+package com.bnyro.contacts.data.database.obj
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import com.bnyro.contacts.domain.model.SmsBackup
 
 @Entity(tableName = "localSms")
 data class SmsData(
@@ -13,4 +14,13 @@ data class SmsData(
     @ColumnInfo var threadId: Long = 0,
     @ColumnInfo var type: Int = 0,
     @ColumnInfo(defaultValue = "NULL") var simNumber: Int? = null
-)
+) {
+    fun toSmsBackup() = SmsBackup(
+        subscriptionId = simNumber?.toLong() ?: 0,
+        address = address,
+        body = body,
+        date = timestamp,
+        dateSent = timestamp,
+        type = type,
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/db/AppDatabase.kt b/app/src/main/java/com/bnyro/contacts/db/AppDatabase.kt
deleted file mode 100644
index 52c4280f..00000000
--- a/app/src/main/java/com/bnyro/contacts/db/AppDatabase.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.bnyro.contacts.db
-
-import androidx.room.AutoMigration
-import androidx.room.Database
-import androidx.room.RoomDatabase
-import com.bnyro.contacts.db.dao.LocalContactsDao
-import com.bnyro.contacts.db.dao.LocalSmsDao
-import com.bnyro.contacts.db.obj.DbDataItem
-import com.bnyro.contacts.db.obj.LocalContact
-import com.bnyro.contacts.db.obj.SmsData
-
-@Database(
-    entities = [LocalContact::class, DbDataItem::class, SmsData::class],
-    autoMigrations = [AutoMigration(2, 3), AutoMigration(3, 4)],
-    version = 4
-)
-abstract class AppDatabase : RoomDatabase() {
-    abstract fun localContactsDao(): LocalContactsDao
-    abstract fun localSmsDao(): LocalSmsDao
-}
diff --git a/app/src/main/java/com/bnyro/contacts/enums/BackupType.kt b/app/src/main/java/com/bnyro/contacts/domain/enums/BackupType.kt
similarity index 82%
rename from app/src/main/java/com/bnyro/contacts/enums/BackupType.kt
rename to app/src/main/java/com/bnyro/contacts/domain/enums/BackupType.kt
index f9c1373a..f20d9698 100644
--- a/app/src/main/java/com/bnyro/contacts/enums/BackupType.kt
+++ b/app/src/main/java/com/bnyro/contacts/domain/enums/BackupType.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.enums
+package com.bnyro.contacts.domain.enums
 
 enum class BackupType {
     NONE,
diff --git a/app/src/main/java/com/bnyro/contacts/domain/enums/ContactAttributes.kt b/app/src/main/java/com/bnyro/contacts/domain/enums/ContactAttributes.kt
new file mode 100644
index 00000000..fc341a43
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/domain/enums/ContactAttributes.kt
@@ -0,0 +1,183 @@
+package com.bnyro.contacts.domain.enums
+
+import android.provider.ContactsContract
+import android.provider.ContactsContract.Intents
+import com.bnyro.contacts.R
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.domain.model.TranslatedType
+import com.bnyro.contacts.domain.model.ValueWithType
+import com.bnyro.contacts.util.CalendarUtils
+import com.bnyro.contacts.util.ContactsHelper
+
+abstract class ContactAttribute<T> {
+    abstract val stringRes: Int
+    abstract val androidValueColumn: String
+    abstract val androidContentType: String
+    abstract fun set(contact: ContactData, value: T)
+    abstract fun get(contact: ContactData): T
+    open fun display(contact: ContactData): T = get(contact)
+}
+
+abstract class StringAttribute : ContactAttribute<String?>() {
+    abstract val insertKey: String?
+}
+
+abstract class ListAttribute: ContactAttribute<List<ValueWithType>>() {
+    abstract val androidTypeColumn: String
+    abstract val types: List<TranslatedType>
+    abstract val insertKeys: List<Pair<String, String?>>
+    open val intentActionType: IntentActionType? = null
+}
+
+class Organization : StringAttribute() {
+    override val stringRes: Int = R.string.organization
+    override val insertKey: String = Intents.Insert.COMPANY
+    override val androidValueColumn: String = ContactsContract.CommonDataKinds.Organization.COMPANY
+    override val androidContentType: String = ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE
+
+    override fun set(contact: ContactData, value: String?) {
+        contact.organization = value
+    }
+
+    override fun get(contact: ContactData) = contact.organization
+}
+
+class Title : StringAttribute() {
+    override val stringRes: Int = R.string.title
+    override val insertKey: String = Intents.Insert.JOB_TITLE
+    override val androidValueColumn: String = ContactsContract.CommonDataKinds.Organization.TITLE
+    override val androidContentType: String = ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE
+
+    override fun set(contact: ContactData, value: String?) {
+        contact.organization = value
+    }
+
+    override fun get(contact: ContactData) = contact.organization
+}
+
+class Nickname : StringAttribute() {
+    override val stringRes: Int = R.string.nick_name
+    override val insertKey: String? = null
+    override val androidValueColumn: String = ContactsContract.CommonDataKinds.Nickname.NAME
+    override val androidContentType: String = ContactsContract.CommonDataKinds.Nickname.CONTENT_ITEM_TYPE
+
+    override fun set(contact: ContactData, value: String?) {
+        contact.nickName = value
+    }
+
+    override fun get(contact: ContactData) = contact.nickName
+}
+
+class Events : ListAttribute() {
+    override val stringRes: Int = R.string.event
+    override val insertKeys: List<Pair<String, String?>> = emptyList()
+    override val androidValueColumn: String = ContactsContract.CommonDataKinds.Event.START_DATE
+    override val androidTypeColumn: String = ContactsContract.CommonDataKinds.Event.TYPE
+    override val androidContentType: String = ContactsContract.CommonDataKinds.Event.CONTENT_ITEM_TYPE
+
+    override fun set(contact: ContactData, value: List<ValueWithType>) {
+        contact.events = value
+    }
+
+    override fun get(contact: ContactData) = contact.events
+
+    override fun display(contact: ContactData) = super.display(contact).map {
+        it.copy(value = CalendarUtils.localizeIsoDate(it.value))
+    }
+
+    override val types: List<TranslatedType> = ContactsHelper.eventTypes
+}
+
+class Numbers : ListAttribute() {
+    override val stringRes: Int = R.string.phone_number
+    override val insertKeys: List<Pair<String, String?>> = listOf(
+        Intents.Insert.PHONE to Intents.Insert.PHONE_TYPE,
+        Intents.Insert.SECONDARY_PHONE to Intents.Insert.SECONDARY_PHONE,
+        Intents.Insert.TERTIARY_EMAIL to Intents.Insert.TERTIARY_EMAIL_TYPE
+    )
+    override val androidValueColumn: String = ContactsContract.CommonDataKinds.Phone.NUMBER
+    override val androidTypeColumn: String = ContactsContract.CommonDataKinds.Phone.TYPE
+    override val androidContentType: String = ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE
+    override val intentActionType = IntentActionType.DIAL
+
+    override fun set(contact: ContactData, value: List<ValueWithType>) {
+        contact.numbers = value
+    }
+
+    override fun get(contact: ContactData) = contact.numbers
+    override fun display(contact: ContactData) = super.display(contact).map {
+        ValueWithType(ContactsHelper.normalizePhoneNumber(it.value), it.type)
+    }
+
+    override val types: List<TranslatedType> = ContactsHelper.phoneNumberTypes
+}
+
+class Emails : ListAttribute() {
+    override val stringRes: Int = R.string.email
+    override val insertKeys: List<Pair<String, String?>> = listOf(
+        Intents.Insert.EMAIL to Intents.Insert.EMAIL_TYPE,
+        Intents.Insert.SECONDARY_EMAIL to Intents.Insert.SECONDARY_EMAIL_TYPE,
+        Intents.Insert.TERTIARY_EMAIL to Intents.Insert.TERTIARY_EMAIL_TYPE
+    )
+    override val androidValueColumn: String = ContactsContract.CommonDataKinds.Email.ADDRESS
+    override val androidTypeColumn: String = ContactsContract.CommonDataKinds.Email.TYPE
+    override val androidContentType: String = ContactsContract.CommonDataKinds.Email.CONTENT_ITEM_TYPE
+    override val intentActionType = IntentActionType.EMAIL
+
+    override fun set(contact: ContactData, value: List<ValueWithType>) {
+        contact.emails = value
+    }
+
+    override fun get(contact: ContactData) = contact.emails
+
+    override val types: List<TranslatedType> = ContactsHelper.emailTypes
+}
+
+class Addresses : ListAttribute() {
+    override val stringRes: Int = R.string.address
+    override val insertKeys: List<Pair<String, String?>> = listOf(Intents.Insert.POSTAL to null)
+    override val androidValueColumn: String = ContactsContract.CommonDataKinds.StructuredPostal.FORMATTED_ADDRESS
+    override val androidTypeColumn: String = ContactsContract.CommonDataKinds.StructuredPostal.TYPE
+    override val androidContentType: String = ContactsContract.CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE
+    override val intentActionType = IntentActionType.ADDRESS
+
+    override fun set(contact: ContactData, value: List<ValueWithType>) {
+        contact.addresses = value
+    }
+
+    override fun get(contact: ContactData) = contact.addresses
+
+    override val types: List<TranslatedType> = ContactsHelper.addressTypes
+}
+
+class Notes : ListAttribute() {
+    override val stringRes: Int = R.string.note
+    override val insertKeys: List<Pair<String, String?>> = listOf(Intents.Insert.NOTES to null)
+    override val androidValueColumn: String = ContactsContract.CommonDataKinds.Note.NOTE
+    override val androidTypeColumn: String = ContactsContract.CommonDataKinds.Note.DATA2
+    override val androidContentType: String = ContactsContract.CommonDataKinds.Note.CONTENT_ITEM_TYPE
+    override fun set(contact: ContactData, value: List<ValueWithType>) {
+        contact.notes = value
+    }
+
+    override fun get(contact: ContactData) = contact.notes
+
+    override val types: List<TranslatedType> = emptyList()
+}
+
+class Websites : ListAttribute() {
+    override val stringRes: Int = R.string.website
+    override val insertKeys: List<Pair<String, String?>> = emptyList()
+    override val androidValueColumn: String = ContactsContract.CommonDataKinds.Website.URL
+    override val androidTypeColumn: String = ContactsContract.CommonDataKinds.Website.TYPE
+    override val androidContentType: String = ContactsContract.CommonDataKinds.Website.CONTENT_ITEM_TYPE
+    override val intentActionType = IntentActionType.WEBSITE
+
+    override fun set(contact: ContactData, value: List<ValueWithType>) {
+        contact.websites = value
+    }
+
+    override fun get(contact: ContactData) = contact.websites
+
+    override val types: List<TranslatedType> = ContactsHelper.websiteTypes
+}
diff --git a/app/src/main/java/com/bnyro/contacts/enums/ContactsSource.kt b/app/src/main/java/com/bnyro/contacts/domain/enums/ContactsSource.kt
similarity index 82%
rename from app/src/main/java/com/bnyro/contacts/enums/ContactsSource.kt
rename to app/src/main/java/com/bnyro/contacts/domain/enums/ContactsSource.kt
index 221c85c1..df4079ae 100644
--- a/app/src/main/java/com/bnyro/contacts/enums/ContactsSource.kt
+++ b/app/src/main/java/com/bnyro/contacts/domain/enums/ContactsSource.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.enums
+package com.bnyro.contacts.domain.enums
 
 import androidx.annotation.StringRes
 import com.bnyro.contacts.R
diff --git a/app/src/main/java/com/bnyro/contacts/enums/DataCategory.kt b/app/src/main/java/com/bnyro/contacts/domain/enums/DataCategory.kt
similarity index 73%
rename from app/src/main/java/com/bnyro/contacts/enums/DataCategory.kt
rename to app/src/main/java/com/bnyro/contacts/domain/enums/DataCategory.kt
index 1335ada4..b24df333 100644
--- a/app/src/main/java/com/bnyro/contacts/enums/DataCategory.kt
+++ b/app/src/main/java/com/bnyro/contacts/domain/enums/DataCategory.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.enums
+package com.bnyro.contacts.domain.enums
 
 enum class DataCategory {
     NUMBER,
diff --git a/app/src/main/java/com/bnyro/contacts/enums/IntentActionType.kt b/app/src/main/java/com/bnyro/contacts/domain/enums/IntentActionType.kt
similarity index 71%
rename from app/src/main/java/com/bnyro/contacts/enums/IntentActionType.kt
rename to app/src/main/java/com/bnyro/contacts/domain/enums/IntentActionType.kt
index 30be91a2..e9bbbb73 100644
--- a/app/src/main/java/com/bnyro/contacts/enums/IntentActionType.kt
+++ b/app/src/main/java/com/bnyro/contacts/domain/enums/IntentActionType.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.enums
+package com.bnyro.contacts.domain.enums
 
 enum class IntentActionType {
     WEBSITE,
diff --git a/app/src/main/java/com/bnyro/contacts/enums/SortOrder.kt b/app/src/main/java/com/bnyro/contacts/domain/enums/SortOrder.kt
similarity index 81%
rename from app/src/main/java/com/bnyro/contacts/enums/SortOrder.kt
rename to app/src/main/java/com/bnyro/contacts/domain/enums/SortOrder.kt
index e943f3a6..999d77e3 100644
--- a/app/src/main/java/com/bnyro/contacts/enums/SortOrder.kt
+++ b/app/src/main/java/com/bnyro/contacts/domain/enums/SortOrder.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.enums
+package com.bnyro.contacts.domain.enums
 
 enum class SortOrder {
     FIRSTNAME,
diff --git a/app/src/main/java/com/bnyro/contacts/enums/ThemeMode.kt b/app/src/main/java/com/bnyro/contacts/domain/enums/ThemeMode.kt
similarity index 82%
rename from app/src/main/java/com/bnyro/contacts/enums/ThemeMode.kt
rename to app/src/main/java/com/bnyro/contacts/domain/enums/ThemeMode.kt
index fb86fd2a..f0538322 100644
--- a/app/src/main/java/com/bnyro/contacts/enums/ThemeMode.kt
+++ b/app/src/main/java/com/bnyro/contacts/domain/enums/ThemeMode.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.enums
+package com.bnyro.contacts.domain.enums
 
 enum class ThemeMode {
     SYSTEM,
diff --git a/app/src/main/java/com/bnyro/contacts/obj/AccountType.kt b/app/src/main/java/com/bnyro/contacts/domain/model/AccountType.kt
similarity index 90%
rename from app/src/main/java/com/bnyro/contacts/obj/AccountType.kt
rename to app/src/main/java/com/bnyro/contacts/domain/model/AccountType.kt
index 3f035622..52f2e6f1 100644
--- a/app/src/main/java/com/bnyro/contacts/obj/AccountType.kt
+++ b/app/src/main/java/com/bnyro/contacts/domain/model/AccountType.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.obj
+package com.bnyro.contacts.domain.model
 
 data class AccountType(
     val name: String,
diff --git a/app/src/main/java/com/bnyro/contacts/domain/model/BasicContactData.kt b/app/src/main/java/com/bnyro/contacts/domain/model/BasicContactData.kt
new file mode 100644
index 00000000..4c981241
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/domain/model/BasicContactData.kt
@@ -0,0 +1,15 @@
+package com.bnyro.contacts.domain.model
+
+import android.net.Uri
+
+/**
+ * Data class containing contact name, number and thumbnail
+ * @property number phone number without any formatting
+ * @property name contact display name
+ * @property thumbnail contact thumbnail [Uri]
+ */
+data class BasicContactData(
+    val number: String,
+    val name: String? = null,
+    val thumbnail: Uri? = null
+)
diff --git a/app/src/main/java/com/bnyro/contacts/domain/model/CallLogEntry.kt b/app/src/main/java/com/bnyro/contacts/domain/model/CallLogEntry.kt
new file mode 100644
index 00000000..03e888d9
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/domain/model/CallLogEntry.kt
@@ -0,0 +1,24 @@
+package com.bnyro.contacts.domain.model
+
+import java.text.SimpleDateFormat
+import java.util.Date
+
+data class CallLogEntry(
+    val phoneNumber: String,
+    val type: Int,
+    val time: Long,
+    val duration: Long,
+    val subscriptionId: String?
+) {
+    val dateString: String
+    val timeString: String
+
+    init {
+        val date = Date(time)
+        val dateFormat = SimpleDateFormat.getDateInstance(SimpleDateFormat.FULL)
+        dateString = dateFormat.format(date)
+
+        val timeFormat = SimpleDateFormat.getTimeInstance(SimpleDateFormat.SHORT)
+        timeString = timeFormat.format(date)
+    }
+}
diff --git a/app/src/main/java/com/bnyro/contacts/domain/model/CallerInfo.kt b/app/src/main/java/com/bnyro/contacts/domain/model/CallerInfo.kt
new file mode 100644
index 00000000..92872ee7
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/domain/model/CallerInfo.kt
@@ -0,0 +1,10 @@
+package com.bnyro.contacts.domain.model
+
+import android.net.Uri
+
+data class CallerInfo(
+    val rawPhoneNumber: String = "",
+    val formattedPhoneNumber: String = "",
+    val callerName: String? = null,
+    val callerPhoto: Uri? = null
+)
diff --git a/app/src/main/java/com/bnyro/contacts/obj/ContactData.kt b/app/src/main/java/com/bnyro/contacts/domain/model/ContactData.kt
similarity index 82%
rename from app/src/main/java/com/bnyro/contacts/obj/ContactData.kt
rename to app/src/main/java/com/bnyro/contacts/domain/model/ContactData.kt
index 339f068f..47e0f7f5 100644
--- a/app/src/main/java/com/bnyro/contacts/obj/ContactData.kt
+++ b/app/src/main/java/com/bnyro/contacts/domain/model/ContactData.kt
@@ -1,7 +1,8 @@
-package com.bnyro.contacts.obj
+package com.bnyro.contacts.domain.model
 
 import android.graphics.Bitmap
-import com.bnyro.contacts.enums.SortOrder
+import android.net.Uri
+import com.bnyro.contacts.domain.enums.SortOrder
 
 data class ContactData(
     var dataId: Int = 0,
@@ -14,6 +15,7 @@ data class ContactData(
     var firstName: String? = null,
     var surName: String? = null,
     var nickName: String? = null,
+    var title: String? = null,
     var organization: String? = null,
     var photo: Bitmap? = null,
     var thumbnail: Bitmap? = null,
@@ -23,7 +25,9 @@ data class ContactData(
     var events: List<ValueWithType> = listOf(),
     var notes: List<ValueWithType> = listOf(),
     var groups: List<ContactsGroup> = listOf(),
-    var websites: List<ValueWithType> = listOf()
+    var websites: List<ValueWithType> = listOf(),
+    var ringTone: Uri? = null,
+    var favorite: Boolean = false
 ) {
     val accountIdentifier get() = "$accountType|$accountName"
     fun getNameBySortOrder(sortOrder: SortOrder): String? {
diff --git a/app/src/main/java/com/bnyro/contacts/domain/model/ContactSingleDataItem.kt b/app/src/main/java/com/bnyro/contacts/domain/model/ContactSingleDataItem.kt
new file mode 100644
index 00000000..55144526
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/domain/model/ContactSingleDataItem.kt
@@ -0,0 +1,8 @@
+package com.bnyro.contacts.domain.model
+
+data class ContactSingleDataItem(
+    val thumbnail: Any?,
+    val name: String,
+    val data: String,
+    val contactData: ContactData?
+)
diff --git a/app/src/main/java/com/bnyro/contacts/obj/ContactsGroup.kt b/app/src/main/java/com/bnyro/contacts/domain/model/ContactsGroup.kt
similarity index 63%
rename from app/src/main/java/com/bnyro/contacts/obj/ContactsGroup.kt
rename to app/src/main/java/com/bnyro/contacts/domain/model/ContactsGroup.kt
index e4aa15c1..8818cc57 100644
--- a/app/src/main/java/com/bnyro/contacts/obj/ContactsGroup.kt
+++ b/app/src/main/java/com/bnyro/contacts/domain/model/ContactsGroup.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.obj
+package com.bnyro.contacts.domain.model
 
 data class ContactsGroup(
     val title: String,
diff --git a/app/src/main/java/com/bnyro/contacts/obj/FilterOptions.kt b/app/src/main/java/com/bnyro/contacts/domain/model/FilterOptions.kt
similarity index 66%
rename from app/src/main/java/com/bnyro/contacts/obj/FilterOptions.kt
rename to app/src/main/java/com/bnyro/contacts/domain/model/FilterOptions.kt
index 93f876b9..fc18bd9b 100644
--- a/app/src/main/java/com/bnyro/contacts/obj/FilterOptions.kt
+++ b/app/src/main/java/com/bnyro/contacts/domain/model/FilterOptions.kt
@@ -1,12 +1,13 @@
-package com.bnyro.contacts.obj
+package com.bnyro.contacts.domain.model
 
-import com.bnyro.contacts.enums.SortOrder
+import com.bnyro.contacts.domain.enums.SortOrder
 import com.bnyro.contacts.util.Preferences
 
 data class FilterOptions(
     var sortOder: SortOrder,
     var hiddenAccountIdentifiers: List<String>,
-    var visibleGroups: List<ContactsGroup>
+    var visibleGroups: List<ContactsGroup>,
+    var favoritesOnly: Boolean
 ) {
     companion object {
         fun default(): FilterOptions {
@@ -15,7 +16,8 @@ data class FilterOptions(
                 Preferences.hiddenAccountsKey,
                 emptySet()
             )!!.toList()
-            return FilterOptions(sortOrder, hiddenAccounts, listOf())
+            val favoritesOnly = Preferences.getBoolean(Preferences.favoritesOnlyKey, false)
+            return FilterOptions(sortOrder, hiddenAccounts, listOf(), favoritesOnly)
         }
     }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/obj/NavBarItem.kt b/app/src/main/java/com/bnyro/contacts/domain/model/NavBarItem.kt
similarity index 76%
rename from app/src/main/java/com/bnyro/contacts/obj/NavBarItem.kt
rename to app/src/main/java/com/bnyro/contacts/domain/model/NavBarItem.kt
index 3970e122..19128da1 100644
--- a/app/src/main/java/com/bnyro/contacts/obj/NavBarItem.kt
+++ b/app/src/main/java/com/bnyro/contacts/domain/model/NavBarItem.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.obj
+package com.bnyro.contacts.domain.model
 
 import androidx.compose.ui.graphics.vector.ImageVector
 
diff --git a/app/src/main/java/com/bnyro/contacts/domain/model/SmsBackup.kt b/app/src/main/java/com/bnyro/contacts/domain/model/SmsBackup.kt
new file mode 100644
index 00000000..35e947b7
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/domain/model/SmsBackup.kt
@@ -0,0 +1,28 @@
+package com.bnyro.contacts.domain.model
+
+import com.bnyro.contacts.data.database.obj.SmsData
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SmsBackup(
+    val subscriptionId: Long,
+    val address: String,
+    val body: String?,
+    val date: Long,
+    val dateSent: Long,
+    val type: Int,
+    val locked: Int = 1,
+    val protocol: String? = "0",
+    val read: Int = 0,
+    val status: Int = -1,
+    val serviceCenter: String? = null,
+    val backupType: String = "sms",
+) {
+    fun toSmsData() = SmsData(
+        address = address,
+        body = body.orEmpty(),
+        timestamp = date,
+        simNumber = subscriptionId.toInt(),
+        type = type,
+    )
+}
diff --git a/app/src/main/java/com/bnyro/contacts/obj/SmsThread.kt b/app/src/main/java/com/bnyro/contacts/domain/model/SmsThread.kt
similarity index 60%
rename from app/src/main/java/com/bnyro/contacts/obj/SmsThread.kt
rename to app/src/main/java/com/bnyro/contacts/domain/model/SmsThread.kt
index a8504bfc..5c6741e7 100644
--- a/app/src/main/java/com/bnyro/contacts/obj/SmsThread.kt
+++ b/app/src/main/java/com/bnyro/contacts/domain/model/SmsThread.kt
@@ -1,6 +1,6 @@
-package com.bnyro.contacts.obj
+package com.bnyro.contacts.domain.model
 
-import com.bnyro.contacts.db.obj.SmsData
+import com.bnyro.contacts.data.database.obj.SmsData
 
 data class SmsThread(
     val threadId: Long,
diff --git a/app/src/main/java/com/bnyro/contacts/obj/TranslatedType.kt b/app/src/main/java/com/bnyro/contacts/domain/model/TranslatedType.kt
similarity index 83%
rename from app/src/main/java/com/bnyro/contacts/obj/TranslatedType.kt
rename to app/src/main/java/com/bnyro/contacts/domain/model/TranslatedType.kt
index 6d6127e5..7d72275d 100644
--- a/app/src/main/java/com/bnyro/contacts/obj/TranslatedType.kt
+++ b/app/src/main/java/com/bnyro/contacts/domain/model/TranslatedType.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.obj
+package com.bnyro.contacts.domain.model
 
 import androidx.annotation.StringRes
 import ezvcard.parameter.VCardParameter
diff --git a/app/src/main/java/com/bnyro/contacts/obj/ValueWithType.kt b/app/src/main/java/com/bnyro/contacts/domain/model/ValueWithType.kt
similarity index 95%
rename from app/src/main/java/com/bnyro/contacts/obj/ValueWithType.kt
rename to app/src/main/java/com/bnyro/contacts/domain/model/ValueWithType.kt
index 01ca0005..00cfe48e 100644
--- a/app/src/main/java/com/bnyro/contacts/obj/ValueWithType.kt
+++ b/app/src/main/java/com/bnyro/contacts/domain/model/ValueWithType.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.obj
+package com.bnyro.contacts.domain.model
 
 /**
  * A data class that represents a value with its type.
diff --git a/app/src/main/java/com/bnyro/contacts/domain/repositories/CallLogRepository.kt b/app/src/main/java/com/bnyro/contacts/domain/repositories/CallLogRepository.kt
new file mode 100644
index 00000000..b1ba9914
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/domain/repositories/CallLogRepository.kt
@@ -0,0 +1,58 @@
+package com.bnyro.contacts.domain.repositories
+
+import android.Manifest
+import android.content.Context
+import android.provider.CallLog
+import com.bnyro.contacts.domain.model.CallLogEntry
+import com.bnyro.contacts.util.PermissionHelper
+import com.bnyro.contacts.util.extension.intValue
+import com.bnyro.contacts.util.extension.longValue
+import com.bnyro.contacts.util.extension.stringValue
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+class CallLogRepository(private val context: Context) {
+    suspend fun getCallLog(): List<CallLogEntry> = withContext(Dispatchers.IO) {
+        if (!PermissionHelper.hasPermission(context, Manifest.permission.READ_CALL_LOG))
+            return@withContext emptyList()
+
+        val callLog = mutableListOf<CallLogEntry>()
+
+        context.contentResolver.query(
+            CallLog.Calls.CONTENT_URI,
+            null, null, null, CallLog.Calls.DATE + " DESC"
+        )?.use { cursor ->
+            while (cursor.moveToNext()) {
+                val phoneNumber = cursor.stringValue(CallLog.Calls.NUMBER)
+                val callType = cursor.intValue(CallLog.Calls.TYPE)!!
+                val callDate = cursor.longValue(CallLog.Calls.DATE)!!
+                val callDuration = cursor.longValue(CallLog.Calls.DURATION)!!
+                val subscriptionId = cursor.stringValue(CallLog.Calls.PHONE_ACCOUNT_ID)
+                callLog.add(
+                    CallLogEntry(
+                        phoneNumber.orEmpty(),
+                        callType,
+                        callDate,
+                        callDuration,
+                        subscriptionId
+                    )
+                )
+            }
+        }
+
+        return@withContext callLog
+    }
+
+    suspend fun deleteAll(callLog: List<CallLogEntry>) = withContext(Dispatchers.IO) {
+        if (!PermissionHelper.hasPermission(context, Manifest.permission.WRITE_CALL_LOG))
+            return@withContext
+
+        callLog.distinctBy { it.phoneNumber }.forEach { entry ->
+            context.contentResolver.delete(
+                CallLog.Calls.CONTENT_URI,
+                "NUMBER=${entry.phoneNumber}",
+                null
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/repo/ContactsRepository.kt b/app/src/main/java/com/bnyro/contacts/domain/repositories/ContactsRepository.kt
similarity index 71%
rename from app/src/main/java/com/bnyro/contacts/repo/ContactsRepository.kt
rename to app/src/main/java/com/bnyro/contacts/domain/repositories/ContactsRepository.kt
index f1c98a4c..8fee1ae2 100644
--- a/app/src/main/java/com/bnyro/contacts/repo/ContactsRepository.kt
+++ b/app/src/main/java/com/bnyro/contacts/domain/repositories/ContactsRepository.kt
@@ -1,7 +1,7 @@
-package com.bnyro.contacts.repo
+package com.bnyro.contacts.domain.repositories
 
-import com.bnyro.contacts.obj.ContactData
-import com.bnyro.contacts.obj.ContactsGroup
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.domain.model.ContactsGroup
 
 interface ContactsRepository {
     val label: String
@@ -9,6 +9,7 @@ interface ContactsRepository {
     suspend fun createContact(contact: ContactData)
     suspend fun updateContact(contact: ContactData)
     suspend fun deleteContacts(contacts: List<ContactData>)
+    suspend fun setFavorite(contact: ContactData, favorite: Boolean)
     suspend fun getContactList(): List<ContactData>
     suspend fun loadAdvancedData(contact: ContactData): ContactData
     fun isAutoBackupEnabled(): Boolean
diff --git a/app/src/main/java/com/bnyro/contacts/repo/DeviceContactsRepository.kt b/app/src/main/java/com/bnyro/contacts/domain/repositories/DeviceContactsRepository.kt
similarity index 71%
rename from app/src/main/java/com/bnyro/contacts/repo/DeviceContactsRepository.kt
rename to app/src/main/java/com/bnyro/contacts/domain/repositories/DeviceContactsRepository.kt
index 542cb2a4..03fd695c 100644
--- a/app/src/main/java/com/bnyro/contacts/repo/DeviceContactsRepository.kt
+++ b/app/src/main/java/com/bnyro/contacts/domain/repositories/DeviceContactsRepository.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.repo
+package com.bnyro.contacts.domain.repositories
 
 import android.Manifest
 import android.accounts.AccountManager
@@ -13,45 +13,40 @@ import android.net.Uri
 import android.provider.ContactsContract
 import android.provider.ContactsContract.AUTHORITY
 import android.provider.ContactsContract.CALLER_IS_SYNCADAPTER
-import android.provider.ContactsContract.CommonDataKinds.Email
-import android.provider.ContactsContract.CommonDataKinds.Event
 import android.provider.ContactsContract.CommonDataKinds.GroupMembership
-import android.provider.ContactsContract.CommonDataKinds.Nickname
-import android.provider.ContactsContract.CommonDataKinds.Note
-import android.provider.ContactsContract.CommonDataKinds.Organization
 import android.provider.ContactsContract.CommonDataKinds.Phone
 import android.provider.ContactsContract.CommonDataKinds.Photo
 import android.provider.ContactsContract.CommonDataKinds.StructuredName
-import android.provider.ContactsContract.CommonDataKinds.StructuredPostal
-import android.provider.ContactsContract.CommonDataKinds.Website
 import android.provider.ContactsContract.Contacts
 import android.provider.ContactsContract.Data
 import android.provider.ContactsContract.RawContacts
 import androidx.annotation.RequiresPermission
 import com.bnyro.contacts.R
-import com.bnyro.contacts.enums.BackupType
-import com.bnyro.contacts.ext.intValue
-import com.bnyro.contacts.ext.longValue
-import com.bnyro.contacts.ext.notAName
-import com.bnyro.contacts.ext.stringValue
-import com.bnyro.contacts.obj.AccountType
-import com.bnyro.contacts.obj.ContactData
-import com.bnyro.contacts.obj.ContactsGroup
-import com.bnyro.contacts.obj.ValueWithType
+import com.bnyro.contacts.domain.enums.BackupType
+import com.bnyro.contacts.domain.enums.ListAttribute
+import com.bnyro.contacts.domain.enums.StringAttribute
+import com.bnyro.contacts.domain.model.AccountType
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.domain.model.ContactsGroup
+import com.bnyro.contacts.domain.model.ValueWithType
 import com.bnyro.contacts.util.ContactsHelper
 import com.bnyro.contacts.util.ImageHelper
 import com.bnyro.contacts.util.Preferences
+import com.bnyro.contacts.util.extension.boolValue
+import com.bnyro.contacts.util.extension.intValue
+import com.bnyro.contacts.util.extension.longValue
+import com.bnyro.contacts.util.extension.notAName
+import com.bnyro.contacts.util.extension.stringValue
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
+
 class DeviceContactsRepository(private val context: Context) : ContactsRepository {
     override val label: String = context.getString(R.string.device)
 
     private val contentResolver = context.contentResolver
     private val contentUri = Data.CONTENT_URI
 
-    private val authority = ContactsContract.AUTHORITY
-
     private val projection = arrayOf(
         Data.RAW_CONTACT_ID,
         RawContacts.CONTACT_ID,
@@ -59,10 +54,9 @@ class DeviceContactsRepository(private val context: Context) : ContactsRepositor
         Contacts.DISPLAY_NAME_ALTERNATIVE,
         StructuredName.GIVEN_NAME,
         StructuredName.FAMILY_NAME,
-        Nickname.NAME,
-        Organization.COMPANY,
         RawContacts.ACCOUNT_TYPE,
-        RawContacts.ACCOUNT_NAME
+        RawContacts.ACCOUNT_NAME,
+        Contacts.STARRED
     )
 
     private var storedContactGroups: List<ValueWithType> = emptyList()
@@ -109,7 +103,8 @@ class DeviceContactsRepository(private val context: Context) : ContactsRepositor
                         displayName = displayName,
                         alternativeName = alternativeName,
                         firstName = firstName,
-                        surName = surName
+                        surName = surName,
+                        favorite = it.boolValue(Contacts.STARRED) ?: false
                     )
 
                     contactList.add(contact)
@@ -130,44 +125,25 @@ class DeviceContactsRepository(private val context: Context) : ContactsRepositor
             thumbnail = getContactPhotoThumbnail(contactId)
             photo = getContactPhoto(contactId) ?: thumbnail
             groups = getGroups(contactId, storedContactGroups)
-            nickName = getEntry(contactId, Nickname.CONTENT_ITEM_TYPE, Nickname.NAME)
-            organization = getEntry(contactId, Organization.CONTENT_ITEM_TYPE, Organization.COMPANY)
-            events = getExtras(
-                contactId,
-                Event.START_DATE,
-                Event.TYPE,
-                Event.CONTENT_ITEM_TYPE
-            )
-            numbers = getExtras(
-                contactId,
-                Phone.NUMBER,
-                Phone.TYPE,
-                Phone.CONTENT_ITEM_TYPE
-            )
-            emails = getExtras(
-                contactId,
-                Email.ADDRESS,
-                Email.TYPE,
-                Email.CONTENT_ITEM_TYPE
-            )
-            addresses = getExtras(
-                contactId,
-                StructuredPostal.FORMATTED_ADDRESS,
-                StructuredPostal.TYPE,
-                StructuredPostal.CONTENT_ITEM_TYPE
-            )
-            notes = getExtras(
-                contactId,
-                Note.NOTE,
-                Note.DATA2,
-                Note.CONTENT_ITEM_TYPE
-            )
-            websites = getExtras(
-                contactId,
-                Website.URL,
-                Website.TYPE,
-                Website.CONTENT_ITEM_TYPE
-            )
+
+            ContactsHelper.contactAttributesTypes.forEach { attribute ->
+                if (attribute is StringAttribute) {
+                    val dataStr = getEntry(
+                        contactId,
+                        attribute.androidContentType,
+                        attribute.androidValueColumn
+                    )
+                    attribute.set(this, dataStr)
+                } else if (attribute is ListAttribute) {
+                    val dataEntries = getExtras(
+                        contactId,
+                        attribute.androidValueColumn,
+                        attribute.androidTypeColumn,
+                        attribute.androidContentType
+                    )
+                    attribute.set(this, dataEntries)
+                }
+            }
         }
     }
 
@@ -312,6 +288,18 @@ class DeviceContactsRepository(private val context: Context) : ContactsRepositor
         }
     }
 
+    override suspend fun setFavorite(contact: ContactData, favorite: Boolean): Unit =
+        withContext(Dispatchers.IO) {
+            val op = ContentProviderOperation.newUpdate(RawContacts.CONTENT_URI).apply {
+                val selection = "${RawContacts.CONTACT_ID} = ?"
+                val selectionArgs = arrayOf(contact.rawContactId.toString())
+                withSelection(selection, selectionArgs)
+                withValue(Contacts.STARRED, if (contact.favorite) 1 else 0)
+            }.build()
+
+            contentResolver.applyBatch(AUTHORITY, arrayListOf(op))
+        }
+
     @SuppressLint("MissingPermission")
     @RequiresPermission(Manifest.permission.WRITE_CONTACTS)
     override suspend fun createContact(contact: ContactData) {
@@ -337,82 +325,38 @@ class DeviceContactsRepository(private val context: Context) : ContactsRepositor
                     StructuredName.FAMILY_NAME,
                     contact.surName.orEmpty()
                 ),
-                contact.nickName?.let {
-                    getInsertAction(
-                        Nickname.CONTENT_ITEM_TYPE,
-                        Nickname.NAME,
-                        it
-                    )
-                },
-                contact.organization?.let {
-                    getInsertAction(
-                        Organization.CONTENT_ITEM_TYPE,
-                        Organization.COMPANY,
-                        it
-                    )
-                },
                 contact.photo?.let {
                     getInsertAction(Photo.CONTENT_ITEM_TYPE, Photo.PHOTO, getBitmapBytes(it))
                 },
-                *contact.websites.map {
-                    getInsertAction(
-                        Website.CONTENT_ITEM_TYPE,
-                        Website.URL,
-                        it.value,
-                        Website.TYPE,
-                        it.type
-                    )
-                }.toTypedArray(),
-                *contact.numbers.map {
-                    getInsertAction(
-                        Phone.CONTENT_ITEM_TYPE,
-                        Phone.NUMBER,
-                        it.value,
-                        Phone.TYPE,
-                        it.type
-                    )
-                }.toTypedArray(),
-                *contact.emails.map {
-                    getInsertAction(
-                        Email.CONTENT_ITEM_TYPE,
-                        Email.ADDRESS,
-                        it.value,
-                        Email.TYPE,
-                        it.type
-                    )
-                }.toTypedArray(),
-                *contact.addresses.map {
-                    getInsertAction(
-                        StructuredPostal.CONTENT_ITEM_TYPE,
-                        StructuredPostal.FORMATTED_ADDRESS,
-                        it.value,
-                        StructuredPostal.TYPE,
-                        it.type
-                    )
-                }.toTypedArray(),
-                *contact.events.map {
-                    getInsertAction(
-                        Event.CONTENT_ITEM_TYPE,
-                        Event.START_DATE,
-                        it.value,
-                        Event.TYPE,
-                        it.type
-                    )
-                }.toTypedArray(),
-                *contact.notes.map {
-                    getInsertAction(
-                        Note.CONTENT_ITEM_TYPE,
-                        Note.NOTE,
-                        it.value
-                    )
-                }.toTypedArray(),
                 *contact.groups.map {
                     getInsertAction(
                         GroupMembership.CONTENT_ITEM_TYPE,
                         GroupMembership.GROUP_ROW_ID,
                         it.rowId.toString()
                     )
-                }.toTypedArray()
+                }.toTypedArray(),
+                *ContactsHelper.contactAttributesTypes.filterIsInstance<StringAttribute>()
+                    .map { attribute ->
+                        attribute.get(contact)?.let {
+                            getInsertAction(
+                                attribute.androidContentType,
+                                attribute.androidValueColumn,
+                                it
+                            )
+                        }
+                    }.toTypedArray(),
+                *ContactsHelper.contactAttributesTypes.filterIsInstance<ListAttribute>()
+                    .map { attribute ->
+                        attribute.get(contact).map {
+                            getInsertAction(
+                                attribute.androidContentType,
+                                attribute.androidValueColumn,
+                                it.value,
+                                attribute.androidTypeColumn,
+                                it.type
+                            )
+                        }
+                    }.flatten().toTypedArray()
             ).let { ArrayList(it) }
 
             contentResolver.applyBatch(AUTHORITY, ops)
@@ -435,77 +379,24 @@ class DeviceContactsRepository(private val context: Context) : ContactsRepositor
                 operations.add(build())
             }
 
-            operations.addAll(
-                getUpdateSingleAction(
-                    rawContactId,
-                    Nickname.CONTENT_ITEM_TYPE,
-                    Nickname.NAME,
-                    contact.nickName
-                )
-            )
-            operations.addAll(
-                getUpdateSingleAction(
-                    rawContactId,
-                    Organization.CONTENT_ITEM_TYPE,
-                    Organization.COMPANY,
-                    contact.organization
-                )
-            )
+            for (attribute in ContactsHelper.contactAttributesTypes) {
+                if (attribute is StringAttribute) {
+                    operations.addAll(
+                        getUpdateSingleAction(
+                            rawContactId, attribute.androidContentType,
+                            attribute.androidValueColumn, attribute.get(contact)
+                        )
+                    )
+                } else if (attribute is ListAttribute) {
+                    operations.addAll(
+                        getUpdateMultipleAction(
+                            rawContactId, attribute.androidContentType, attribute.get(contact),
+                            attribute.androidValueColumn, attribute.androidTypeColumn
+                        )
+                    )
+                }
+            }
 
-            operations.addAll(
-                getUpdateMultipleAction(
-                    rawContactId,
-                    Website.CONTENT_ITEM_TYPE,
-                    contact.websites,
-                    Website.URL,
-                    Website.TYPE
-                )
-            )
-            operations.addAll(
-                getUpdateMultipleAction(
-                    rawContactId,
-                    Phone.CONTENT_ITEM_TYPE,
-                    contact.numbers,
-                    Phone.NUMBER,
-                    Phone.TYPE
-                )
-            )
-            operations.addAll(
-                getUpdateMultipleAction(
-                    rawContactId,
-                    Email.CONTENT_ITEM_TYPE,
-                    contact.emails,
-                    Email.ADDRESS,
-                    Email.TYPE
-                )
-            )
-            operations.addAll(
-                getUpdateMultipleAction(
-                    rawContactId,
-                    StructuredPostal.CONTENT_ITEM_TYPE,
-                    contact.addresses,
-                    StructuredPostal.FORMATTED_ADDRESS,
-                    StructuredPostal.TYPE
-                )
-            )
-            operations.addAll(
-                getUpdateMultipleAction(
-                    rawContactId,
-                    Event.CONTENT_ITEM_TYPE,
-                    contact.events,
-                    Event.START_DATE,
-                    Event.TYPE
-                )
-            )
-            operations.addAll(
-                getUpdateMultipleAction(
-                    rawContactId,
-                    Note.CONTENT_ITEM_TYPE,
-                    contact.notes,
-                    Note.NOTE,
-                    null
-                )
-            )
             operations.addAll(
                 getUpdateMultipleAction(
                     rawContactId,
@@ -535,13 +426,17 @@ class DeviceContactsRepository(private val context: Context) : ContactsRepositor
 
     fun getAccountTypes(): List<AccountType> {
         val accounts = AccountManager.get(context).accounts.filter {
-            ContentResolver.getIsSyncable(it, authority) > 0 && ContentResolver.getSyncAutomatically(it, authority)
+            ContentResolver.getIsSyncable(it, AUTHORITY) > 0
+                    && ContentResolver.getSyncAutomatically(it, AUTHORITY)
         }
 
         return listOf(AccountType.androidDefault) + accounts.map { AccountType(it.name, it.type) }
     }
 
-    private fun getCreateAction(accountType: String, accountName: String): ContentProviderOperation {
+    private fun getCreateAction(
+        accountType: String,
+        accountName: String
+    ): ContentProviderOperation {
         return ContentProviderOperation.newInsert(RawContacts.CONTENT_URI)
             .withValue(RawContacts.ACCOUNT_TYPE, accountType)
             .withValue(RawContacts.ACCOUNT_NAME, accountName)
@@ -667,6 +562,17 @@ class DeviceContactsRepository(private val context: Context) : ContactsRepositor
         }.build()
     }
 
+    suspend fun updateContactRingTone(contactId: String, ringtoneUri: Uri): Unit =
+        withContext(Dispatchers.IO) {
+            val contactUri = Uri.withAppendedPath(Contacts.CONTENT_URI, contactId)
+
+            val op = ContentProviderOperation.newUpdate(contactUri)
+                .withValue(Contacts.CUSTOM_RINGTONE, ringtoneUri.toString())
+                .build()
+
+            contentResolver.applyBatch(AUTHORITY, arrayListOf(op))
+        }
+
     companion object {
         const val MAX_PHOTO_SIZE = 700f
     }
diff --git a/app/src/main/java/com/bnyro/contacts/repo/DeviceSmsRepo.kt b/app/src/main/java/com/bnyro/contacts/domain/repositories/DeviceSmsRepo.kt
similarity index 93%
rename from app/src/main/java/com/bnyro/contacts/repo/DeviceSmsRepo.kt
rename to app/src/main/java/com/bnyro/contacts/domain/repositories/DeviceSmsRepo.kt
index 2767781a..d60334c6 100644
--- a/app/src/main/java/com/bnyro/contacts/repo/DeviceSmsRepo.kt
+++ b/app/src/main/java/com/bnyro/contacts/domain/repositories/DeviceSmsRepo.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.repo
+package com.bnyro.contacts.domain.repositories
 
 import android.Manifest
 import android.annotation.SuppressLint
@@ -10,13 +10,13 @@ import android.net.Uri
 import android.os.Build
 import android.provider.Telephony
 import androidx.annotation.RequiresPermission
-import com.bnyro.contacts.db.obj.SmsData
-import com.bnyro.contacts.ext.intValue
-import com.bnyro.contacts.ext.longValue
-import com.bnyro.contacts.ext.stringValue
+import com.bnyro.contacts.data.database.obj.SmsData
 import com.bnyro.contacts.util.ContactsHelper
 import com.bnyro.contacts.util.PermissionHelper
 import com.bnyro.contacts.util.SmsUtil
+import com.bnyro.contacts.util.extension.intValue
+import com.bnyro.contacts.util.extension.longValue
+import com.bnyro.contacts.util.extension.stringValue
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
@@ -80,7 +80,7 @@ class DeviceSmsRepo : SmsRepository {
 
     override suspend fun persistSms(context: Context, smsData: SmsData) {
         val values = ContentValues()
-        values.put(Telephony.Sms.ADDRESS, smsData.address)
+        values.put(Telephony.Sms.ADDRESS, ContactsHelper.normalizePhoneNumber(smsData.address))
         values.put(Telephony.Sms.BODY, smsData.body)
         values.put(Telephony.Sms.DATE, smsData.timestamp)
         values.put(Telephony.Sms.READ, 1)
diff --git a/app/src/main/java/com/bnyro/contacts/repo/LocalContactsRepository.kt b/app/src/main/java/com/bnyro/contacts/domain/repositories/LocalContactsRepository.kt
similarity index 86%
rename from app/src/main/java/com/bnyro/contacts/repo/LocalContactsRepository.kt
rename to app/src/main/java/com/bnyro/contacts/domain/repositories/LocalContactsRepository.kt
index 685d1a41..7f22832f 100644
--- a/app/src/main/java/com/bnyro/contacts/repo/LocalContactsRepository.kt
+++ b/app/src/main/java/com/bnyro/contacts/domain/repositories/LocalContactsRepository.kt
@@ -1,23 +1,23 @@
-package com.bnyro.contacts.repo
+package com.bnyro.contacts.domain.repositories
 
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import com.bnyro.contacts.R
-import com.bnyro.contacts.db.DatabaseHolder
-import com.bnyro.contacts.db.obj.DbDataItem
-import com.bnyro.contacts.db.obj.LocalContact
-import com.bnyro.contacts.enums.BackupType
-import com.bnyro.contacts.enums.DataCategory
-import com.bnyro.contacts.ext.pmap
-import com.bnyro.contacts.obj.ContactData
-import com.bnyro.contacts.obj.ContactsGroup
-import com.bnyro.contacts.obj.ValueWithType
+import com.bnyro.contacts.data.database.DatabaseHolder
+import com.bnyro.contacts.data.database.obj.DbDataItem
+import com.bnyro.contacts.data.database.obj.LocalContact
+import com.bnyro.contacts.domain.enums.BackupType
+import com.bnyro.contacts.domain.enums.DataCategory
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.domain.model.ContactsGroup
+import com.bnyro.contacts.domain.model.ValueWithType
 import com.bnyro.contacts.util.ImageHelper
 import com.bnyro.contacts.util.Preferences
-import java.io.File
+import com.bnyro.contacts.util.extension.pmap
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import java.io.File
 
 class LocalContactsRepository(context: Context) : ContactsRepository {
     override val label: String = context.getString(R.string.local)
@@ -32,7 +32,9 @@ class LocalContactsRepository(context: Context) : ContactsRepository {
             firstName = contact.firstName,
             surName = contact.surName,
             nickName = contact.nickName,
-            organization = contact.organization
+            title = contact.title,
+            organization = contact.organization,
+            favorite = contact.favorite
         )
         val contactId = DatabaseHolder.Db.localContactsDao().insertContact(localContact)
         val dataItems = listOf(
@@ -74,6 +76,10 @@ class LocalContactsRepository(context: Context) : ContactsRepository {
         }
     }
 
+    override suspend fun setFavorite(contact: ContactData, favorite: Boolean) = withContext(Dispatchers.IO) {
+        DatabaseHolder.Db.localContactsDao().setFavorite(contact.contactId, favorite)
+    }
+
     override suspend fun getContactList(): List<ContactData> = withContext(Dispatchers.IO) {
         DatabaseHolder.Db.localContactsDao().getAll().pmap {
             val profileImage = getProfileImage(it.contact.id)
@@ -86,7 +92,9 @@ class LocalContactsRepository(context: Context) : ContactsRepository {
                 firstName = it.contact.firstName,
                 surName = it.contact.surName,
                 nickName = it.contact.nickName,
+                title = it.contact.title,
                 organization = it.contact.organization,
+                favorite = it.contact.favorite,
                 photo = profileImage,
                 thumbnail = profileImage,
                 numbers = it.dataItems.toValueWithType(DataCategory.NUMBER),
diff --git a/app/src/main/java/com/bnyro/contacts/repo/LocalSmsRepo.kt b/app/src/main/java/com/bnyro/contacts/domain/repositories/LocalSmsRepo.kt
similarity index 78%
rename from app/src/main/java/com/bnyro/contacts/repo/LocalSmsRepo.kt
rename to app/src/main/java/com/bnyro/contacts/domain/repositories/LocalSmsRepo.kt
index 61fc5a35..7fa65b31 100644
--- a/app/src/main/java/com/bnyro/contacts/repo/LocalSmsRepo.kt
+++ b/app/src/main/java/com/bnyro/contacts/domain/repositories/LocalSmsRepo.kt
@@ -1,8 +1,8 @@
-package com.bnyro.contacts.repo
+package com.bnyro.contacts.domain.repositories
 
 import android.content.Context
-import com.bnyro.contacts.db.DatabaseHolder
-import com.bnyro.contacts.db.obj.SmsData
+import com.bnyro.contacts.data.database.DatabaseHolder
+import com.bnyro.contacts.data.database.obj.SmsData
 import com.bnyro.contacts.util.ContactsHelper
 import kotlinx.coroutines.flow.Flow
 import kotlin.random.Random
@@ -17,9 +17,7 @@ class LocalSmsRepo : SmsRepository {
 
     override suspend fun getOrCreateThreadId(context: Context, address: String): Long {
         return DatabaseHolder.Db.localSmsDao()
-            .getSmsByAddress(ContactsHelper.normalizePhoneNumber(address))
-            .firstOrNull()
-            ?.threadId
+            .getThreadId(ContactsHelper.normalizePhoneNumber(address))
             ?: Random.nextLong()
     }
 
diff --git a/app/src/main/java/com/bnyro/contacts/domain/repositories/PhoneLookupRepository.kt b/app/src/main/java/com/bnyro/contacts/domain/repositories/PhoneLookupRepository.kt
new file mode 100644
index 00000000..d25a1e4a
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/domain/repositories/PhoneLookupRepository.kt
@@ -0,0 +1,127 @@
+package com.bnyro.contacts.domain.repositories
+
+import android.content.Context
+import android.net.Uri
+import android.provider.ContactsContract.CommonDataKinds.Phone
+import android.provider.ContactsContract.PhoneLookup
+import androidx.core.net.toUri
+import com.bnyro.contacts.domain.model.BasicContactData
+import com.bnyro.contacts.util.extension.stringValue
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+class PhoneLookupRepository(private val context: Context) {
+    /**
+     * Get all contacts with a number equal to or containing a given number.
+     * @param number The number to search for
+     * @return A list containing simple contact data
+     */
+    suspend fun getContactsWithNumber(number: String): List<BasicContactData> =
+        withContext(Dispatchers.IO) {
+            val contacts = mutableListOf<BasicContactData>()
+            val uri = Phone.CONTENT_URI
+            val projection = arrayOf(
+                Phone.PHOTO_THUMBNAIL_URI,
+                Phone.DISPLAY_NAME,
+                Phone.NUMBER
+            )
+            val selection = "${Phone.NUMBER} LIKE ?"
+            val selectionArgs = arrayOf("%$number%")
+
+            val cursor =
+                context.contentResolver.query(uri, projection, selection, selectionArgs, null)
+
+            cursor?.use {
+                while (it.moveToNext()) {
+                    val name = it.stringValue(Phone.DISPLAY_NAME)
+                    val phoneNumber = it.stringValue(Phone.NUMBER)
+                    val photoUri = it.stringValue(Phone.PHOTO_THUMBNAIL_URI)?.toUri()
+
+                    if (phoneNumber != null) {
+                        contacts.add(
+                            BasicContactData(
+                                number = phoneNumber,
+                                name = name,
+                                thumbnail = photoUri
+                            )
+                        )
+                    }
+                }
+            }
+
+            contacts
+        }
+
+    /**
+     * Get all contacts with a name containing the given query
+     * @param nameQuery The name to search for
+     * @return A list containing simple contact data
+     */
+    suspend fun getContactsWithName(nameQuery: String): List<BasicContactData> =
+        withContext(Dispatchers.IO) {
+            val contacts = mutableListOf<BasicContactData>()
+            val uri = Phone.CONTENT_URI
+            val projection = arrayOf(
+                Phone.PHOTO_THUMBNAIL_URI,
+                Phone.DISPLAY_NAME,
+                Phone.NUMBER
+            )
+            val selection = "${Phone.DISPLAY_NAME} LIKE ?"
+            val selectionArgs = arrayOf("%$nameQuery%")
+
+            val cursor =
+                context.contentResolver.query(uri, projection, selection, selectionArgs, null)
+
+            cursor?.use {
+                while (it.moveToNext()) {
+                    val name = it.stringValue(Phone.DISPLAY_NAME)
+                    val phoneNumber = it.stringValue(Phone.NUMBER)
+                    val photoUri = it.stringValue(Phone.PHOTO_THUMBNAIL_URI)?.toUri()
+
+                    if (phoneNumber != null) {
+                        contacts.add(
+                            BasicContactData(
+                                number = phoneNumber,
+                                name = name,
+                                thumbnail = photoUri
+                            )
+                        )
+                    }
+                }
+            }
+
+            contacts
+        }
+
+    /**Get caller id from a number
+     * @param phoneNumber The number of the caller
+     * @return A simple contact data containing name phone and thumbnail
+     */
+    suspend fun getContactByNumber(phoneNumber: String): BasicContactData =
+        withContext(Dispatchers.IO) {
+            val uri = Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, Uri.encode(phoneNumber))
+            val query =
+                context.contentResolver.query(
+                    uri,
+                    arrayOf(PhoneLookup.DISPLAY_NAME, PhoneLookup.PHOTO_THUMBNAIL_URI),
+                    null,
+                    null,
+                    null
+                )
+
+            query?.use { cursor ->
+                if (cursor.moveToFirst()) {
+                    return@withContext BasicContactData(
+                        number = phoneNumber,
+                        name = cursor.stringValue(
+                            PhoneLookup.DISPLAY_NAME
+                        ),
+                        thumbnail = cursor.stringValue(PhoneLookup.PHOTO_THUMBNAIL_URI)?.toUri()
+                    )
+                }
+            }
+            BasicContactData(
+                number = phoneNumber
+            )
+        }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/repo/SmsRepository.kt b/app/src/main/java/com/bnyro/contacts/domain/repositories/SmsRepository.kt
similarity index 80%
rename from app/src/main/java/com/bnyro/contacts/repo/SmsRepository.kt
rename to app/src/main/java/com/bnyro/contacts/domain/repositories/SmsRepository.kt
index 88f250e8..0caa82aa 100644
--- a/app/src/main/java/com/bnyro/contacts/repo/SmsRepository.kt
+++ b/app/src/main/java/com/bnyro/contacts/domain/repositories/SmsRepository.kt
@@ -1,7 +1,7 @@
-package com.bnyro.contacts.repo
+package com.bnyro.contacts.domain.repositories
 
 import android.content.Context
-import com.bnyro.contacts.db.obj.SmsData
+import com.bnyro.contacts.data.database.obj.SmsData
 import kotlinx.coroutines.flow.Flow
 
 interface SmsRepository {
diff --git a/app/src/main/java/com/bnyro/contacts/ext/ContentColor.kt b/app/src/main/java/com/bnyro/contacts/ext/ContentColor.kt
deleted file mode 100644
index 14306b6c..00000000
--- a/app/src/main/java/com/bnyro/contacts/ext/ContentColor.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.bnyro.contacts.ext
-
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.luminance
-
-@Composable
-fun Color.contentColor(): Color {
-    val isDarkTheme = MaterialTheme.colorScheme.background.luminance() < 0.5
-    return when {
-        luminance().let { if (!isDarkTheme) it else 1 - it } > 0.5 -> {
-            MaterialTheme.typography.bodyLarge.color
-        }
-        else -> MaterialTheme.colorScheme.background
-    }
-}
diff --git a/app/src/main/java/com/bnyro/contacts/navigation/HomeNavContainer.kt b/app/src/main/java/com/bnyro/contacts/navigation/HomeNavContainer.kt
new file mode 100644
index 00000000..f90ddc03
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/navigation/HomeNavContainer.kt
@@ -0,0 +1,123 @@
+package com.bnyro.contacts.navigation
+
+import android.content.res.Configuration
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Icon
+import androidx.compose.material3.NavigationBar
+import androidx.compose.material3.NavigationBarItem
+import androidx.compose.material3.NavigationRail
+import androidx.compose.material3.NavigationRailItem
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.Saver
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
+import androidx.navigation.NavDestination.Companion.hasRoute
+import androidx.navigation.compose.rememberNavController
+import com.bnyro.contacts.presentation.screens.contacts.model.ContactsModel
+import com.bnyro.contacts.presentation.screens.settings.model.ThemeModel
+import com.bnyro.contacts.presentation.screens.sms.model.SmsModel
+
+val RouteSaver = Saver<MutableState<HomeRoutes>, Int>(
+    save = { HomeRoutes.all.indexOfFirst { item -> item.route == it.value } },
+    restore = { mutableStateOf(HomeRoutes.all[it].route) }
+)
+
+@Composable
+fun HomeNavContainer(
+    initialTab: HomeRoutes,
+    onNavigate: (NavRoutes) -> Unit,
+    smsModel: SmsModel,
+    contactsModel: ContactsModel,
+    themeModel: ThemeModel
+) {
+    val navController = rememberNavController()
+
+    var selectedRoute by rememberSaveable(saver = RouteSaver) {
+        mutableStateOf(initialTab)
+    }
+
+    // listen for destination changes (e.g. back presses)
+    DisposableEffect(Unit) {
+        val listener = NavController.OnDestinationChangedListener { _, destination, _ ->
+            HomeRoutes.all.firstOrNull { destination.hasRoute(it.route::class) }
+                ?.also { selectedRoute = it.route }
+        }
+        navController.addOnDestinationChangedListener(listener)
+
+        onDispose {
+            navController.removeOnDestinationChangedListener(listener)
+        }
+    }
+
+    val orientation = LocalConfiguration.current.orientation
+    Scaffold(
+        bottomBar = {
+            if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+                NavigationBar(
+                    tonalElevation = 5.dp
+                ) {
+                    HomeRoutes.all.forEach {
+                        NavigationBarItem(
+                            label = {
+                                Text(stringResource(it.stringRes))
+                            },
+                            icon = {
+                                Icon(it.icon, null)
+                            },
+                            selected = it.route == selectedRoute,
+                            onClick = {
+                                navController.popBackStack()
+                                navController.navigate(it.route)
+                            }
+                        )
+                    }
+                }
+            }
+        }
+    ) { pV ->
+        Row(
+            Modifier
+                .fillMaxSize()
+                .padding(pV)
+        ) {
+            if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
+                NavigationRail {
+                    HomeRoutes.all.forEach {
+                        NavigationRailItem(
+                            selected = it.route == selectedRoute,
+                            onClick = {
+                                navController.popBackStack()
+                                navController.navigate(it.route)
+                            },
+                            icon = { Icon(it.icon, null) },
+                            label = {
+                                Text(stringResource(it.stringRes))
+                            })
+                    }
+                }
+            }
+            HomeNavHost(
+                navController = navController,
+                startTab = initialTab,
+                onNavigate = onNavigate,
+                smsModel = smsModel,
+                contactsModel = contactsModel,
+                themeModel = themeModel
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/navigation/HomeNavHost.kt b/app/src/main/java/com/bnyro/contacts/navigation/HomeNavHost.kt
new file mode 100644
index 00000000..995ca005
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/navigation/HomeNavHost.kt
@@ -0,0 +1,61 @@
+package com.bnyro.contacts.navigation
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.Modifier
+import androidx.lifecycle.ViewModelStoreOwner
+import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import com.bnyro.contacts.presentation.screens.calllog.CallLogsScreen
+import com.bnyro.contacts.presentation.screens.contacts.ContactsPage
+import com.bnyro.contacts.presentation.screens.contacts.model.ContactsModel
+import com.bnyro.contacts.presentation.screens.settings.model.ThemeModel
+import com.bnyro.contacts.presentation.screens.sms.SmsListScreen
+import com.bnyro.contacts.presentation.screens.sms.model.SmsModel
+
+@Composable
+fun HomeNavHost(
+    navController: NavHostController,
+    onNavigate: (NavRoutes) -> Unit,
+    startTab: HomeRoutes,
+    modifier: Modifier = Modifier,
+    smsModel: SmsModel,
+    contactsModel: ContactsModel,
+    themeModel: ThemeModel
+) {
+    val viewModelStoreOwner: ViewModelStoreOwner = LocalViewModelStoreOwner.current!!
+
+    NavHost(navController, startDestination = startTab, modifier = modifier) {
+        composable<HomeRoutes.Contacts> {
+            CompositionLocalProvider(LocalViewModelStoreOwner provides viewModelStoreOwner) {
+                ContactsPage(null,
+                    onNavigate = {
+                        onNavigate.invoke(it)
+                    })
+            }
+        }
+        composable<HomeRoutes.Phone>(
+            deepLinks = HomeRoutes.Phone.deepLinks
+        ) {
+            CallLogsScreen(contactsModel, themeModel)
+        }
+        composable<HomeRoutes.Messages> {
+            CompositionLocalProvider(LocalViewModelStoreOwner provides viewModelStoreOwner) {
+                SmsListScreen(
+                    smsModel = smsModel,
+                    contactsModel = contactsModel,
+                    scrollConnection = null,
+                    onNavigate = {
+                        onNavigate.invoke(it)
+                    },
+                    onClickMessage = { address, contactData ->
+                        smsModel.currentContactData = contactData
+                        onNavigate.invoke(NavRoutes.MessageThread(address))
+                    }
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/navigation/NavContainer.kt b/app/src/main/java/com/bnyro/contacts/navigation/NavContainer.kt
new file mode 100644
index 00000000..41472879
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/navigation/NavContainer.kt
@@ -0,0 +1,29 @@
+package com.bnyro.contacts.navigation
+
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.compose.rememberNavController
+import com.bnyro.contacts.presentation.screens.contacts.model.ContactsModel
+import com.bnyro.contacts.presentation.screens.settings.model.ThemeModel
+import com.bnyro.contacts.presentation.screens.sms.model.SmsModel
+
+@Composable
+fun NavContainer(
+    initialTab: HomeRoutes,
+) {
+    val navController = rememberNavController()
+    val smsModel: SmsModel = viewModel()
+    val contactsModel: ContactsModel = viewModel(factory = ContactsModel.Factory)
+    val themeModel: ThemeModel = viewModel()
+    AppNavHost(
+        navController,
+        initialTab = initialTab,
+        modifier = Modifier
+            .fillMaxSize(),
+        smsModel = smsModel,
+        contactsModel = contactsModel,
+        themeModel = themeModel
+    )
+}
diff --git a/app/src/main/java/com/bnyro/contacts/navigation/NavHost.kt b/app/src/main/java/com/bnyro/contacts/navigation/NavHost.kt
new file mode 100644
index 00000000..3a168bdd
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/navigation/NavHost.kt
@@ -0,0 +1,113 @@
+package com.bnyro.contacts.navigation
+
+import androidx.compose.animation.AnimatedContentTransitionScope
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.lifecycle.ViewModelStoreOwner
+import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.toRoute
+import com.bnyro.contacts.presentation.screens.about.AboutScreen
+import com.bnyro.contacts.presentation.screens.contacts.model.ContactsModel
+import com.bnyro.contacts.presentation.screens.settings.SettingsScreen
+import com.bnyro.contacts.presentation.screens.settings.model.ThemeModel
+import com.bnyro.contacts.presentation.screens.sms.SmsThreadScreen
+import com.bnyro.contacts.presentation.screens.sms.model.SmsModel
+
+@Composable
+fun AppNavHost(
+    navController: NavHostController,
+    modifier: Modifier = Modifier,
+    initialTab: HomeRoutes,
+    smsModel: SmsModel,
+    contactsModel: ContactsModel,
+    themeModel: ThemeModel
+) {
+    val viewModelStoreOwner: ViewModelStoreOwner = LocalViewModelStoreOwner.current!!
+
+    NavHost(navController, startDestination = NavRoutes.Home, modifier = modifier) {
+        composable<NavRoutes.Home>(
+            enterTransition = {
+                slideIntoContainer(
+                    AnimatedContentTransitionScope.SlideDirection.Down,
+                    initialOffset = { it / 4 }
+                ) + fadeIn()
+            },
+            exitTransition = {
+                slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Up,
+                    targetOffset = { it / 4 }) + fadeOut()
+            }) {
+            HomeNavContainer(
+                initialTab = initialTab,
+                onNavigate = {
+                    navController.navigate(it)
+                },
+                smsModel = smsModel,
+                contactsModel = contactsModel,
+                themeModel = themeModel
+            )
+        }
+        composable<NavRoutes.About>(
+            enterTransition = {
+                slideIntoContainer(
+                    AnimatedContentTransitionScope.SlideDirection.Up,
+                    initialOffset = { it / 4 }) + fadeIn()
+            },
+            exitTransition = {
+                slideOutOfContainer(
+                    AnimatedContentTransitionScope.SlideDirection.Down,
+                    targetOffset = { it / 4 }) + fadeOut()
+            }) {
+            AboutScreen {
+                navController.popBackStack()
+            }
+        }
+        composable<NavRoutes.Settings>(
+            enterTransition = {
+                slideIntoContainer(
+                    AnimatedContentTransitionScope.SlideDirection.Up,
+                    initialOffset = { it / 4 }) + fadeIn()
+            },
+            exitTransition = {
+                slideOutOfContainer(
+                    AnimatedContentTransitionScope.SlideDirection.Down,
+                    targetOffset = { it / 4 }) + fadeOut()
+            }) {
+            SettingsScreen(themeModel = themeModel, smsModel = smsModel) {
+                navController.popBackStack()
+            }
+        }
+        composable<NavRoutes.MessageThread>(
+            deepLinks = NavRoutes.MessageThread.deepLinks,
+            enterTransition = {
+                slideIntoContainer(
+                    AnimatedContentTransitionScope.SlideDirection.Up,
+                    initialOffset = { it / 4 }) + fadeIn()
+            },
+            exitTransition = {
+                slideOutOfContainer(
+                    AnimatedContentTransitionScope.SlideDirection.Down,
+                    targetOffset = { it / 4 }) + fadeOut()
+            }
+        ) {
+            val thread = it.toRoute<NavRoutes.MessageThread>()
+            CompositionLocalProvider(LocalViewModelStoreOwner provides viewModelStoreOwner) {
+                SmsThreadScreen(
+                    smsModel = smsModel,
+                    contactsModel = contactsModel,
+                    contactsData = remember { smsModel.currentContactData },
+                    address = thread.address,
+                    initialText = thread.body.orEmpty()
+                ) {
+                    navController.popBackStack()
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/bnyro/contacts/navigation/NavRoutes.kt b/app/src/main/java/com/bnyro/contacts/navigation/NavRoutes.kt
new file mode 100644
index 00000000..07dc2e26
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/navigation/NavRoutes.kt
@@ -0,0 +1,100 @@
+package com.bnyro.contacts.navigation
+
+import android.net.Uri
+import androidx.annotation.StringRes
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.rounded.Message
+import androidx.compose.material.icons.rounded.Person
+import androidx.compose.material.icons.rounded.Phone
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.core.net.toUri
+import androidx.navigation.navDeepLink
+import com.bnyro.contacts.R
+import kotlinx.serialization.Serializable
+import java.net.URLEncoder
+
+@Serializable
+sealed class NavRoutes {
+    @Serializable
+    data object Home : NavRoutes()
+
+    @Serializable
+    data object About : NavRoutes()
+
+    @Serializable
+    data object Settings : NavRoutes()
+
+    @Serializable
+    data class MessageThread(
+        val address: String,
+        val body: String? = null
+    ) : NavRoutes() {
+        companion object {
+            const val address = "address"
+            const val body = "body"
+            private const val basePath = "connectyou://message"
+            const val navAction = "com.bnyro.contacts.SMS"
+            val deepLinks = listOf(navDeepLink<MessageThread>(basePath) {
+                action = navAction
+            })
+
+
+            fun getDeepLink(number: String, bodyText: String? = null): Uri {
+                return if (bodyText == null) {
+                    "connectyou://message/${
+                        URLEncoder.encode(
+                            number,
+                            "UTF-8"
+                        )
+                    }".toUri()
+                } else {
+                    "connectyou://message/${
+                        URLEncoder.encode(
+                            number,
+                            "UTF-8"
+                        )
+                    }?body=${URLEncoder.encode(bodyText, "UTF-8")}".toUri()
+                }
+            }
+        }
+    }
+}
+
+@Serializable
+sealed class HomeRoutes {
+    @Serializable
+    data class Phone(
+        val phoneNumber: String? = null
+    ) : HomeRoutes() {
+        companion object {
+            const val phoneNumber = "phoneNumber"
+            private const val basePath = "connectyou://dial"
+            const val navAction = "com.bnyro.contacts.DIAL"
+            val deepLinks = listOf(navDeepLink<Phone>(basePath) {
+                action = navAction
+            })
+
+            fun getDeepLink(number: String) = "connectyou://dial?phoneNumber=$number".toUri()
+        }
+    }
+
+    @Serializable
+    data object Contacts : HomeRoutes()
+
+    @Serializable
+    data object Messages : HomeRoutes()
+
+    companion object {
+        val all = listOf(
+            HomeNavBarItem(Phone(), R.string.dial, Icons.Rounded.Phone),
+            HomeNavBarItem(Contacts, R.string.contacts, Icons.Rounded.Person),
+            HomeNavBarItem(Messages, R.string.messages, Icons.AutoMirrored.Rounded.Message)
+        )
+    }
+}
+
+data class HomeNavBarItem(
+    val route: HomeRoutes,
+    @StringRes val stringRes: Int,
+    val icon: ImageVector
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/presentation/components/BlobIconBox.kt b/app/src/main/java/com/bnyro/contacts/presentation/components/BlobIconBox.kt
new file mode 100644
index 00000000..a444833f
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/presentation/components/BlobIconBox.kt
@@ -0,0 +1,39 @@
+package com.bnyro.contacts.presentation.components
+
+import androidx.annotation.DrawableRes
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import com.bnyro.contacts.R
+
+@Composable
+fun BlobIconBox(@DrawableRes icon: Int) {
+    Box(
+        contentAlignment = Alignment.Center,
+        modifier = Modifier
+            .fillMaxSize()
+            .alpha(0.3f)
+    ) {
+        Image(
+            modifier = Modifier.size(350.dp),
+            painter = painterResource(id = R.drawable.blob),
+            contentDescription = null,
+            colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.secondaryContainer)
+        )
+        Image(
+            modifier = Modifier.size(250.dp),
+            painter = painterResource(id = icon),
+            contentDescription = null,
+            colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSecondaryContainer)
+        )
+    }
+}
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/BlockButton.kt b/app/src/main/java/com/bnyro/contacts/presentation/components/BlockButton.kt
similarity index 97%
rename from app/src/main/java/com/bnyro/contacts/ui/components/BlockButton.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/components/BlockButton.kt
index b6f70db0..f35c2ceb 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/BlockButton.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/components/BlockButton.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components
+package com.bnyro.contacts.presentation.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/CharacterHeader.kt b/app/src/main/java/com/bnyro/contacts/presentation/components/CharacterHeader.kt
similarity index 93%
rename from app/src/main/java/com/bnyro/contacts/ui/components/CharacterHeader.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/components/CharacterHeader.kt
index 32445d98..c440fabd 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/CharacterHeader.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/components/CharacterHeader.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components
+package com.bnyro.contacts.presentation.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.fillMaxWidth
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/base/ChipSelector.kt b/app/src/main/java/com/bnyro/contacts/presentation/components/ChipSelector.kt
similarity index 97%
rename from app/src/main/java/com/bnyro/contacts/ui/components/base/ChipSelector.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/components/ChipSelector.kt
index 6bc152cf..f75f5c1e 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/base/ChipSelector.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/components/ChipSelector.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components.base
+package com.bnyro.contacts.presentation.components
 
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/base/ClickableIcon.kt b/app/src/main/java/com/bnyro/contacts/presentation/components/ClickableIcon.kt
similarity index 56%
rename from app/src/main/java/com/bnyro/contacts/ui/components/base/ClickableIcon.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/components/ClickableIcon.kt
index e78f80c7..a3b54138 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/base/ClickableIcon.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/components/ClickableIcon.kt
@@ -1,7 +1,15 @@
-package com.bnyro.contacts.ui.components.base
+package com.bnyro.contacts.presentation.components
 
 import androidx.annotation.StringRes
-import androidx.compose.material3.*
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.PlainTooltip
+import androidx.compose.material3.Text
+import androidx.compose.material3.TooltipBox
+import androidx.compose.material3.TooltipDefaults
+import androidx.compose.material3.rememberTooltipState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -18,9 +26,17 @@ fun ClickableIcon(
     onClick: () -> Unit
 ) {
     if (contentDescription != null) {
-        PlainTooltipBox(tooltip = { Text(stringResource(contentDescription)) }) {
+        TooltipBox(
+            tooltip = {
+                PlainTooltip {
+                    Text(stringResource(contentDescription))
+                }
+            },
+            positionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
+            state = rememberTooltipState(),
+        ) {
             IconButton(
-                modifier = modifier.tooltipTrigger(),
+                modifier = modifier,
                 onClick = onClick
             ) {
                 Icon(
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/ClickableText.kt b/app/src/main/java/com/bnyro/contacts/presentation/components/ClickableText.kt
similarity index 93%
rename from app/src/main/java/com/bnyro/contacts/ui/components/ClickableText.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/components/ClickableText.kt
index d3325ed6..4e409b9e 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/ClickableText.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/components/ClickableText.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components
+package com.bnyro.contacts.presentation.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.fillMaxWidth
diff --git a/app/src/main/java/com/bnyro/contacts/presentation/components/DialerButton.kt b/app/src/main/java/com/bnyro/contacts/presentation/components/DialerButton.kt
new file mode 100644
index 00000000..bed4dd98
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/presentation/components/DialerButton.kt
@@ -0,0 +1,53 @@
+package com.bnyro.contacts.presentation.components
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Mic
+import androidx.compose.material.icons.rounded.MicOff
+import androidx.compose.material3.FilledIconToggleButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun DialerButton(
+    isEnabled: Boolean,
+    icon: ImageVector,
+    hint: String,
+    onClick: () -> Unit
+) {
+    Column(
+        verticalArrangement = Arrangement.spacedBy(8.dp),
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        FilledIconToggleButton(
+            checked = isEnabled,
+            onCheckedChange = { onClick.invoke() },
+            shape = CircleShape,
+            modifier = Modifier.size(48.dp)
+        ) {
+            Icon(imageVector = icon, contentDescription = hint)
+        }
+        Text(text = hint)
+    }
+}
+
+@Preview
+@Composable
+private fun DialerButtonPreview() {
+    Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) {
+        DialerButton(isEnabled = true, icon = Icons.Rounded.MicOff, hint = "Mute") {
+        }
+        DialerButton(isEnabled = false, icon = Icons.Rounded.Mic, hint = "Mute") {
+        }
+    }
+}
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/base/ElevatedTextInputField.kt b/app/src/main/java/com/bnyro/contacts/presentation/components/ElevatedTextInputField.kt
similarity index 91%
rename from app/src/main/java/com/bnyro/contacts/ui/components/base/ElevatedTextInputField.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/components/ElevatedTextInputField.kt
index 4dc14bd5..3a17d939 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/base/ElevatedTextInputField.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/components/ElevatedTextInputField.kt
@@ -1,7 +1,5 @@
-package com.bnyro.contacts.ui.components.base
+package com.bnyro.contacts.presentation.components
 
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
@@ -18,7 +16,6 @@ import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.unit.dp
 
 @Composable
 fun ElevatedTextInputField(
@@ -55,5 +52,6 @@ fun ElevatedTextInputField(
         ),
         keyboardOptions = KeyboardOptions(imeAction = imeAction),
         singleLine = singleLine,
+        enabled = enabled
     )
 }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/base/FullscreenDialog.kt b/app/src/main/java/com/bnyro/contacts/presentation/components/FullscreenDialog.kt
similarity index 93%
rename from app/src/main/java/com/bnyro/contacts/ui/components/base/FullscreenDialog.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/components/FullscreenDialog.kt
index 0a3d295f..e47bae4f 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/base/FullscreenDialog.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/components/FullscreenDialog.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components.base
+package com.bnyro.contacts.presentation.components
 
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.Surface
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/base/LabeledTextField.kt b/app/src/main/java/com/bnyro/contacts/presentation/components/LabeledTextField.kt
similarity index 98%
rename from app/src/main/java/com/bnyro/contacts/ui/components/base/LabeledTextField.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/components/LabeledTextField.kt
index 0410bebb..0191f269 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/base/LabeledTextField.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/components/LabeledTextField.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components.base
+package com.bnyro.contacts.presentation.components
 
 import androidx.annotation.StringRes
 import androidx.compose.foundation.interaction.MutableInteractionSource
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/base/LargeButtonWithIcon.kt b/app/src/main/java/com/bnyro/contacts/presentation/components/LargeButtonWithIcon.kt
similarity index 96%
rename from app/src/main/java/com/bnyro/contacts/ui/components/base/LargeButtonWithIcon.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/components/LargeButtonWithIcon.kt
index 07b59cb5..94d8245b 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/base/LargeButtonWithIcon.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/components/LargeButtonWithIcon.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components.base
+package com.bnyro.contacts.presentation.components
 
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/NothingHere.kt b/app/src/main/java/com/bnyro/contacts/presentation/components/NothingHere.kt
similarity index 95%
rename from app/src/main/java/com/bnyro/contacts/ui/components/NothingHere.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/components/NothingHere.kt
index ab4f566c..0e5b0416 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/NothingHere.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/components/NothingHere.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components
+package com.bnyro.contacts.presentation.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/base/OptionMenu.kt b/app/src/main/java/com/bnyro/contacts/presentation/components/OptionMenu.kt
similarity index 94%
rename from app/src/main/java/com/bnyro/contacts/ui/components/base/OptionMenu.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/components/OptionMenu.kt
index 4e0126d6..48bf1e41 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/base/OptionMenu.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/components/OptionMenu.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components.base
+package com.bnyro.contacts.presentation.components
 
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/base/SearchBar.kt b/app/src/main/java/com/bnyro/contacts/presentation/components/SearchBar.kt
similarity index 98%
rename from app/src/main/java/com/bnyro/contacts/ui/components/base/SearchBar.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/components/SearchBar.kt
index 39fd3f77..271ab11d 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/base/SearchBar.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/components/SearchBar.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components.base
+package com.bnyro.contacts.presentation.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/ShareOption.kt b/app/src/main/java/com/bnyro/contacts/presentation/components/ShareOption.kt
similarity index 78%
rename from app/src/main/java/com/bnyro/contacts/ui/components/ShareOption.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/components/ShareOption.kt
index 2be4edcb..5a9b6214 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/ShareOption.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/components/ShareOption.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components
+package com.bnyro.contacts.presentation.components
 
 import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.Row
@@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -17,13 +16,14 @@ import androidx.compose.ui.unit.dp
 @Composable
 fun ShareOption(
     @StringRes title: Int,
-    isChecked: MutableState<Boolean>
+    isChecked: Boolean,
+    onCheckedChange: (Boolean) -> Unit
 ) {
     Row(
         modifier = Modifier.fillMaxWidth(),
         verticalAlignment = Alignment.CenterVertically
     ) {
-        Checkbox(checked = isChecked.value, onCheckedChange = { isChecked.value = it })
+        Checkbox(checked = isChecked, onCheckedChange = onCheckedChange)
         Spacer(modifier = Modifier.width(10.dp))
         Text(text = stringResource(title))
     }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/base/SmallButtonWithIcon.kt b/app/src/main/java/com/bnyro/contacts/presentation/components/SmallButtonWithIcon.kt
similarity index 87%
rename from app/src/main/java/com/bnyro/contacts/ui/components/base/SmallButtonWithIcon.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/components/SmallButtonWithIcon.kt
index 893bb264..a9bf8497 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/base/SmallButtonWithIcon.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/components/SmallButtonWithIcon.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components.base
+package com.bnyro.contacts.presentation.components
 
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -30,7 +30,9 @@ fun SmallButtonWithIcon(
             verticalAlignment = Alignment.CenterVertically
         ) {
             Icon(
-                modifier = Modifier.size(16.dp).offset(x = (-4).dp),
+                modifier = Modifier
+                    .size(16.dp)
+                    .offset(x = (-4).dp),
                 imageVector = imageVector,
                 contentDescription = text
             )
diff --git a/app/src/main/java/com/bnyro/contacts/presentation/components/TopBarMoreMenu.kt b/app/src/main/java/com/bnyro/contacts/presentation/components/TopBarMoreMenu.kt
new file mode 100644
index 00000000..92928163
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/presentation/components/TopBarMoreMenu.kt
@@ -0,0 +1,39 @@
+package com.bnyro.contacts.presentation.components
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import com.bnyro.contacts.R
+
+@Composable
+fun TopBarMoreMenu(
+    options: List<String> = emptyList(),
+    onOptionClick: (Int) -> Unit = {}
+) {
+    var expandedOptions by rememberSaveable {
+        mutableStateOf(false)
+    }
+
+    ClickableIcon(
+        icon = Icons.Default.MoreVert,
+        contentDescription = R.string.more
+    ) {
+        expandedOptions = !expandedOptions
+    }
+
+    OptionMenu(
+        expanded = expandedOptions,
+        options = options,
+        onDismissRequest = {
+            expandedOptions = false
+        },
+        onSelect = {
+            onOptionClick(it)
+            expandedOptions = false
+        }
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/base/ZoomableImage.kt b/app/src/main/java/com/bnyro/contacts/presentation/components/ZoomableImage.kt
similarity index 97%
rename from app/src/main/java/com/bnyro/contacts/ui/components/base/ZoomableImage.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/components/ZoomableImage.kt
index 1258c2e3..5f88295c 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/base/ZoomableImage.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/components/ZoomableImage.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components.base
+package com.bnyro.contacts.presentation.components
 
 import android.graphics.Bitmap
 import androidx.compose.foundation.Image
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/shapes/CurlyCornerShape.kt b/app/src/main/java/com/bnyro/contacts/presentation/components/shapes/CurlyCornerShape.kt
similarity index 97%
rename from app/src/main/java/com/bnyro/contacts/ui/components/shapes/CurlyCornerShape.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/components/shapes/CurlyCornerShape.kt
index 258a357d..5ef78881 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/shapes/CurlyCornerShape.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/components/shapes/CurlyCornerShape.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components.shapes
+package com.bnyro.contacts.presentation.components.shapes
 
 import androidx.compose.foundation.shape.CornerBasedShape
 import androidx.compose.foundation.shape.CornerSize
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/dialogs/AddToContactDialog.kt b/app/src/main/java/com/bnyro/contacts/presentation/features/AddToContactDialog.kt
similarity index 82%
rename from app/src/main/java/com/bnyro/contacts/ui/components/dialogs/AddToContactDialog.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/features/AddToContactDialog.kt
index ad89b6bb..fe86ed41 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/dialogs/AddToContactDialog.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/features/AddToContactDialog.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components.dialogs
+package com.bnyro.contacts.presentation.features
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.height
@@ -20,22 +20,18 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.bnyro.contacts.R
-import com.bnyro.contacts.obj.ContactData
-import com.bnyro.contacts.obj.ValueWithType
-import com.bnyro.contacts.ui.components.ClickableText
-import com.bnyro.contacts.ui.models.ContactsModel
-import com.bnyro.contacts.ui.screens.EditorScreen
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.domain.model.ValueWithType
+import com.bnyro.contacts.presentation.components.ClickableText
+import com.bnyro.contacts.presentation.screens.contacts.model.ContactsModel
+import com.bnyro.contacts.presentation.screens.editor.EditorScreen
 import kotlinx.coroutines.launch
 
 @Composable
-fun AddToContactDialog(newNumber: String) {
+fun AddToContactDialog(newNumber: String, onDismissRequest: () -> Unit) {
     val context = LocalContext.current
     val contactsModel: ContactsModel = viewModel(factory = ContactsModel.Factory)
 
-    var showDialog by remember {
-        mutableStateOf(true)
-    }
-
     var contactToEdit by remember {
         mutableStateOf<ContactData?>(null)
     }
@@ -46,23 +42,22 @@ fun AddToContactDialog(newNumber: String) {
 
     val scope = rememberCoroutineScope()
 
-    if (showDialog) {
+    if (contactToEdit == null) {
         var searchQuery by remember {
             mutableStateOf("")
         }
 
         AlertDialog(
-            onDismissRequest = { showDialog = false },
+            onDismissRequest = { onDismissRequest() },
             confirmButton = {
                 DialogButton(text = stringResource(R.string.cancel)) {
-                    showDialog = false
+                    onDismissRequest()
                 }
             },
             dismissButton = {
                 DialogButton(text = stringResource(R.string.new_contact)) {
                     isNewContact = true
                     contactToEdit = ContactData()
-                    showDialog = false
                 }
             },
             title = {
@@ -88,13 +83,13 @@ fun AddToContactDialog(newNumber: String) {
                                     it.displayName.orEmpty().lowercase().contains(
                                         searchQuery.lowercase()
                                     )
-                                }
+                                },
+                            key = ContactData::contactId
                         ) {
                             ClickableText(text = it.displayName.orEmpty()) {
                                 scope.launch {
                                     contactToEdit = contactsModel.loadAdvancedContactData(it)
                                 }
-                                showDialog = false
                             }
                         }
                     }
@@ -109,7 +104,9 @@ fun AddToContactDialog(newNumber: String) {
         }
         EditorScreen(
             contact = it,
-            onClose = { contactToEdit = null }
+            onClose = {
+                contactToEdit = null
+            }
         ) { contact ->
             if (isNewContact) {
                 contactsModel.createContact(context, contact)
@@ -117,6 +114,7 @@ fun AddToContactDialog(newNumber: String) {
                 contactsModel.updateContact(context, contact)
             }
             contactToEdit = null
+            onDismissRequest()
         }
     }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/ConfirmImportContacts.kt b/app/src/main/java/com/bnyro/contacts/presentation/features/ConfirmImportContacts.kt
similarity index 84%
rename from app/src/main/java/com/bnyro/contacts/ui/components/ConfirmImportContacts.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/features/ConfirmImportContacts.kt
index da30908b..5de130ad 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/ConfirmImportContacts.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/features/ConfirmImportContacts.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components
+package com.bnyro.contacts.presentation.features
 
 import android.net.Uri
 import androidx.compose.runtime.Composable
@@ -9,8 +9,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import com.bnyro.contacts.R
-import com.bnyro.contacts.ui.components.dialogs.ConfirmationDialog
-import com.bnyro.contacts.ui.models.ContactsModel
+import com.bnyro.contacts.presentation.screens.contacts.model.ContactsModel
 
 @Composable
 fun ConfirmImportContactsDialog(contactsModel: ContactsModel, contactsUri: Uri) {
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/dialogs/ConfirmationDialog.kt b/app/src/main/java/com/bnyro/contacts/presentation/features/ConfirmationDialog.kt
similarity index 93%
rename from app/src/main/java/com/bnyro/contacts/ui/components/dialogs/ConfirmationDialog.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/features/ConfirmationDialog.kt
index e8039536..344d8ea3 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/dialogs/ConfirmationDialog.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/features/ConfirmationDialog.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components.dialogs
+package com.bnyro.contacts.presentation.features
 
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Text
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/dialogs/DialogButton.kt b/app/src/main/java/com/bnyro/contacts/presentation/features/DialogButton.kt
similarity index 85%
rename from app/src/main/java/com/bnyro/contacts/ui/components/dialogs/DialogButton.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/features/DialogButton.kt
index a07fb4a9..8b288b26 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/dialogs/DialogButton.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/features/DialogButton.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components.dialogs
+package com.bnyro.contacts.presentation.features
 
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/dialogs/FilterDialog.kt b/app/src/main/java/com/bnyro/contacts/presentation/features/FilterDialog.kt
similarity index 76%
rename from app/src/main/java/com/bnyro/contacts/ui/components/dialogs/FilterDialog.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/features/FilterDialog.kt
index 2be3a40f..9117ecfc 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/dialogs/FilterDialog.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/features/FilterDialog.kt
@@ -1,23 +1,29 @@
-package com.bnyro.contacts.ui.components.dialogs
+package com.bnyro.contacts.presentation.features
 
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
 import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import com.bnyro.contacts.R
-import com.bnyro.contacts.enums.SortOrder
-import com.bnyro.contacts.obj.AccountType
-import com.bnyro.contacts.obj.ContactsGroup
-import com.bnyro.contacts.obj.FilterOptions
-import com.bnyro.contacts.ui.components.base.ChipSelector
+import com.bnyro.contacts.domain.enums.SortOrder
+import com.bnyro.contacts.domain.model.AccountType
+import com.bnyro.contacts.domain.model.ContactsGroup
+import com.bnyro.contacts.domain.model.FilterOptions
+import com.bnyro.contacts.presentation.components.ChipSelector
 
 @Composable
 fun FilterDialog(
@@ -38,12 +44,16 @@ fun FilterDialog(
     var visibleGroups by remember {
         mutableStateOf(initialFilters.visibleGroups)
     }
+    
+    var favoritesOnly by remember {
+        mutableStateOf(initialFilters.favoritesOnly)
+    }
 
     AlertDialog(
         onDismissRequest = onDismissRequest,
         confirmButton = {
             DialogButton(text = stringResource(R.string.okay)) {
-                val options = FilterOptions(sortOrder, hiddenAccountNames, visibleGroups)
+                val options = FilterOptions(sortOrder, hiddenAccountNames, visibleGroups, favoritesOnly)
                 onFilterChanged.invoke(options)
                 onDismissRequest.invoke()
             }
@@ -105,6 +115,19 @@ fun FilterDialog(
                         }
                     )
                 }
+                Spacer(modifier = Modifier.height(10.dp))
+                Row(
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Text(
+                        modifier = Modifier.weight(1f),
+                        text = stringResource(id = R.string.favorites_only),
+                        fontSize = 18.sp,
+                        fontWeight = FontWeight.Bold
+                    )
+
+                    Checkbox(checked = favoritesOnly, onCheckedChange = { favoritesOnly = it })
+                }
             }
         }
     )
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/dialogs/GroupsDialog.kt b/app/src/main/java/com/bnyro/contacts/presentation/features/GroupsDialog.kt
similarity index 94%
rename from app/src/main/java/com/bnyro/contacts/ui/components/dialogs/GroupsDialog.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/features/GroupsDialog.kt
index 9377ee30..5414a660 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/dialogs/GroupsDialog.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/features/GroupsDialog.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components.dialogs
+package com.bnyro.contacts.presentation.features
 
 import android.widget.Toast
 import androidx.compose.foundation.layout.Row
@@ -25,9 +25,9 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.bnyro.contacts.R
-import com.bnyro.contacts.obj.ContactsGroup
-import com.bnyro.contacts.ui.components.base.ClickableIcon
-import com.bnyro.contacts.ui.models.ContactsModel
+import com.bnyro.contacts.domain.model.ContactsGroup
+import com.bnyro.contacts.presentation.components.ClickableIcon
+import com.bnyro.contacts.presentation.screens.contacts.model.ContactsModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -72,7 +72,7 @@ fun GroupsDialog(
             LazyColumn(
                 modifier = Modifier.height(300.dp)
             ) {
-                items(contactGroups) { group ->
+                items(contactGroups, key = ContactsGroup::rowId) { group ->
                     Row(
                         verticalAlignment = Alignment.CenterVertically
                     ) {
diff --git a/app/src/main/java/com/bnyro/contacts/presentation/features/NumberPickerDialog.kt b/app/src/main/java/com/bnyro/contacts/presentation/features/NumberPickerDialog.kt
new file mode 100644
index 00000000..77efb7ac
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/presentation/features/NumberPickerDialog.kt
@@ -0,0 +1,283 @@
+package com.bnyro.contacts.presentation.features
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.rounded.ArrowBackIos
+import androidx.compose.material.icons.rounded.AddComment
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.material3.surfaceColorAtElevation
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import coil.compose.AsyncImage
+import com.bnyro.contacts.R
+import com.bnyro.contacts.domain.enums.SortOrder
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.domain.model.ContactSingleDataItem
+import com.bnyro.contacts.presentation.screens.contacts.model.ContactsModel
+import com.bnyro.contacts.presentation.screens.editor.components.ContactIconPlaceholder
+import com.bnyro.contacts.presentation.screens.settings.model.ThemeModel
+
+@Composable
+fun NumberPickerDialog(
+    contactsModel: ContactsModel,
+    themeModel: ThemeModel,
+    onDismissRequest: () -> Unit,
+    onNumberSelect: (number: String, contactData: ContactData?) -> Unit
+) {
+    Dialog(
+        onDismissRequest = onDismissRequest,
+        properties = remember { DialogProperties(usePlatformDefaultWidth = false) }) {
+        Surface(color = MaterialTheme.colorScheme.surface) {
+            Column(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .padding(horizontal = 8.dp)
+            ) {
+                var filteredContacts by remember {
+                    mutableStateOf(contactsModel.contacts.flatMap {
+                        it.numbers.map { num ->
+                            ContactSingleDataItem(
+                                name = it.getNameBySortOrder(SortOrder.FIRSTNAME).orEmpty(),
+                                data = num.value,
+                                thumbnail = it.thumbnail,
+                                contactData = it
+                            )
+                        }
+                    })
+                }
+                var searchQuery by remember {
+                    mutableStateOf("")
+                }
+                TextField(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(vertical = 10.dp),
+                    value = searchQuery,
+                    onValueChange = {
+                        searchQuery = it
+                        val lowerQuery = searchQuery.lowercase()
+                        filteredContacts = contactsModel.contacts.flatMap {
+                            it.numbers.map { num ->
+                                ContactSingleDataItem(
+                                    name = it.getNameBySortOrder(SortOrder.FIRSTNAME).orEmpty(),
+                                    data = num.value,
+                                    thumbnail = it.thumbnail,
+                                    contactData = it
+                                )
+                            }
+                        }.filter { item ->
+                            item.name.lowercase()
+                                .contains(lowerQuery) || item.data.lowercase().contains(lowerQuery)
+                        }
+                    },
+                    placeholder = { Text(stringResource(R.string.search_contacts)) },
+                    colors = TextFieldDefaults.colors(
+                        focusedContainerColor = MaterialTheme.colorScheme.secondaryContainer,
+                        unfocusedContainerColor = MaterialTheme.colorScheme.secondaryContainer,
+                        focusedTextColor = MaterialTheme.colorScheme.onSecondaryContainer,
+                        unfocusedTextColor = MaterialTheme.colorScheme.onSecondaryContainer,
+                        focusedIndicatorColor = Color.Transparent,
+                        unfocusedIndicatorColor = Color.Transparent
+                    ),
+                    shape = RoundedCornerShape(50),
+                    leadingIcon = {
+                        IconButton(onClick = onDismissRequest) {
+                            Icon(
+                                imageVector = Icons.AutoMirrored.Rounded.ArrowBackIos,
+                                contentDescription = null
+                            )
+                        }
+                    }
+                )
+
+                LazyColumn(Modifier.weight(1f), contentPadding = PaddingValues(horizontal = 8.dp)) {
+                    if (searchQuery.length > 2) {
+                        item {
+                            NewNumberCard(
+                                number = searchQuery,
+                                onClick = {
+                                    onNumberSelect.invoke(searchQuery, null)
+                                }
+                            )
+                            Spacer(modifier = Modifier.height(10.dp))
+                        }
+                    }
+                    items(filteredContacts) {
+                        ContactCard(
+                            name = it.name,
+                            number = it.data,
+                            thumbnail = it.thumbnail,
+                            themeModel = themeModel,
+                            onClick = {
+                                onNumberSelect.invoke(it.data, it.contactData)
+                            }
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun ContactCard(
+    name: String,
+    number: String,
+    thumbnail: Any?,
+    themeModel: ThemeModel,
+    onClick: () -> Unit = {}
+) {
+    Box(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(vertical = 6.dp)
+            .clip(RoundedCornerShape(20.dp))
+            .background(MaterialTheme.colorScheme.surfaceColorAtElevation(1.dp))
+            .clickable {
+                onClick.invoke()
+            }
+    ) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 8.dp, vertical = 16.dp),
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            if (thumbnail != null) {
+                Box(
+                    modifier = Modifier
+                        .size(42.dp)
+                        .background(
+                            shape = CircleShape,
+                            color = MaterialTheme.colorScheme.primary
+                        )
+                ) {
+                    AsyncImage(
+                        model = thumbnail,
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .clip(CircleShape),
+                        contentDescription = null,
+                        contentScale = ContentScale.Crop
+                    )
+                }
+            } else {
+                ContactIconPlaceholder(
+                    themeModel = themeModel,
+                    firstChar = name.firstOrNull(),
+                )
+            }
+            Column(Modifier.weight(1f)) {
+                Text(
+                    text = name,
+                    color = MaterialTheme.colorScheme.primary,
+                    style = MaterialTheme.typography.titleMedium,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
+                )
+                Text(
+                    text = number,
+                    color = MaterialTheme.colorScheme.secondary,
+                    style = MaterialTheme.typography.bodyMedium,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun NewNumberCard(
+    number: String,
+    onClick: () -> Unit = {}
+) {
+    Box(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(vertical = 6.dp)
+            .clip(RoundedCornerShape(20.dp))
+            .background(MaterialTheme.colorScheme.surfaceColorAtElevation(1.dp))
+            .clickable {
+                onClick.invoke()
+            }
+    ) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 8.dp, vertical = 16.dp),
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Box(
+                modifier = Modifier
+                    .size(42.dp)
+                    .background(
+                        shape = CircleShape,
+                        color = MaterialTheme.colorScheme.surfaceVariant
+                    )
+            ) {
+                Icon(
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .padding(8.dp),
+                    imageVector = Icons.Rounded.AddComment,
+                    contentDescription = null,
+                    tint = MaterialTheme.colorScheme.onSurfaceVariant
+                )
+            }
+            Column(Modifier.weight(1f)) {
+                Text(
+                    text = stringResource(R.string.start_a_new_conversation),
+                    color = MaterialTheme.colorScheme.primary,
+                    style = MaterialTheme.typography.titleMedium,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
+                )
+                Text(
+                    text = number,
+                    color = MaterialTheme.colorScheme.secondary,
+                    style = MaterialTheme.typography.bodyMedium,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/ShareDialog.kt b/app/src/main/java/com/bnyro/contacts/presentation/features/ShareDialog.kt
similarity index 52%
rename from app/src/main/java/com/bnyro/contacts/ui/components/ShareDialog.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/features/ShareDialog.kt
index 8213a9ce..0e4dfe18 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/ShareDialog.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/features/ShareDialog.kt
@@ -1,23 +1,26 @@
-package com.bnyro.contacts.ui.components
+package com.bnyro.contacts.presentation.features
 
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.bnyro.contacts.R
-import com.bnyro.contacts.obj.ContactData
-import com.bnyro.contacts.ui.components.dialogs.DialogButton
-import com.bnyro.contacts.ui.models.ContactsModel
+import com.bnyro.contacts.domain.enums.ListAttribute
+import com.bnyro.contacts.domain.enums.StringAttribute
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.presentation.components.ShareOption
+import com.bnyro.contacts.presentation.screens.contacts.model.ContactsModel
 import com.bnyro.contacts.util.BackupHelper
+import com.bnyro.contacts.util.ContactsHelper
 
 @Composable
 fun ShareDialog(
@@ -27,45 +30,46 @@ fun ShareDialog(
     val contactsModel: ContactsModel = viewModel(factory = ContactsModel.Factory)
     val context = LocalContext.current
 
-    val shareName = remember { mutableStateOf(true) }
-    val sharePhoto = remember { mutableStateOf(true) }
-    val shareNickName = remember { mutableStateOf(true) }
-    val shareOrganization = remember { mutableStateOf(true) }
-    val shareWebsite = remember { mutableStateOf(true) }
-    val sharePhone = remember { mutableStateOf(true) }
-    val shareEmail = remember { mutableStateOf(true) }
-    val shareAddress = remember { mutableStateOf(true) }
-    val shareNote = remember { mutableStateOf(true) }
+    val baseOptions = remember {
+        listOf(R.string.name, R.string.photo)
+    }
 
-    val options = listOf(
-        R.string.name to shareName,
-        R.string.photo to sharePhoto,
-        R.string.nick_name to shareNickName,
-        R.string.organization to shareOrganization,
-        R.string.website to shareWebsite,
-        R.string.phone to sharePhone,
-        R.string.email to shareEmail,
-        R.string.address to shareAddress,
-        R.string.note to shareNote
-    )
+    val options = remember {
+         baseOptions + ContactsHelper.contactAttributesTypes.map { it.stringRes }
+    }
+
+    val selected = remember {
+        SnapshotStateList<Boolean>().apply {
+            for (i in options.indices) add(true)
+        }
+    }
 
     fun getContactData(): ContactData {
-        return contact.copy().apply {
-            if (!shareName.value) {
-                displayName = null
-                alternativeName = null
-                firstName = null
-                surName = null
+        val data = ContactData()
+
+        if (selected[0]) {
+            data.displayName = contact.displayName
+            data.alternativeName = contact.alternativeName
+            data.firstName = contact.firstName
+            data.surName = contact.surName
+        }
+        if (selected[1]) {
+            data.photo = contact.photo
+        }
+
+        ContactsHelper.contactAttributesTypes.forEachIndexed { index, contactAttribute ->
+            if (selected[index + baseOptions.size]) {
+                if (contactAttribute is StringAttribute) {
+                    val value = contactAttribute.get(contact)
+                    contactAttribute.set(data, value)
+                } else if (contactAttribute is ListAttribute) {
+                    val value = contactAttribute.get(contact)
+                    contactAttribute.set(data, value)
+                }
             }
-            if (!sharePhoto.value) photo = null
-            if (!shareNickName.value) nickName = null
-            if (!shareOrganization.value) organization = null
-            if (!shareAddress.value) addresses = emptyList()
-            if (!shareEmail.value) emails = emptyList()
-            if (!shareNote.value) notes = emptyList()
-            if (!sharePhone.value) numbers = emptyList()
-            if (!shareWebsite.value) websites = emptyList()
         }
+
+        return data
     }
 
     val openFilePicker = rememberLauncherForActivityResult(
@@ -83,8 +87,10 @@ fun ShareDialog(
         title = { Text(stringResource(R.string.share)) },
         text = {
             LazyColumn {
-                items(options) {
-                    ShareOption(title = it.first, isChecked = it.second)
+                itemsIndexed(options) { index, it ->
+                    ShareOption(title = it, isChecked = selected[index]) {
+                        selected[index] = it
+                    }
                 }
             }
         },
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/dialogs/ShortcutDialog.kt b/app/src/main/java/com/bnyro/contacts/presentation/features/ShortcutDialog.kt
similarity index 94%
rename from app/src/main/java/com/bnyro/contacts/ui/components/dialogs/ShortcutDialog.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/features/ShortcutDialog.kt
index 148b5f41..5880acb5 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/dialogs/ShortcutDialog.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/features/ShortcutDialog.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components.dialogs
+package com.bnyro.contacts.presentation.features
 
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
@@ -12,9 +12,9 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import com.bnyro.contacts.R
-import com.bnyro.contacts.enums.IntentActionType
-import com.bnyro.contacts.obj.ContactData
-import com.bnyro.contacts.ui.components.ClickableText
+import com.bnyro.contacts.domain.enums.IntentActionType
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.presentation.components.ClickableText
 import com.bnyro.contacts.util.ShortcutHelper
 
 @Composable
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/dialogs/SimImportDialog.kt b/app/src/main/java/com/bnyro/contacts/presentation/features/SimImportDialog.kt
similarity index 96%
rename from app/src/main/java/com/bnyro/contacts/ui/components/dialogs/SimImportDialog.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/features/SimImportDialog.kt
index 2094c59e..95f8b6b6 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/dialogs/SimImportDialog.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/features/SimImportDialog.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components.dialogs
+package com.bnyro.contacts.presentation.features
 
 import android.widget.Toast
 import androidx.compose.foundation.layout.Box
@@ -28,8 +28,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.bnyro.contacts.R
-import com.bnyro.contacts.obj.ContactData
-import com.bnyro.contacts.ui.models.ContactsModel
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.presentation.screens.contacts.model.ContactsModel
 import com.bnyro.contacts.util.SimContactsHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
diff --git a/app/src/main/java/com/bnyro/contacts/presentation/screens/about/AboutScreen.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/about/AboutScreen.kt
new file mode 100644
index 00000000..17081235
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/about/AboutScreen.kt
@@ -0,0 +1,90 @@
+package com.bnyro.contacts.presentation.screens.about
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.bnyro.contacts.BuildConfig
+import com.bnyro.contacts.R
+import com.bnyro.contacts.presentation.components.ClickableIcon
+import com.bnyro.contacts.presentation.screens.about.components.AboutRow
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AboutScreen(onBackPress: () -> Unit) {
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = {
+                    Text(stringResource(R.string.about))
+                },
+                navigationIcon = {
+                    ClickableIcon(
+                        icon = Icons.Default.ArrowBack,
+                        contentDescription = R.string.okay
+                    ) {
+                        onBackPress.invoke()
+                    }
+                }
+            )
+        }
+    ) { pV ->
+        Column(
+            modifier = Modifier.padding(pV),
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            Image(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(210.dp),
+                painter = painterResource(R.drawable.ic_launcher_foreground),
+                contentDescription = null
+            )
+            HorizontalDivider(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(2.dp)
+            )
+            Spacer(Modifier.height(10.dp))
+            AboutRow(
+                title = stringResource(R.string.version),
+                summary = "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})"
+            )
+            AboutRow(
+                title = "GitHub",
+                url = "https://github.com/you-apps/ConnectYou/"
+            )
+            AboutRow(
+                title = stringResource(R.string.author),
+                summary = "You Apps",
+                url = "https://github.com/you-apps/"
+            )
+            AboutRow(
+                title = stringResource(R.string.translation),
+                summary = "Weblate",
+                url = "https://hosted.weblate.org/projects/you-apps/connect-you/"
+            )
+            AboutRow(
+                title = stringResource(R.string.license),
+                summary = "GPL-3.0",
+                url = "https://www.gnu.org/licenses/gpl-3.0.html"
+            )
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/about/AboutRow.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/about/components/AboutRow.kt
similarity index 96%
rename from app/src/main/java/com/bnyro/contacts/ui/components/about/AboutRow.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/about/components/AboutRow.kt
index daa4753d..e698c81c 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/about/AboutRow.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/about/components/AboutRow.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components.about
+package com.bnyro.contacts.presentation.screens.about.components
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.combinedClickable
diff --git a/app/src/main/java/com/bnyro/contacts/presentation/screens/calllog/CallLogsScreen.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/calllog/CallLogsScreen.kt
new file mode 100644
index 00000000..3c0bdaae
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/calllog/CallLogsScreen.kt
@@ -0,0 +1,405 @@
+package com.bnyro.contacts.presentation.screens.calllog
+
+import android.annotation.SuppressLint
+import android.os.Build
+import android.provider.BlockedNumberContract
+import android.provider.CallLog
+import android.text.format.DateUtils
+import android.view.SoundEffectConstants
+import androidx.annotation.StringRes
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.CutCornerShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.rounded.CallMade
+import androidx.compose.material.icons.automirrored.rounded.CallMissed
+import androidx.compose.material.icons.automirrored.rounded.CallReceived
+import androidx.compose.material.icons.filled.Dialpad
+import androidx.compose.material.icons.rounded.Block
+import androidx.compose.material.icons.rounded.Close
+import androidx.compose.material.icons.rounded.FrontHand
+import androidx.compose.material.icons.rounded.Handshake
+import androidx.compose.material.icons.rounded.MoreVert
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ElevatedCard
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.bnyro.contacts.R
+import com.bnyro.contacts.domain.model.CallLogEntry
+import com.bnyro.contacts.presentation.components.CharacterHeader
+import com.bnyro.contacts.presentation.components.ClickableIcon
+import com.bnyro.contacts.presentation.components.NothingHere
+import com.bnyro.contacts.presentation.features.ConfirmationDialog
+import com.bnyro.contacts.presentation.screens.calllog.components.NumberInput
+import com.bnyro.contacts.presentation.screens.calllog.components.PhoneNumberDisplay
+import com.bnyro.contacts.presentation.screens.calllog.model.CallModel
+import com.bnyro.contacts.presentation.screens.contacts.model.ContactsModel
+import com.bnyro.contacts.presentation.screens.settings.model.ThemeModel
+import com.bnyro.contacts.util.IntentHelper
+import com.bnyro.contacts.util.PermissionHelper
+
+
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
+@Composable
+fun CallLogsScreen(
+    contactsModel: ContactsModel,
+    themeModel: ThemeModel
+) {
+    val callModel: CallModel = viewModel()
+    val context = LocalContext.current
+
+    var showNumberPicker by remember {
+        mutableStateOf(callModel.initialPhoneNumber != null)
+    }
+
+    var selectedCallLog by remember {
+        mutableStateOf<CallLogEntry?>(null)
+    }
+
+    val groupedLogs = callModel.callLogs
+    Scaffold(
+        floatingActionButton = {
+            FloatingActionButton(
+                onClick = { showNumberPicker = true }
+            ) {
+                Icon(Icons.Default.Dialpad, contentDescription = null)
+            }
+        }, topBar = {
+            TopAppBar(title = {
+                Text(text = stringResource(id = R.string.recent_calls))
+            }, actions = {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                    Box {
+                        var showMore by remember { mutableStateOf(false) }
+                        ClickableIcon(
+                            icon = Icons.Rounded.MoreVert,
+                            contentDescription = R.string.more
+                        ) {
+                            showMore = !showMore
+                        }
+                        DropdownMenu(
+                            expanded = showMore,
+                            onDismissRequest = {
+                                showMore = false
+                            }
+                        ) {
+                            DropdownMenuItem(
+                                text = {
+                                    Text(
+                                        text = stringResource(R.string.block_numbers)
+                                    )
+                                },
+                                onClick = {
+                                    IntentHelper.openBlockedNumberManager(context)
+                                }
+                            )
+                        }
+                    }
+                }
+            })
+        }
+    ) { pV ->
+        if (groupedLogs.isNotEmpty()) {
+            LazyColumn(
+                modifier = Modifier.padding(pV)
+            ) {
+                groupedLogs.entries.forEach { (time, callLogs) ->
+                    stickyHeader {
+                        CharacterHeader(text = time)
+                    }
+                    items(callLogs, key = { callLog -> "${callLog.time} ${callLog.phoneNumber}"}) { callLog ->
+                        val contact = remember {
+                            contactsModel.getContactByNumber(callLog.phoneNumber)
+                        }
+                        var showCallDialog by remember {
+                            mutableStateOf(false)
+                        }
+                        val shape = RoundedCornerShape(20.dp)
+
+                        ElevatedCard(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .clip(shape)
+                                .padding(horizontal = 10.dp, vertical = 5.dp)
+                                .combinedClickable(onClick = {
+                                    if (callLog.phoneNumber.isNotBlank()) showCallDialog = true
+                                }, onLongClick = {
+                                    selectedCallLog = callLog
+                                }),
+                            shape = shape
+                        ) {
+                            Row(
+                                modifier = Modifier.padding(vertical = 10.dp, horizontal = 16.dp),
+                                verticalAlignment = Alignment.CenterVertically
+                            ) {
+                                Box(
+                                    modifier = Modifier
+                                        .size(48.dp)
+                                        .clip(CircleShape)
+                                        .background(color = MaterialTheme.colorScheme.surfaceVariant),
+                                    contentAlignment = Alignment.Center
+                                ) {
+                                    val icon: ImageVector = when (callLog.type) {
+                                        CallLog.Calls.INCOMING_TYPE -> Icons.AutoMirrored.Rounded.CallReceived
+                                        CallLog.Calls.OUTGOING_TYPE -> Icons.AutoMirrored.Rounded.CallMade
+                                        CallLog.Calls.MISSED_TYPE -> Icons.AutoMirrored.Rounded.CallMissed
+                                        CallLog.Calls.REJECTED_TYPE -> Icons.Rounded.Close
+                                        else -> Icons.Rounded.Block
+                                    }
+                                    Icon(
+                                        modifier = Modifier.size(24.dp),
+                                        imageVector = icon,
+                                        contentDescription = null,
+                                        tint = MaterialTheme.colorScheme.onSurfaceVariant
+                                    )
+                                }
+
+                                Spacer(modifier = Modifier.width(20.dp))
+
+                                Column(Modifier.weight(1f)) {
+                                    Text(
+                                        text = contact?.displayName ?: callLog.phoneNumber,
+                                        maxLines = 1
+                                    )
+                                }
+                                Column(horizontalAlignment = Alignment.End) {
+                                    callLog.subscriptionId?.let {
+                                        Box(
+                                            modifier = Modifier
+                                                .clip(CutCornerShape(10, 35, 10, 10))
+                                                .background(MaterialTheme.colorScheme.tertiaryContainer),
+                                            contentAlignment = Alignment.Center
+                                        ) {
+                                            Text(
+                                                modifier = Modifier.padding(horizontal = 4.dp),
+                                                text = it,
+                                                maxLines = 1,
+                                                color = MaterialTheme.colorScheme.onTertiaryContainer
+                                            )
+                                        }
+                                    }
+                                    Text(
+                                        text = callLog.timeString
+                                    )
+                                }
+                            }
+                        }
+
+                        if (showCallDialog) {
+                            ConfirmationDialog(
+                                onDismissRequest = { showCallDialog = false },
+                                title = stringResource(id = R.string.dial),
+                                text = stringResource(
+                                    id = R.string.confirm_start_call,
+                                    contact?.displayName ?: callLog.phoneNumber
+                                )
+                            ) {
+                                callModel.callNumber(callLog.phoneNumber)
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            NothingHere()
+        }
+    }
+
+    if (showNumberPicker) {
+        val state = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+
+        ModalBottomSheet(onDismissRequest = { showNumberPicker = false }, sheetState = state) {
+            Column(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .padding(horizontal = 8.dp),
+                horizontalAlignment = Alignment.CenterHorizontally
+            ) {
+                val contacts by callModel.contacts.collectAsState()
+                PhoneNumberDisplay(
+                    displayText = callModel.numberToCall,
+                    contacts = contacts,
+                    onClickContact = callModel::setPhoneNumberContact
+                )
+                NumberInput(
+                    onNumberInput = callModel::onNumberInput,
+                    onDelete = callModel::onBackSpace,
+                    onClear = callModel::onClearNumberInput,
+                    onDial = {
+                        callModel.callNumber()
+                    },
+                    subscriptions = callModel.subscriptions,
+                    onSubscriptionIndexChange = callModel::onSubscriptionIndexChange
+                )
+            }
+        }
+    }
+
+    selectedCallLog?.let {
+        CallLogOptionsSheet(
+            onDismissRequest = { selectedCallLog = null },
+            log = it
+        )
+    }
+
+    LaunchedEffect(Unit) {
+        callModel.requestDefaultDialerApp(context)
+    }
+}
+
+@SuppressLint("NewApi")
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun CallLogOptionsSheet(
+    onDismissRequest: () -> Unit,
+    log: CallLogEntry
+) {
+    val songSettingsSheetState = rememberModalBottomSheetState(
+        skipPartiallyExpanded = true
+    )
+    val context = LocalContext.current
+    var isBlocked by remember {
+        mutableStateOf<Boolean?>(null)
+    }
+    LaunchedEffect(Unit) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            if (!PermissionHelper.canBlockNumbers(context)) return@LaunchedEffect
+            isBlocked = BlockedNumberContract.isBlocked(context, log.phoneNumber)
+        }
+    }
+    ModalBottomSheet(
+        onDismissRequest = onDismissRequest,
+        sheetState = songSettingsSheetState,
+        windowInsets = WindowInsets.systemBars,
+        dragHandle = null
+    ) {
+        Row(
+            Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 8.dp, vertical = 16.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Box(
+                modifier = Modifier
+                    .size(64.dp)
+                    .padding(8.dp)
+                    .clip(CircleShape)
+                    .background(MaterialTheme.colorScheme.surfaceVariant)
+            ) {
+                Icon(
+                    modifier = Modifier.fillMaxSize(),
+                    painter = painterResource(id = R.drawable.ic_person),
+                    contentDescription = null,
+                    tint = MaterialTheme.colorScheme.onSurfaceVariant
+                )
+            }
+            Column(
+                Modifier
+                    .weight(1f)
+                    .padding(8.dp)
+            ) {
+                Text(
+                    log.phoneNumber,
+                    style = MaterialTheme.typography.titleMedium,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
+                )
+                Text(
+                    DateUtils.getRelativeTimeSpanString(log.time)?.toString()
+                        .orEmpty(),
+                    style = MaterialTheme.typography.titleSmall,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
+                )
+            }
+        }
+        Column(
+            Modifier
+                .padding(horizontal = 8.dp, vertical = 16.dp)
+        ) {
+            isBlocked?.let { isBlocked ->
+                if (isBlocked) {
+                    SheetSettingItem(
+                        icon = Icons.Rounded.Handshake,
+                        description = R.string.unblock_number,
+                        onClick = {
+                            BlockedNumberContract.unblock(context, log.phoneNumber)
+                            onDismissRequest()
+                        }
+                    )
+                } else {
+                    SheetSettingItem(
+                        icon = Icons.Rounded.FrontHand,
+                        description = R.string.block_number,
+                        onClick = {
+                            IntentHelper.blockNumberOrAddress(context, log.phoneNumber)
+                            onDismissRequest()
+                        }
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun SheetSettingItem(icon: ImageVector, @StringRes description: Int, onClick: () -> Unit) {
+    val view = LocalView.current
+    Row(
+        Modifier
+            .fillMaxWidth()
+            .clip(RoundedCornerShape(8.dp))
+            .clickable {
+                view.playSoundEffect(SoundEffectConstants.CLICK)
+                onClick()
+            }
+            .padding(8.dp)
+    ) {
+        Icon(imageVector = icon, contentDescription = null)
+        Spacer(Modifier.width(16.dp))
+        Text(text = stringResource(id = description))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/presentation/screens/calllog/components/NumberInput.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/calllog/components/NumberInput.kt
new file mode 100644
index 00000000..edd99616
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/calllog/components/NumberInput.kt
@@ -0,0 +1,416 @@
+package com.bnyro.contacts.presentation.screens.calllog.components
+
+import android.annotation.SuppressLint
+import android.telephony.SubscriptionInfo
+import android.view.SoundEffectConstants
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.rounded.Backspace
+import androidx.compose.material.icons.rounded.Call
+import androidx.compose.material.icons.rounded.Voicemail
+import androidx.compose.material3.Icon
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Text
+import androidx.compose.material3.surfaceColorAtElevation
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import coil.compose.AsyncImage
+import com.bnyro.contacts.R
+import com.bnyro.contacts.domain.model.BasicContactData
+
+val keypadNumbers: Array<Array<Pair<String, Any>>> = arrayOf(
+    arrayOf("1" to Icons.Rounded.Voicemail, "2" to "ABC", "3" to "DEF"),
+    arrayOf("4" to "GHI", "5" to "JKL", "6" to "MNO"),
+    arrayOf("7" to "PQRS", "8" to "TUV", "9" to "WXYZ"),
+    arrayOf("*" to Unit, "0" to "+", "#" to Unit)
+)
+
+@SuppressLint("NewApi")
+@Composable
+fun NumberInput(
+    onNumberInput: (String) -> Unit,
+    onDelete: () -> Unit,
+    onClear: () -> Unit,
+    onDial: () -> Unit,
+    subscriptions: List<SubscriptionInfo>?,
+    onSubscriptionIndexChange: (Int) -> Unit
+) {
+    val buttonSpacing = 8.dp
+    Column(
+        modifier = Modifier
+            .padding(8.dp)
+            .fillMaxWidth(),
+        verticalArrangement = Arrangement.spacedBy(buttonSpacing)
+    ) {
+        keypadNumbers.forEach { col ->
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(buttonSpacing)
+            ) {
+                col.forEach {
+                    when (val subContent = it.second) {
+                        is String -> {
+                            NumpadButtonWithSubcontent(
+                                aspectRatio = 1.5f,
+                                text = it.first,
+                                onClick = {
+                                    onNumberInput(it.first)
+                                }
+                            ) {
+                                Text(
+                                    text = subContent,
+                                    color = MaterialTheme.colorScheme.onSurface,
+                                    style = MaterialTheme.typography.bodyMedium
+                                )
+                            }
+                        }
+
+                        is ImageVector -> {
+                            NumpadButtonWithSubcontent(
+                                aspectRatio = 1.5f,
+                                text = it.first,
+                                onClick = {
+                                    onNumberInput(it.first)
+                                }
+                            ) {
+                                Icon(
+                                    modifier = Modifier.size(16.dp),
+                                    imageVector = subContent,
+                                    contentDescription = null,
+                                    tint = MaterialTheme.colorScheme.onSurface
+                                )
+                            }
+                        }
+
+                        else -> {
+                            NumpadButton(
+                                aspectRatio = 1.5f,
+                                text = it.first,
+                                onClick = {
+                                    onNumberInput(it.first)
+                                }
+                            )
+                        }
+                    }
+                }
+            }
+        }
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy(buttonSpacing)
+        ) {
+            Spacer(modifier = Modifier.weight(1f))
+            NumpadButton(
+                onClick = onDial,
+                backgroundColor = MaterialTheme.colorScheme.secondaryContainer
+            ) {
+                Icon(
+                    Icons.Rounded.Call,
+                    contentDescription = stringResource(R.string.dial),
+                    tint = MaterialTheme.colorScheme.onSecondaryContainer
+                )
+            }
+            NumpadButton(
+                onClick = onDelete,
+                onLongClick = onClear,
+                backgroundColor = MaterialTheme.colorScheme.tertiaryContainer
+            ) {
+                Icon(
+                    Icons.AutoMirrored.Rounded.Backspace,
+                    contentDescription = stringResource(R.string.delete),
+                    tint = MaterialTheme.colorScheme.onTertiaryContainer
+                )
+            }
+        }
+        if (subscriptions != null && subscriptions.size >= 2) {
+            var currentSub by remember { mutableIntStateOf(0) }
+            LaunchedEffect(Unit) {
+                currentSub = 0
+            }
+            Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center) {
+                OutlinedButton(onClick = {
+                    val newSub = (currentSub + 1) % subscriptions.size
+                    currentSub = newSub
+                    onSubscriptionIndexChange(newSub)
+                }) {
+                    Text(
+                        text = "SIM ${subscriptions[currentSub].simSlotIndex + 1} - ${subscriptions[currentSub].displayName}"
+                    )
+                }
+            }
+        }
+
+        Spacer(modifier = Modifier.height(30.dp))
+    }
+}
+
+@SuppressLint("NewApi")
+@Composable
+fun NumberInput(
+    onNumberInput: (String) -> Unit
+) {
+    val buttonSpacing = 8.dp
+    Column(
+        modifier = Modifier
+            .padding(8.dp)
+            .fillMaxWidth(),
+        verticalArrangement = Arrangement.spacedBy(buttonSpacing)
+    ) {
+        keypadNumbers.forEach { col ->
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(buttonSpacing)
+            ) {
+                col.forEach {
+                    NumpadButton(
+                        text = it.first,
+                        onClick = {
+                            onNumberInput(it.first)
+                        }
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun RowScope.NumpadButton(
+    text: String,
+    textColor: Color = MaterialTheme.colorScheme.onSurface,
+    backgroundColor: Color = MaterialTheme.colorScheme.surfaceColorAtElevation(10.dp),
+    aspectRatio: Float = 2f,
+    onClick: () -> Unit,
+    onLongClick: () -> Unit = { }
+) {
+    NumpadButton(
+        backgroundColor = backgroundColor,
+        aspectRatio = aspectRatio,
+        onClick = onClick,
+        onLongClick = onLongClick
+    ) {
+        Text(
+            text = text,
+            color = textColor,
+            style = MaterialTheme.typography.displaySmall
+        )
+    }
+}
+
+@Composable
+fun RowScope.NumpadButtonWithSubcontent(
+    text: String,
+    textColor: Color = MaterialTheme.colorScheme.onSurface,
+    backgroundColor: Color = MaterialTheme.colorScheme.surfaceColorAtElevation(10.dp),
+    aspectRatio: Float = 2f,
+    onClick: () -> Unit,
+    onLongClick: () -> Unit = { },
+    content: @Composable (() -> Unit),
+) {
+    NumpadButton(
+        backgroundColor = backgroundColor,
+        aspectRatio = aspectRatio,
+        onClick = onClick,
+        onLongClick = onLongClick
+    ) {
+        Column(
+            modifier = Modifier.padding(vertical = 4.dp),
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            Text(
+                text = text,
+                color = textColor,
+                style = MaterialTheme.typography.displaySmall
+            )
+            content()
+        }
+    }
+}
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+fun RowScope.NumpadButton(
+    backgroundColor: Color = MaterialTheme.colorScheme.surfaceVariant,
+    aspectRatio: Float = 2f,
+    onClick: () -> Unit,
+    onLongClick: () -> Unit = { },
+    content: @Composable (BoxScope.() -> Unit)
+) {
+    val view = LocalView.current
+    val haptic = LocalHapticFeedback.current
+    Box(
+        contentAlignment = Alignment.Center,
+        modifier = Modifier
+            .clip(CircleShape)
+            .combinedClickable(
+                onClick = {
+                    onClick.invoke()
+                    view.playSoundEffect(SoundEffectConstants.CLICK)
+                },
+                onLongClick = {
+                    onLongClick.invoke()
+                    haptic.performHapticFeedback(HapticFeedbackType.LongPress)
+                }
+            )
+            .background(backgroundColor)
+            .aspectRatio(aspectRatio)
+            .weight(1f),
+        content = content
+    )
+}
+
+@Composable
+fun ColumnScope.PhoneNumberDisplay(
+    displayText: String,
+    contacts: List<BasicContactData>,
+    onClickContact: (BasicContactData) -> Unit
+) {
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .weight(1.0f)
+    ) {
+        LazyColumn(
+            Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 16.dp, vertical = 8.dp)
+                .weight(1f),
+            verticalArrangement = Arrangement.spacedBy(8.dp, alignment = Alignment.Bottom)
+        ) {
+            items(contacts, key = BasicContactData::number) { contact ->
+                ContactSuggestionItem(onClickContact, contact)
+            }
+        }
+        val scroll = rememberScrollState()
+        Row(
+            Modifier
+                .fillMaxWidth()
+                .horizontalScroll(scroll)
+                .clip(RoundedCornerShape(24.dp))
+                .background(MaterialTheme.colorScheme.surfaceVariant),
+            horizontalArrangement = Arrangement.Center
+        ) {
+            Text(
+                text = displayText,
+                textAlign = TextAlign.Center,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(vertical = 8.dp, horizontal = 16.dp),
+                style = MaterialTheme.typography.displayMedium,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                maxLines = 1
+            )
+        }
+    }
+}
+
+@Composable
+private fun ContactSuggestionItem(
+    onClickContact: (BasicContactData) -> Unit,
+    contact: BasicContactData
+) {
+    ListItem(
+        modifier = Modifier.clickable { onClickContact.invoke(contact) },
+        headlineContent = { Text(text = contact.number) }, leadingContent = {
+            Box(
+                modifier = Modifier
+                    .size(48.dp)
+                    .clip(CircleShape)
+                    .background(MaterialTheme.colorScheme.surfaceVariant),
+                contentAlignment = Alignment.Center
+            ) {
+                if (contact.thumbnail != null) {
+                    AsyncImage(
+                        model = contact.thumbnail,
+                        contentDescription = null,
+                        modifier = Modifier.fillMaxSize(),
+                        alignment = Alignment.Center,
+                        contentScale = ContentScale.Crop
+                    )
+                } else {
+                    Icon(
+                        modifier = Modifier
+                            .fillMaxSize(),
+                        painter = painterResource(id = R.drawable.ic_person),
+                        contentDescription = null,
+                        tint = MaterialTheme.colorScheme.onSurfaceVariant
+                    )
+                }
+            }
+        }, supportingContent = {
+            if (contact.name != null) {
+                Text(text = contact.name)
+            }
+        })
+}
+
+@Composable
+fun PhoneNumberOnlyDisplay(displayText: String) {
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+    ) {
+        val scroll = rememberScrollState()
+        Row(
+            Modifier
+                .fillMaxWidth()
+                .horizontalScroll(scroll)
+                .clip(RoundedCornerShape(24.dp))
+                .background(MaterialTheme.colorScheme.surfaceVariant),
+            horizontalArrangement = Arrangement.Center
+        ) {
+            Text(
+                text = displayText,
+                textAlign = TextAlign.Center,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(vertical = 8.dp, horizontal = 16.dp),
+                style = MaterialTheme.typography.displayMedium,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                maxLines = 1
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/presentation/screens/calllog/model/CallModel.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/calllog/model/CallModel.kt
new file mode 100644
index 00000000..e18fc5b5
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/calllog/model/CallModel.kt
@@ -0,0 +1,204 @@
+package com.bnyro.contacts.presentation.screens.calllog.model
+
+import android.Manifest
+import android.app.Application
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.media.AudioManager
+import android.media.ToneGenerator
+import android.net.Uri
+import android.telecom.PhoneAccountHandle
+import android.telecom.TelecomManager
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.neverEqualPolicy
+import androidx.compose.runtime.setValue
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.viewModelScope
+import com.bnyro.contacts.App
+import com.bnyro.contacts.domain.model.BasicContactData
+import com.bnyro.contacts.domain.model.CallLogEntry
+import com.bnyro.contacts.navigation.HomeRoutes
+import com.bnyro.contacts.util.PermissionHelper
+import com.bnyro.contacts.util.SmsUtil
+import com.bnyro.contacts.util.extension.letterCombinations
+import com.bnyro.contacts.util.extension.removeLastChar
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+class CallModel(private val application: Application, savedStateHandle: SavedStateHandle) :
+    AndroidViewModel(application) {
+    private val callLogRepository = (application as App).callLogRepository
+    private val phoneLookupRepository = (application as App).phoneLookupRepository
+
+    val initialPhoneNumber = savedStateHandle.get<String>(HomeRoutes.Phone.phoneNumber)
+
+    var numberToCall: String by mutableStateOf(initialPhoneNumber.orEmpty())
+        private set
+
+    var callLogs by mutableStateOf<Map<String, List<CallLogEntry>>>(
+        mapOf(),
+        policy = neverEqualPolicy()
+    )
+        private set
+
+    private val contactsSet = mutableSetOf<BasicContactData>()
+
+    private val _contacts = MutableStateFlow<List<BasicContactData>>(emptyList())
+    val contacts = _contacts.asStateFlow()
+
+    private val toneGenerator = ToneGenerator(
+        AudioManager.STREAM_SYSTEM,
+        100
+    )
+
+    val subscriptions =
+        SmsUtil.getSubscriptions(application.applicationContext)
+
+    private var chosenSubInfo = subscriptions.firstOrNull()
+
+
+    init {
+        viewModelScope.launch {
+            val logs = callLogRepository.getCallLog()
+            callLogs = logs.groupBy {
+                it.dateString
+            }
+        }
+    }
+
+    fun onSubscriptionIndexChange(index: Int) {
+        chosenSubInfo = subscriptions[index]
+    }
+
+    fun onNumberInput(digit: String) {
+        numberToCall += digit
+        playToneForDigit(digit)
+        if (numberToCall.length > 2) {
+            searchPhoneNumberOrName(numberToCall)
+        }
+    }
+
+    fun setPhoneNumberContact(contact: BasicContactData) {
+        numberToCall = contact.number
+        _contacts.update {
+            listOf(contact)
+        }
+    }
+
+    fun onBackSpace() {
+        numberToCall = numberToCall.removeLastChar()
+        if (numberToCall.length > 2) {
+            searchPhoneNumberOrName(numberToCall)
+        } else {
+            _contacts.update {
+                emptyList()
+            }
+        }
+    }
+
+    fun onClearNumberInput() {
+        numberToCall = ""
+        _contacts.update {
+            emptyList()
+        }
+    }
+
+    fun callNumber(number: String = numberToCall) {
+        if (!PermissionHelper.hasPermission(application.applicationContext, *phonePerms)) return
+
+        val intent = Intent(Intent.ACTION_CALL, Uri.parse("tel:$number")).apply {
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK
+            chosenSubInfo?.let {
+                val phoneAccountHandle = PhoneAccountHandle(
+                    ComponentName(
+                        "com.android.phone",
+                        "com.android.services.telephony.TelephonyConnectionService"
+                    ),
+                    it.subscriptionId.toString()
+                )
+                putExtra(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE, phoneAccountHandle)
+            }
+        }
+        application.applicationContext.startActivity(intent)
+    }
+
+    fun requestDefaultDialerApp(context: Context) {
+        val telecomManager = context.getSystemService(Context.TELECOM_SERVICE) as TelecomManager?
+        val isAlreadyDefaultDialer =
+            context.packageName.equals(telecomManager!!.defaultDialerPackage)
+        if (!isAlreadyDefaultDialer) {
+            val intent: Intent = Intent(TelecomManager.ACTION_CHANGE_DEFAULT_DIALER)
+                .putExtra(
+                    TelecomManager.EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME,
+                    context.packageName
+                )
+            context.startActivity(intent)
+        }
+    }
+
+    private fun playToneForDigit(digit: String) {
+        val numericDigit = when (digit) {
+            "0" -> ToneGenerator.TONE_DTMF_0
+            "1" -> ToneGenerator.TONE_DTMF_1
+            "2" -> ToneGenerator.TONE_DTMF_2
+            "3" -> ToneGenerator.TONE_DTMF_3
+            "4" -> ToneGenerator.TONE_DTMF_4
+            "5" -> ToneGenerator.TONE_DTMF_5
+            "6" -> ToneGenerator.TONE_DTMF_6
+            "7" -> ToneGenerator.TONE_DTMF_7
+            "8" -> ToneGenerator.TONE_DTMF_8
+            "9" -> ToneGenerator.TONE_DTMF_9
+            "#" -> ToneGenerator.TONE_DTMF_P
+            "*" -> ToneGenerator.TONE_DTMF_S
+            else -> error("Invalid digit: $digit")
+        }
+
+        val durationMs = 100
+        toneGenerator.stopTone()
+        toneGenerator.startTone(numericDigit, durationMs)
+    }
+
+    private fun searchPhoneNumberOrName(number: String) {
+        contactsSet.clear()
+        viewModelScope.launch {
+            contactsSet.addAll(phoneLookupRepository.getContactsWithNumber(number))
+            _contacts.update {
+                contactsSet.toList()
+            }
+        }
+        if (number.length < 5) {
+            // search by name only if number is less than 5 digits to avoid performance issues
+            viewModelScope.launch {
+                contactsSet.addAll(getContactsByDigitPattern(number))
+                _contacts.update {
+                    contactsSet.toList()
+                }
+            }
+        }
+    }
+
+    private suspend fun getContactsByDigitPattern(number: String): List<BasicContactData> =
+        withContext(Dispatchers.IO) {
+            val contacts = mutableListOf<BasicContactData>()
+            val namePatterns = letterCombinations(number)
+            namePatterns.forEach {
+                val contact = phoneLookupRepository.getContactsWithName(it)
+                contacts += contact
+            }
+            contacts
+        }
+
+    companion object {
+        val phonePerms = arrayOf(
+            Manifest.permission.CALL_PHONE,
+            Manifest.permission.READ_PHONE_STATE
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/ui/screens/SingleContactScreen.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/contact/SingleContactScreen.kt
similarity index 60%
rename from app/src/main/java/com/bnyro/contacts/ui/screens/SingleContactScreen.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/contact/SingleContactScreen.kt
index eec4abea..7ae0b2c3 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/screens/SingleContactScreen.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/contact/SingleContactScreen.kt
@@ -1,12 +1,13 @@
-package com.bnyro.contacts.ui.screens
+package com.bnyro.contacts.presentation.screens.contact
 
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.launch
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -19,11 +20,14 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.Call
-import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material.icons.filled.Message
 import androidx.compose.material.icons.filled.Share
-import androidx.compose.material.icons.filled.Shortcut
+import androidx.compose.material.icons.filled.Star
+import androidx.compose.material.icons.filled.StarOutline
+import androidx.compose.material.icons.rounded.MoreVert
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
@@ -33,6 +37,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -45,47 +50,58 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.lifecycle.viewmodel.compose.viewModel
 import com.bnyro.contacts.R
-import com.bnyro.contacts.enums.IntentActionType
-import com.bnyro.contacts.obj.ContactData
-import com.bnyro.contacts.obj.ValueWithType
-import com.bnyro.contacts.ui.components.ContactEntryGroup
-import com.bnyro.contacts.ui.components.ContactEntryTextGroup
-import com.bnyro.contacts.ui.components.ContactProfilePicture
-import com.bnyro.contacts.ui.components.ShareDialog
-import com.bnyro.contacts.ui.components.base.ClickableIcon
-import com.bnyro.contacts.ui.components.base.FullScreenDialog
-import com.bnyro.contacts.ui.components.base.LargeButtonWithIcon
-import com.bnyro.contacts.ui.components.base.SmallButtonWithIcon
-import com.bnyro.contacts.ui.components.dialogs.ConfirmationDialog
-import com.bnyro.contacts.ui.components.dialogs.ShortcutDialog
-import com.bnyro.contacts.ui.components.shapes.curlyCornerShape
-import com.bnyro.contacts.ui.models.ContactsModel
-import com.bnyro.contacts.util.CalendarUtils
+import com.bnyro.contacts.domain.enums.IntentActionType
+import com.bnyro.contacts.domain.enums.ListAttribute
+import com.bnyro.contacts.domain.enums.Notes
+import com.bnyro.contacts.domain.enums.StringAttribute
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.presentation.components.ClickableIcon
+import com.bnyro.contacts.presentation.components.FullScreenDialog
+import com.bnyro.contacts.presentation.components.LargeButtonWithIcon
+import com.bnyro.contacts.presentation.components.SmallButtonWithIcon
+import com.bnyro.contacts.presentation.components.shapes.curlyCornerShape
+import com.bnyro.contacts.presentation.features.ConfirmationDialog
+import com.bnyro.contacts.presentation.features.ShareDialog
+import com.bnyro.contacts.presentation.features.ShortcutDialog
+import com.bnyro.contacts.presentation.screens.contact.components.ContactProfilePicture
+import com.bnyro.contacts.presentation.screens.contacts.model.ContactsModel
+import com.bnyro.contacts.presentation.screens.editor.EditorScreen
+import com.bnyro.contacts.presentation.screens.editor.components.ContactEntryGroup
+import com.bnyro.contacts.presentation.screens.editor.components.ContactEntryTextGroup
 import com.bnyro.contacts.util.ContactsHelper
 import com.bnyro.contacts.util.IntentHelper
+import com.bnyro.contacts.util.RingtonePickContract
 
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun SingleContactScreen(contact: ContactData, onClose: () -> Unit) {
-    val viewModel: ContactsModel = viewModel()
+fun SingleContactScreen(contact: ContactData, viewModel: ContactsModel, onClose: () -> Unit) {
     val context = LocalContext.current
-    var showDelete by remember {
+    var showDelete by rememberSaveable {
         mutableStateOf(false)
     }
-    var showEditor by remember {
+    var showEditor by rememberSaveable {
         mutableStateOf(false)
     }
-    var showZoomablePhoto by remember {
+    var showZoomablePhoto by rememberSaveable {
         mutableStateOf(false)
     }
-    var showShortcutDialog by remember {
+    var showShortcutDialog by rememberSaveable {
         mutableStateOf(false)
     }
-    var showShareDialog by remember {
+    var showShareDialog by rememberSaveable {
         mutableStateOf(false)
     }
+    var isFavorite by rememberSaveable {
+        mutableStateOf(contact.favorite)
+    }
+
+    val ringtonePicker =
+        rememberLauncherForActivityResult(contract = RingtonePickContract()) { uri ->
+            if (uri != null) {
+                viewModel.updateContactRingTone(contact, uri)
+            }
+        }
 
     FullScreenDialog(onClose = onClose) {
         Scaffold(
@@ -102,10 +118,12 @@ fun SingleContactScreen(contact: ContactData, onClose: () -> Unit) {
                     },
                     actions = {
                         ClickableIcon(
-                            icon = Icons.Default.Shortcut,
-                            contentDescription = R.string.create_shortcut
+                            icon = if (isFavorite) Icons.Default.Star else Icons.Default.StarOutline,
+                            contentDescription = R.string.favorite
                         ) {
-                            showShortcutDialog = true
+                            isFavorite = !isFavorite
+                            contact.favorite = isFavorite
+                            viewModel.setFavorite(context, contact, isFavorite)
                         }
                         ClickableIcon(
                             icon = Icons.Default.Edit,
@@ -113,11 +131,45 @@ fun SingleContactScreen(contact: ContactData, onClose: () -> Unit) {
                         ) {
                             showEditor = true
                         }
-                        ClickableIcon(
-                            icon = Icons.Default.Delete,
-                            contentDescription = R.string.delete
-                        ) {
-                            showDelete = true
+                        Box {
+                            var showMore by remember { mutableStateOf(false) }
+                            ClickableIcon(
+                                icon = Icons.Rounded.MoreVert,
+                                contentDescription = R.string.more
+                            ) {
+                                showMore = !showMore
+                            }
+                            DropdownMenu(
+                                expanded = showMore,
+                                onDismissRequest = {
+                                    showMore = false
+                                }
+                            ) {
+                                DropdownMenuItem(
+                                    text = {
+                                        Text(text = stringResource(R.string.change_ringtone))
+                                    },
+                                    onClick = {
+                                        ringtonePicker.launch()
+                                    }
+                                )
+                                DropdownMenuItem(
+                                    text = {
+                                        Text(text = stringResource(R.string.create_shortcut))
+                                    },
+                                    onClick = {
+                                        showShortcutDialog = true
+                                    }
+                                )
+                                DropdownMenuItem(
+                                    text = {
+                                        Text(text = stringResource(R.string.delete_contact))
+                                    },
+                                    onClick = {
+                                        showDelete = true
+                                    }
+                                )
+                            }
                         }
                     }
                 )
@@ -214,63 +266,26 @@ fun SingleContactScreen(contact: ContactData, onClose: () -> Unit) {
                     }
                 }
 
-                ContactEntryTextGroup(
-                    label = stringResource(R.string.nick_name),
-                    entries = listOfNotNull(contact.nickName)
-                )
-
-                ContactEntryTextGroup(
-                    label = stringResource(R.string.organization),
-                    entries = listOfNotNull(contact.organization)
-                )
-
-                ContactEntryGroup(
-                    label = stringResource(R.string.website),
-                    entries = contact.websites
-                ) {
-                    IntentHelper.launchAction(context, IntentActionType.WEBSITE, it.value)
-                }
-
-                ContactEntryGroup(
-                    label = stringResource(R.string.phone),
-                    entries = contact.numbers.map {
-                        ValueWithType(ContactsHelper.normalizePhoneNumber(it.value), it.type)
-                    },
-                    types = ContactsHelper.phoneNumberTypes
-                ) {
-                    IntentHelper.launchAction(context, IntentActionType.DIAL, it.value)
-                }
-
-                ContactEntryGroup(
-                    label = stringResource(R.string.email),
-                    entries = contact.emails,
-                    types = ContactsHelper.emailTypes
-                ) {
-                    IntentHelper.launchAction(context, IntentActionType.EMAIL, it.value)
-                }
-
-                ContactEntryGroup(
-                    label = stringResource(R.string.address),
-                    entries = contact.addresses,
-                    types = ContactsHelper.addressTypes
-                ) {
-                    IntentHelper.launchAction(context, IntentActionType.ADDRESS, it.value)
+                for (attributesType in ContactsHelper.contactAttributesTypes) {
+                    if (attributesType is StringAttribute) {
+                        ContactEntryTextGroup(
+                            label = stringResource(attributesType.stringRes),
+                            entries = listOfNotNull(attributesType.display(contact))
+                        )
+                    } else if (attributesType is ListAttribute) {
+                        ContactEntryGroup(
+                            label = stringResource(attributesType.stringRes),
+                            entries = attributesType.display(contact),
+                            types = attributesType.types,
+                            useMarkdown = attributesType is Notes
+                        ) {
+                            attributesType.intentActionType?.let { intentActionType ->
+                                IntentHelper.launchAction(context, intentActionType, it.value)
+                            }
+                        }
+                    }
                 }
 
-                ContactEntryGroup(
-                    label = stringResource(R.string.event),
-                    entries = contact.events.map {
-                        ValueWithType(CalendarUtils.localizeIsoDate(it.value), it.type)
-                    },
-                    types = ContactsHelper.eventTypes
-                )
-
-                ContactEntryGroup(
-                    label = stringResource(R.string.note),
-                    entries = contact.notes,
-                    useMarkdown = true
-                )
-
                 ContactEntryTextGroup(
                     label = stringResource(R.string.groups),
                     entries = contact.groups.map { it.title }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/ContactProfilePicture.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/contact/components/ContactProfilePicture.kt
similarity index 81%
rename from app/src/main/java/com/bnyro/contacts/ui/components/ContactProfilePicture.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/contact/components/ContactProfilePicture.kt
index cb4e0801..b6cffb41 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/ContactProfilePicture.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/contact/components/ContactProfilePicture.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components
+package com.bnyro.contacts.presentation.screens.contact.components
 
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
@@ -10,10 +10,10 @@ import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import com.bnyro.contacts.R
-import com.bnyro.contacts.obj.ContactData
-import com.bnyro.contacts.ui.components.base.ClickableIcon
-import com.bnyro.contacts.ui.components.base.FullScreenDialog
-import com.bnyro.contacts.ui.components.base.ZoomableImage
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.presentation.components.ClickableIcon
+import com.bnyro.contacts.presentation.components.FullScreenDialog
+import com.bnyro.contacts.presentation.components.ZoomableImage
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/com/bnyro/contacts/ui/screens/ContactsScreen.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/contacts/ContactsScreen.kt
similarity index 85%
rename from app/src/main/java/com/bnyro/contacts/ui/screens/ContactsScreen.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/contacts/ContactsScreen.kt
index 4074fbe3..296568a9 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/screens/ContactsScreen.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/contacts/ContactsScreen.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.screens
+package com.bnyro.contacts.presentation.screens.contacts
 
 import androidx.activity.compose.BackHandler
 import androidx.activity.compose.rememberLauncherForActivityResult
@@ -37,6 +37,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -46,25 +47,29 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.bnyro.contacts.R
-import com.bnyro.contacts.enums.ContactsSource
-import com.bnyro.contacts.obj.ContactData
-import com.bnyro.contacts.obj.FilterOptions
-import com.bnyro.contacts.ui.components.ContactsList
-import com.bnyro.contacts.ui.components.NothingHere
-import com.bnyro.contacts.ui.components.TopBarMoreMenu
-import com.bnyro.contacts.ui.components.base.ClickableIcon
-import com.bnyro.contacts.ui.components.dialogs.ConfirmationDialog
-import com.bnyro.contacts.ui.components.dialogs.FilterDialog
-import com.bnyro.contacts.ui.components.dialogs.SimImportDialog
-import com.bnyro.contacts.ui.models.ContactsModel
-import com.bnyro.contacts.ui.models.state.ContactListState
+import com.bnyro.contacts.domain.enums.ContactsSource
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.domain.model.FilterOptions
+import com.bnyro.contacts.navigation.NavRoutes
+import com.bnyro.contacts.presentation.components.ClickableIcon
+import com.bnyro.contacts.presentation.components.NothingHere
+import com.bnyro.contacts.presentation.components.TopBarMoreMenu
+import com.bnyro.contacts.presentation.features.ConfirmationDialog
+import com.bnyro.contacts.presentation.features.FilterDialog
+import com.bnyro.contacts.presentation.features.SimImportDialog
+import com.bnyro.contacts.presentation.screens.contacts.components.ContactSearchScreen
+import com.bnyro.contacts.presentation.screens.contacts.components.ContactsList
+import com.bnyro.contacts.presentation.screens.contacts.model.ContactsModel
+import com.bnyro.contacts.presentation.screens.contacts.model.state.ContactListState
+import com.bnyro.contacts.presentation.screens.editor.EditorScreen
 import com.bnyro.contacts.util.BackupHelper
 import com.bnyro.contacts.util.Preferences
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ContactsPage(
-    scrollConnection: NestedScrollConnection?
+    scrollConnection: NestedScrollConnection?,
+    onNavigate: (NavRoutes) -> Unit
 ) {
     val viewModel: ContactsModel = viewModel(factory = ContactsModel.Factory)
     val context = LocalContext.current
@@ -77,11 +82,11 @@ fun ContactsPage(
         mutableStateOf(viewModel.initialContactData)
     }
 
-    var showEditorScreen by remember {
+    var showEditorScreen by rememberSaveable {
         mutableStateOf(false)
     }
 
-    var showDelete by remember {
+    var showDelete by rememberSaveable {
         mutableStateOf(false)
     }
 
@@ -89,15 +94,15 @@ fun ContactsPage(
         mutableStateOf(FilterOptions.default())
     }
 
-    var showSearch by remember {
+    var showSearch by rememberSaveable {
         mutableStateOf(false)
     }
 
-    var showFilterDialog by remember {
+    var showFilterDialog by rememberSaveable {
         mutableStateOf(false)
     }
 
-    var showImportSimDialog by remember {
+    var showImportSimDialog by rememberSaveable {
         mutableStateOf(false)
     }
 
@@ -139,7 +144,8 @@ fun ContactsPage(
                     true -> {
                         TopAppBar(
                             title = {
-                                var expanded by remember { mutableStateOf(false) }
+                                var expanded by rememberSaveable { mutableStateOf(false) }
+
                                 Row(
                                     Modifier
                                         .padding(8.dp)
@@ -163,7 +169,7 @@ fun ContactsPage(
                                     expanded = expanded,
                                     onDismissRequest = { expanded = false }
                                 ) {
-                                    ContactsSource.values().forEachIndexed { index, source ->
+                                    ContactsSource.entries.forEachIndexed { index, source ->
                                         DropdownMenuItem(
                                             text = { Text(stringResource(id = source.stringRes)) },
                                             onClick = {
@@ -194,24 +200,34 @@ fun ContactsPage(
                                     showFilterDialog = true
                                 }
                                 TopBarMoreMenu(
-                                    extraOptions = listOf(
+                                    options = listOf(
                                         stringResource(R.string.import_vcf),
                                         stringResource(R.string.export_vcf),
-                                        stringResource(R.string.import_sim)
+                                        stringResource(R.string.import_sim),
+                                        stringResource(R.string.settings),
+                                        stringResource(R.string.about)
                                     ),
-                                    onExtraOptionClick = { index ->
+                                    onOptionClick = { index ->
                                         when (index) {
                                             0 -> {
                                                 importVcard.launch(BackupHelper.openMimeTypes)
                                             }
 
                                             1 -> {
-                                                exportVcard.launch(BackupHelper.backupFileName)
+                                                exportVcard.launch(BackupHelper.defaultBackupFileName)
                                             }
 
                                             2 -> {
                                                 showImportSimDialog = true
                                             }
+
+                                            3 -> {
+                                                onNavigate.invoke(NavRoutes.Settings)
+                                            }
+
+                                            4 -> {
+                                                onNavigate.invoke(NavRoutes.About)
+                                            }
                                         }
                                     }
                                 )
@@ -355,6 +371,7 @@ fun ContactsPage(
                 Preferences.edit {
                     putInt(Preferences.sortOrderKey, it.sortOder.ordinal)
                     putStringSet(Preferences.hiddenAccountsKey, it.hiddenAccountIdentifiers.toSet())
+                    putBoolean(Preferences.favoritesOnlyKey, it.favoritesOnly)
                 }
                 filterOptions = it
             },
@@ -369,9 +386,4 @@ fun ContactsPage(
             showImportSimDialog = false
         }
     }
-    viewModel.initialContactData?.let {
-        SingleContactScreen(it) {
-            viewModel.initialContactData = null
-        }
-    }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/ContactItem.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/contacts/components/ContactItem.kt
similarity index 57%
rename from app/src/main/java/com/bnyro/contacts/ui/components/ContactItem.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/contacts/components/ContactItem.kt
index d8538190..b555891a 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/ContactItem.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/contacts/components/ContactItem.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components
+package com.bnyro.contacts.presentation.screens.contacts.components
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
@@ -24,23 +24,21 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
-import com.bnyro.contacts.enums.SortOrder
-import com.bnyro.contacts.ext.contentColor
-import com.bnyro.contacts.obj.ContactData
-import com.bnyro.contacts.ui.models.ContactsModel
-import com.bnyro.contacts.ui.models.ThemeModel
-import com.bnyro.contacts.ui.screens.SingleContactScreen
-import com.bnyro.contacts.util.ColorUtils
+import com.bnyro.contacts.domain.enums.SortOrder
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.presentation.screens.contact.SingleContactScreen
+import com.bnyro.contacts.presentation.screens.contacts.model.ContactsModel
+import com.bnyro.contacts.presentation.screens.editor.components.ContactIconPlaceholder
+import com.bnyro.contacts.presentation.screens.settings.model.ThemeModel
 import kotlinx.coroutines.runBlocking
 
 @OptIn(ExperimentalFoundationApi::class)
@@ -57,7 +55,7 @@ fun ContactItem(
     val viewModel: ContactsModel = viewModel(factory = ContactsModel.Factory)
     val themeModel: ThemeModel = viewModel()
 
-    var showContactScreen by remember {
+    var showContactScreen by rememberSaveable {
         mutableStateOf(false)
     }
 
@@ -84,49 +82,39 @@ fun ContactItem(
                 .fillMaxWidth(),
             verticalAlignment = Alignment.CenterVertically
         ) {
-            val backgroundColor = if (themeModel.colorfulIcons) {
-                remember { Color(ColorUtils.getRandomColor()) }
-            } else {
-                MaterialTheme.colorScheme.primary
-            }
-            val contentColor = when {
-                !themeModel.colorfulIcons -> MaterialTheme.colorScheme.onPrimary
-                else -> backgroundColor.contentColor()
-            }
-
-            Box(
-                modifier = Modifier
-                    .size(42.dp)
-                    .background(
-                        shape = CircleShape,
-                        color = backgroundColor
-                    )
-            ) {
-                val thumbnail = contact.thumbnail ?: contact.photo
-                if (selected) {
-                    Icon(
-                        modifier = Modifier.align(Alignment.Center),
-                        imageVector = Icons.Default.Check,
-                        contentDescription = null,
-                        tint = contentColor
-                    )
-                } else if (thumbnail == null) {
-                    Text(
-                        modifier = Modifier.align(Alignment.Center),
-                        text = (contactName.firstOrNull() ?: "").toString(),
-                        color = contentColor,
-                        fontWeight = FontWeight.Bold
-                    )
-                } else {
-                    Image(
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .clip(CircleShape),
-                        bitmap = thumbnail.asImageBitmap(),
-                        contentDescription = null,
-                        contentScale = ContentScale.Crop
-                    )
+            val thumbnail = contact.thumbnail ?: contact.photo
+            if (selected || thumbnail != null) {
+                Box(
+                    modifier = Modifier
+                        .size(42.dp)
+                        .background(
+                            shape = CircleShape,
+                            color = MaterialTheme.colorScheme.primary
+                        )
+                ) {
+                    if (selected) {
+                        Icon(
+                            modifier = Modifier.align(Alignment.Center),
+                            imageVector = Icons.Default.Check,
+                            contentDescription = null,
+                            tint = MaterialTheme.colorScheme.onPrimary
+                        )
+                    } else if (thumbnail != null) {
+                        Image(
+                            modifier = Modifier
+                                .fillMaxSize()
+                                .clip(CircleShape),
+                            bitmap = thumbnail.asImageBitmap(),
+                            contentDescription = null,
+                            contentScale = ContentScale.Crop
+                        )
+                    }
                 }
+            } else {
+                ContactIconPlaceholder(
+                    themeModel = themeModel,
+                    firstChar = contactName.firstOrNull(),
+                )
             }
             Spacer(modifier = Modifier.width(20.dp))
             Text(contactName)
@@ -137,7 +125,7 @@ fun ContactItem(
         val data = runBlocking {
             viewModel.loadAdvancedContactData(contact)
         }
-        SingleContactScreen(data) {
+        SingleContactScreen(data, viewModel) {
             showContactScreen = false
         }
     }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/screens/ContactSearchScreen.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/contacts/components/ContactSearchScreen.kt
similarity index 89%
rename from app/src/main/java/com/bnyro/contacts/ui/screens/ContactSearchScreen.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/contacts/components/ContactSearchScreen.kt
index b9d154f9..7c01e61c 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/screens/ContactSearchScreen.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/contacts/components/ContactSearchScreen.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.screens
+package com.bnyro.contacts.presentation.screens.contacts.components
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
@@ -18,11 +18,10 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.unit.dp
 import com.bnyro.contacts.R
-import com.bnyro.contacts.obj.ContactData
-import com.bnyro.contacts.obj.FilterOptions
-import com.bnyro.contacts.ui.components.ContactsList
-import com.bnyro.contacts.ui.components.base.ElevatedTextInputField
-import com.bnyro.contacts.ui.components.base.FullScreenDialog
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.domain.model.FilterOptions
+import com.bnyro.contacts.presentation.components.ElevatedTextInputField
+import com.bnyro.contacts.presentation.components.FullScreenDialog
 import com.bnyro.contacts.util.ContactsHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/ContactsList.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/contacts/components/ContactsList.kt
similarity index 86%
rename from app/src/main/java/com/bnyro/contacts/ui/components/ContactsList.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/contacts/components/ContactsList.kt
index 86fd3d88..8dde187b 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/ContactsList.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/contacts/components/ContactsList.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components
+package com.bnyro.contacts.presentation.screens.contacts.components
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.Spacer
@@ -14,8 +14,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.unit.dp
-import com.bnyro.contacts.obj.ContactData
-import com.bnyro.contacts.obj.FilterOptions
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.domain.model.FilterOptions
+import com.bnyro.contacts.presentation.components.CharacterHeader
 import my.nanihadesuka.compose.LazyColumnScrollbar
 
 @OptIn(ExperimentalFoundationApi::class)
@@ -31,13 +32,11 @@ fun ContactsList(
         contacts.asSequence().filter {
             !filterOptions.hiddenAccountIdentifiers.contains(it.accountIdentifier)
         }.filter {
-            if (filterOptions.visibleGroups.isEmpty()) {
-                true
-            } else {
-                filterOptions.visibleGroups.any { group ->
-                    it.groups.contains(group)
-                }
+            filterOptions.visibleGroups.isEmpty() || filterOptions.visibleGroups.any { group ->
+                it.groups.contains(group)
             }
+        }.filter {
+            !filterOptions.favoritesOnly || it.favorite
         }.sortedBy {
             it.getNameBySortOrder(filterOptions.sortOder)
         }.groupBy {
@@ -62,7 +61,7 @@ fun ContactsList(
                 stickyHeader {
                     CharacterHeader(firstLetter.orEmpty())
                 }
-                items(groupedContacts) {
+                items(groupedContacts, key = ContactData::contactId) {
                     ContactItem(
                         modifier = Modifier.padding(horizontal = 10.dp),
                         contact = it,
diff --git a/app/src/main/java/com/bnyro/contacts/ui/models/ContactsModel.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/contacts/model/ContactsModel.kt
similarity index 89%
rename from app/src/main/java/com/bnyro/contacts/ui/models/ContactsModel.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/contacts/model/ContactsModel.kt
index e10dff10..9da6a866 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/models/ContactsModel.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/contacts/model/ContactsModel.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.models
+package com.bnyro.contacts.presentation.screens.contacts.model
 
 import android.Manifest
 import android.annotation.SuppressLint
@@ -14,19 +14,19 @@ import androidx.lifecycle.viewmodel.initializer
 import androidx.lifecycle.viewmodel.viewModelFactory
 import com.bnyro.contacts.App
 import com.bnyro.contacts.R
-import com.bnyro.contacts.enums.ContactsSource
-import com.bnyro.contacts.ext.toast
-import com.bnyro.contacts.obj.AccountType
-import com.bnyro.contacts.obj.ContactData
-import com.bnyro.contacts.repo.ContactsRepository
-import com.bnyro.contacts.repo.DeviceContactsRepository
-import com.bnyro.contacts.repo.LocalContactsRepository
-import com.bnyro.contacts.ui.models.state.ContactListState
+import com.bnyro.contacts.domain.enums.ContactsSource
+import com.bnyro.contacts.domain.model.AccountType
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.domain.repositories.ContactsRepository
+import com.bnyro.contacts.domain.repositories.DeviceContactsRepository
+import com.bnyro.contacts.domain.repositories.LocalContactsRepository
+import com.bnyro.contacts.presentation.screens.contacts.model.state.ContactListState
 import com.bnyro.contacts.util.ContactsHelper
 import com.bnyro.contacts.util.ExportHelper
 import com.bnyro.contacts.util.IntentHelper
 import com.bnyro.contacts.util.PermissionHelper
 import com.bnyro.contacts.util.Preferences
+import com.bnyro.contacts.util.extension.toast
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
@@ -156,6 +156,13 @@ class ContactsModel(
         }
     }
 
+    fun setFavorite(context: Context, contact: ContactData, favorite: Boolean) {
+        viewModelScope.launch {
+            contactsRepository.setFavorite(contact, favorite)
+            loadContacts(context)
+        }
+    }
+
     fun copyContacts(context: Context, contacts: List<ContactData>) {
         val otherHelper = when (contactsRepository) {
             is DeviceContactsRepository -> localContactsRepository
@@ -223,6 +230,12 @@ class ContactsModel(
         }
     }
 
+    fun updateContactRingTone(contact: ContactData, uri: Uri) {
+        viewModelScope.launch {
+            deviceContactsRepository.updateContactRingTone(contact.contactId.toString(), uri)
+        }
+    }
+
     companion object {
         val Factory = viewModelFactory {
             initializer {
diff --git a/app/src/main/java/com/bnyro/contacts/ui/models/state/ContactListState.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/contacts/model/state/ContactListState.kt
similarity index 65%
rename from app/src/main/java/com/bnyro/contacts/ui/models/state/ContactListState.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/contacts/model/state/ContactListState.kt
index f6701d02..0677b3dc 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/models/state/ContactListState.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/contacts/model/state/ContactListState.kt
@@ -1,6 +1,6 @@
-package com.bnyro.contacts.ui.models.state
+package com.bnyro.contacts.presentation.screens.contacts.model.state
 
-import com.bnyro.contacts.obj.ContactData
+import com.bnyro.contacts.domain.model.ContactData
 
 sealed interface ContactListState {
     object Loading : ContactListState
diff --git a/app/src/main/java/com/bnyro/contacts/presentation/screens/dialer/DialerScreen.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/dialer/DialerScreen.kt
new file mode 100644
index 00000000..103d3cea
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/dialer/DialerScreen.kt
@@ -0,0 +1,365 @@
+package com.bnyro.contacts.presentation.screens.dialer
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.rounded.VolumeUp
+import androidx.compose.material.icons.filled.Call
+import androidx.compose.material.icons.filled.CallEnd
+import androidx.compose.material.icons.rounded.Dialpad
+import androidx.compose.material.icons.rounded.MicOff
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.FloatingActionButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import coil.compose.AsyncImage
+import com.bnyro.contacts.R
+import com.bnyro.contacts.presentation.components.DialerButton
+import com.bnyro.contacts.presentation.screens.calllog.components.NumberInput
+import com.bnyro.contacts.presentation.screens.calllog.components.PhoneNumberOnlyDisplay
+import com.bnyro.contacts.presentation.screens.dialer.model.DialerModel
+import com.bnyro.contacts.presentation.screens.dialer.model.state.CallState
+
+@Composable
+fun DialerScreen(
+    dialerModel: DialerModel
+) {
+    val callState by dialerModel.callState.collectAsState()
+    val callerInfo by dialerModel.callerInfo.collectAsState()
+
+    when (val state = callState) {
+        CallState.Incoming -> {
+            CallAlertScreen(
+                callerNumber = callerInfo.formattedPhoneNumber,
+                callerName = callerInfo.callerName,
+                callerPhoto = callerInfo.callerPhoto,
+                onAcceptCall = dialerModel.acceptCall,
+                onDeclineCall = dialerModel.cancelCall,
+            )
+        }
+
+        else -> {
+            InCallScreen(
+                callStateText = stringResource(id = state.text),
+                callerNumber = callerInfo.formattedPhoneNumber,
+                callerName = callerInfo.callerName,
+                callerPhoto = callerInfo.callerPhoto,
+                muteState = dialerModel.currentMuteState,
+                speakerState = dialerModel.currentSpeakerState,
+                onToggleMute = dialerModel::toggleMute,
+                onToggleSpeaker = dialerModel::toggleSpeakers,
+                onCancelCall = dialerModel.cancelCall,
+                dialpadNumber = dialerModel.dialpadNumber,
+                onDialpadButtonPress = dialerModel::onDialpadButtonPress,
+            )
+        }
+    }
+}
+
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
+private fun InCallScreen(
+    callStateText: String,
+    callerNumber: String,
+    callerName: String? = null,
+    callerPhoto: Any? = null,
+    muteState: Boolean,
+    speakerState: Boolean,
+    onToggleMute: () -> Unit,
+    onToggleSpeaker: () -> Unit,
+    onCancelCall: () -> Unit,
+    dialpadNumber: String,
+    onDialpadButtonPress: (String) -> Unit,
+) {
+    var showDialPad by remember { mutableStateOf(false) }
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(MaterialTheme.colorScheme.surfaceContainerLow),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        Spacer(modifier = Modifier.height(50.dp))
+        Box(
+            modifier = Modifier
+                .size(150.dp)
+                .background(
+                    shape = CircleShape,
+                    color = MaterialTheme.colorScheme.surfaceVariant
+                )
+        ) {
+            if (callerPhoto == null) {
+                Image(
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .clip(CircleShape),
+                    contentScale = ContentScale.Fit,
+                    painter = painterResource(id = R.drawable.ic_person),
+                    contentDescription = null,
+                    colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurfaceVariant)
+                )
+            } else {
+                AsyncImage(
+                    callerPhoto,
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .clip(CircleShape),
+                    contentDescription = null,
+                    contentScale = ContentScale.Crop
+                )
+            }
+        }
+
+        Spacer(modifier = Modifier.height(40.dp))
+        Text(
+            text = callStateText,
+            color = MaterialTheme.colorScheme.primary,
+            fontSize = 16.sp
+        )
+        Spacer(modifier = Modifier.height(10.dp))
+        Text(
+            text = callerName ?: callerNumber,
+            color = MaterialTheme.colorScheme.secondary,
+            fontWeight = FontWeight.Medium,
+            fontSize = 24.sp
+        )
+        if (callerName != null) {
+            Spacer(modifier = Modifier.height(10.dp))
+            Text(
+                text = callerNumber,
+                color = MaterialTheme.colorScheme.secondary,
+                fontFamily = FontFamily.Monospace,
+                fontSize = 24.sp
+            )
+        }
+        Spacer(modifier = Modifier.weight(1f))
+        LazyVerticalGrid(
+            columns = GridCells.Fixed(3),
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(vertical = 32.dp)
+        ) {
+            item {
+                DialerButton(
+                    isEnabled = muteState,
+                    icon = Icons.Rounded.MicOff,
+                    hint = stringResource(R.string.mute)
+                ) {
+                    onToggleMute.invoke()
+                }
+            }
+            item {
+                DialerButton(
+                    isEnabled = speakerState,
+                    icon = Icons.AutoMirrored.Rounded.VolumeUp,
+                    hint = stringResource(R.string.speakers)
+                ) {
+                    onToggleSpeaker.invoke()
+                }
+            }
+            item {
+                DialerButton(
+                    isEnabled = showDialPad,
+                    icon = Icons.Rounded.Dialpad,
+                    hint = stringResource(R.string.key_pad)
+                ) {
+                    showDialPad = true
+                }
+            }
+
+        }
+        FloatingActionButton(
+            onClick = onCancelCall,
+            containerColor = MaterialTheme.colorScheme.error,
+            contentColor = MaterialTheme.colorScheme.onError,
+            shape = RoundedCornerShape(50),
+            elevation = FloatingActionButtonDefaults.elevation(
+                0.dp, 0.dp, 0.dp, 0.dp
+            )
+        ) {
+            Icon(Icons.Default.CallEnd, contentDescription = null)
+        }
+        Spacer(modifier = Modifier.height(50.dp))
+    }
+
+    if (showDialPad) {
+        val state = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+        ModalBottomSheet(onDismissRequest = { showDialPad = false }, sheetState = state) {
+            Column(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 8.dp),
+                horizontalAlignment = Alignment.CenterHorizontally
+            ) {
+                PhoneNumberOnlyDisplay(displayText = dialpadNumber)
+                NumberInput(
+                    onNumberInput = onDialpadButtonPress
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun CallAlertScreen(
+    callerNumber: String,
+    callerName: String? = null,
+    callerPhoto: Any? = null,
+    onAcceptCall: () -> Unit,
+    onDeclineCall: () -> Unit
+) {
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(MaterialTheme.colorScheme.surfaceContainerLow),
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Spacer(modifier = Modifier.height(50.dp))
+        Text(
+            text = stringResource(R.string.call_from),
+            color = MaterialTheme.colorScheme.outline,
+            fontSize = 24.sp
+        )
+        Spacer(modifier = Modifier.height(40.dp))
+        Box(
+            modifier = Modifier
+                .size(250.dp)
+                .background(
+                    shape = CircleShape,
+                    color = MaterialTheme.colorScheme.surfaceVariant
+                )
+        ) {
+            if (callerPhoto == null) {
+                Image(
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .clip(CircleShape),
+                    contentScale = ContentScale.Fit,
+                    painter = painterResource(id = R.drawable.ic_person),
+                    contentDescription = null,
+                    colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurfaceVariant)
+                )
+            } else {
+                AsyncImage(
+                    callerPhoto,
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .clip(CircleShape),
+                    contentDescription = null,
+                    contentScale = ContentScale.Crop
+                )
+            }
+        }
+        Spacer(modifier = Modifier.height(40.dp))
+        Text(
+            text = callerName ?: callerNumber,
+            color = MaterialTheme.colorScheme.secondary,
+            fontWeight = FontWeight.Medium,
+            fontSize = 24.sp
+        )
+        if (callerName != null) {
+            Spacer(modifier = Modifier.height(10.dp))
+            Text(
+                text = callerNumber,
+                color = MaterialTheme.colorScheme.secondary,
+                fontFamily = FontFamily.Monospace,
+                fontSize = 24.sp
+            )
+        }
+        Spacer(modifier = Modifier.weight(1f))
+        Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceEvenly) {
+            FloatingActionButton(
+                onClick = onAcceptCall,
+                containerColor = Color(0xFF348540),
+                contentColor = Color.White,
+                shape = RoundedCornerShape(50),
+                elevation = FloatingActionButtonDefaults.elevation(
+                    0.dp, 0.dp, 0.dp, 0.dp
+                )
+            ) {
+                Icon(Icons.Default.Call, contentDescription = null)
+            }
+
+            FloatingActionButton(
+                onClick = onDeclineCall,
+                containerColor = MaterialTheme.colorScheme.error,
+                contentColor = MaterialTheme.colorScheme.onError,
+                shape = RoundedCornerShape(50),
+                elevation = FloatingActionButtonDefaults.elevation(
+                    0.dp, 0.dp, 0.dp, 0.dp
+                )
+            ) {
+                Icon(Icons.Default.CallEnd, contentDescription = null)
+            }
+        }
+        Spacer(modifier = Modifier.height(50.dp))
+    }
+}
+
+@Preview
+@Composable
+private fun InCallScreenPreview() {
+    InCallScreen(
+        callStateText = "Connecting..",
+        callerNumber = "1234567890",
+        callerName = "Test Caller",
+        callerPhoto = null,
+        muteState = false,
+        speakerState = false,
+        onToggleMute = {},
+        onToggleSpeaker = {},
+        onCancelCall = {},
+        dialpadNumber = "",
+        onDialpadButtonPress = {}
+    )
+}
+
+@Preview
+@Composable
+private fun CallAlertScreenPreview() {
+    CallAlertScreen(
+        callerNumber = "1234567890",
+        callerName = "Test Caller",
+        callerPhoto = null,
+        onAcceptCall = {},
+        onDeclineCall = {}
+    )
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/presentation/screens/dialer/model/DialerModel.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/dialer/model/DialerModel.kt
new file mode 100644
index 00000000..911e175a
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/dialer/model/DialerModel.kt
@@ -0,0 +1,63 @@
+package com.bnyro.contacts.presentation.screens.dialer.model
+
+import android.app.Application
+import android.media.AudioManager
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.lifecycle.AndroidViewModel
+import com.bnyro.contacts.domain.model.CallerInfo
+import com.bnyro.contacts.presentation.screens.dialer.model.state.CallState
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+
+class DialerModel(application: Application) : AndroidViewModel(application) {
+    private val audioManager =
+        application.applicationContext.getSystemService(AudioManager::class.java)
+
+    var currentMuteState by mutableStateOf(false)
+    var currentSpeakerState by mutableStateOf(false)
+
+    var playDtmfTone: (digit: Char) -> Unit = {}
+    var acceptCall: () -> Unit = {}
+    var cancelCall: () -> Unit = {}
+
+    private val _callState = MutableStateFlow<CallState>(CallState.Disconnected)
+    val callState = _callState.asStateFlow()
+
+    private val _callerInfo = MutableStateFlow(CallerInfo())
+    val callerInfo = _callerInfo.asStateFlow()
+
+
+    var dialpadNumber by mutableStateOf("")
+        private set
+
+    fun onState(state: CallState) {
+        _callState.update {
+            state
+        }
+    }
+
+    fun onCallerInfoUpdate(info: CallerInfo) {
+        _callerInfo.update {
+            info
+        }
+    }
+
+    fun onDialpadButtonPress(digit: String) {
+        dialpadNumber += digit
+        playDtmfTone(digit.first())
+
+    }
+
+    fun toggleMute() {
+        audioManager.isMicrophoneMute = !currentMuteState
+        currentMuteState = !currentMuteState
+    }
+
+    fun toggleSpeakers() {
+        audioManager.isSpeakerphoneOn = !currentSpeakerState
+        currentSpeakerState = !currentSpeakerState
+    }
+}
diff --git a/app/src/main/java/com/bnyro/contacts/presentation/screens/dialer/model/state/CallState.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/dialer/model/state/CallState.kt
new file mode 100644
index 00000000..ce79cc4b
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/dialer/model/state/CallState.kt
@@ -0,0 +1,13 @@
+package com.bnyro.contacts.presentation.screens.dialer.model.state
+
+import androidx.annotation.StringRes
+import com.bnyro.contacts.R
+
+sealed class CallState(@StringRes val text: Int) {
+    object Disconnected : CallState(R.string.call_ended)
+    object Incoming : CallState(R.string.ringing)
+    object Outgoing : CallState(R.string.dialing)
+    object InCall : CallState(R.string.in_progress)
+    object Connecting : CallState(R.string.connecting)
+    object Disconnecting : CallState(R.string.disconnecting)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/ui/screens/EditorScreen.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/editor/EditorScreen.kt
similarity index 90%
rename from app/src/main/java/com/bnyro/contacts/ui/screens/EditorScreen.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/editor/EditorScreen.kt
index 685b9391..31d84171 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/screens/EditorScreen.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/editor/EditorScreen.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.screens
+package com.bnyro.contacts.presentation.screens.editor
 
 import android.view.ViewTreeObserver
 import android.widget.Toast
@@ -17,9 +17,9 @@ import androidx.compose.ui.platform.LocalView
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import com.bnyro.contacts.R
-import com.bnyro.contacts.obj.ContactData
-import com.bnyro.contacts.ui.components.ContactEditor
-import com.bnyro.contacts.ui.components.base.FullScreenDialog
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.presentation.components.FullScreenDialog
+import com.bnyro.contacts.presentation.screens.editor.components.ContactEditor
 import com.bnyro.contacts.util.ContactsHelper
 
 @Composable
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/ContactEditor.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/editor/components/ContactEditor.kt
similarity index 93%
rename from app/src/main/java/com/bnyro/contacts/ui/components/ContactEditor.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/editor/components/ContactEditor.kt
index e8da8e1d..4a6f89c3 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/ContactEditor.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/editor/components/ContactEditor.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components
+package com.bnyro.contacts.presentation.screens.editor.components
 
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.PickVisualMediaRequest
@@ -64,14 +64,12 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.bnyro.contacts.R
-import com.bnyro.contacts.obj.AccountType
-import com.bnyro.contacts.obj.ContactData
-import com.bnyro.contacts.obj.ValueWithType
-import com.bnyro.contacts.ui.components.base.LabeledTextField
-import com.bnyro.contacts.ui.components.dialogs.GroupsDialog
-import com.bnyro.contacts.ui.components.editor.EventFieldGroup
-import com.bnyro.contacts.ui.components.editor.TextFieldGroup
-import com.bnyro.contacts.ui.models.ContactsModel
+import com.bnyro.contacts.domain.model.AccountType
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.domain.model.ValueWithType
+import com.bnyro.contacts.presentation.components.LabeledTextField
+import com.bnyro.contacts.presentation.features.GroupsDialog
+import com.bnyro.contacts.presentation.screens.contacts.model.ContactsModel
 import com.bnyro.contacts.util.ContactsHelper
 import com.bnyro.contacts.util.ImageHelper
 import com.bnyro.contacts.util.Preferences
@@ -119,6 +117,10 @@ fun ContactEditor(
         mutableStateOf(contact?.nickName.orEmpty())
     }
 
+    val title = remember {
+        mutableStateOf(contact?.title.orEmpty())
+    }
+
     val organization = remember {
         mutableStateOf(contact?.organization.orEmpty())
     }
@@ -186,6 +188,7 @@ fun ContactEditor(
                         it.surName = surName.value.trim()
                         it.nickName = nickName.value.takeIf { n -> n.isNotBlank() }?.trim()
                         it.organization = organization.value.takeIf { o -> o.isNotBlank() }?.trim()
+                        it.title = title.value.takeIf { o -> o.isNotBlank() }?.trim()
                         it.displayName = "${firstName.value.trim()} ${surName.value.trim()}"
                         it.photo = profilePicture
                         it.accountType = selectedAccount.type
@@ -341,9 +344,20 @@ fun ContactEditor(
                             )
                         }
                     )
+                    LabeledTextField(
+                        label = R.string.title,
+                        state = title,
+                        leadingIcon = {
+                            Icon(
+                                imageVector = Icons.Outlined.Cases,
+                                contentDescription = null
+                            )
+                        }
+                    )
                     TextFieldGroup(
                         items = websites,
                         label = R.string.website,
+                        types = ContactsHelper.websiteTypes,
                         addActionText = R.string.add_website,
                         keyboardType = KeyboardType.Uri,
                         leadingIcon = Icons.Outlined.Web
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/ContactEntry.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/editor/components/ContactEntry.kt
similarity index 97%
rename from app/src/main/java/com/bnyro/contacts/ui/components/ContactEntry.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/editor/components/ContactEntry.kt
index 394d29a8..d2eb1b2f 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/ContactEntry.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/editor/components/ContactEntry.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components
+package com.bnyro.contacts.presentation.screens.editor.components
 
 import androidx.annotation.StringRes
 import androidx.compose.foundation.ExperimentalFoundationApi
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/ContactEntryGroup.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/editor/components/ContactEntryGroup.kt
similarity index 85%
rename from app/src/main/java/com/bnyro/contacts/ui/components/ContactEntryGroup.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/editor/components/ContactEntryGroup.kt
index 6078a194..42a043a3 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/ContactEntryGroup.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/editor/components/ContactEntryGroup.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components
+package com.bnyro.contacts.presentation.screens.editor.components
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
@@ -8,8 +8,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.bnyro.contacts.obj.TranslatedType
-import com.bnyro.contacts.obj.ValueWithType
+import com.bnyro.contacts.domain.model.TranslatedType
+import com.bnyro.contacts.domain.model.ValueWithType
 
 @Composable
 fun ContactEntryGroup(
@@ -48,13 +48,13 @@ fun ContactEntryTextGroup(
     label: String,
     entries: List<String>,
     types: List<TranslatedType> = listOf(),
-    onClick: (ValueWithType) -> Unit = {}
+    onClick: (String) -> Unit = {}
 ) {
     ContactEntryGroup(
         label,
         entries.map { ValueWithType(it, null) },
         types,
         false,
-        onClick
+        onClick = { onClick.invoke(it.value) }
     )
 }
diff --git a/app/src/main/java/com/bnyro/contacts/presentation/screens/editor/components/ContactIconPlaceholder.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/editor/components/ContactIconPlaceholder.kt
new file mode 100644
index 00000000..7890b90c
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/editor/components/ContactIconPlaceholder.kt
@@ -0,0 +1,45 @@
+package com.bnyro.contacts.presentation.screens.editor.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import com.bnyro.contacts.presentation.screens.settings.model.ThemeModel
+import com.bnyro.contacts.util.ColorUtils
+
+@Composable
+fun ContactIconPlaceholder(
+    themeModel: ThemeModel,
+    firstChar: Char?
+) {
+    val container = MaterialTheme.colorScheme.secondaryContainer
+    val onContainer = MaterialTheme.colorScheme.onSecondaryContainer
+    val color = when (themeModel.colorfulIcons) {
+        true -> remember { ColorUtils.getRandomMaterialColorPair(container, onContainer) }
+        false -> container to onContainer
+    }
+
+    Box(
+        modifier = Modifier
+            .size(42.dp)
+            .background(
+                shape = CircleShape,
+                color = color.first
+            )
+    ) {
+        Text(
+            modifier = Modifier.align(Alignment.Center),
+            text = firstChar?.toString() ?: "?",
+            color = color.second,
+            fontWeight = FontWeight.Bold
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/editor/DatePickerEditor.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/editor/components/DatePickerEditor.kt
similarity index 96%
rename from app/src/main/java/com/bnyro/contacts/ui/components/editor/DatePickerEditor.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/editor/components/DatePickerEditor.kt
index 0a4433a6..443d4b26 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/editor/DatePickerEditor.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/editor/components/DatePickerEditor.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components.editor
+package com.bnyro.contacts.presentation.screens.editor.components
 
 import androidx.annotation.StringRes
 import androidx.compose.foundation.background
@@ -40,9 +40,9 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.bnyro.contacts.R
-import com.bnyro.contacts.obj.TranslatedType
-import com.bnyro.contacts.obj.ValueWithType
-import com.bnyro.contacts.ui.components.dialogs.DialogButton
+import com.bnyro.contacts.domain.model.TranslatedType
+import com.bnyro.contacts.domain.model.ValueWithType
+import com.bnyro.contacts.presentation.features.DialogButton
 import com.bnyro.contacts.util.CalendarUtils
 import java.util.TimeZone
 
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/editor/EventFieldGroup.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/editor/components/EventFieldGroup.kt
similarity index 93%
rename from app/src/main/java/com/bnyro/contacts/ui/components/editor/EventFieldGroup.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/editor/components/EventFieldGroup.kt
index 63a0be22..dac61bd3 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/editor/EventFieldGroup.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/editor/components/EventFieldGroup.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components.editor
+package com.bnyro.contacts.presentation.screens.editor.components
 
 import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.Column
@@ -19,8 +19,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.bnyro.contacts.obj.TranslatedType
-import com.bnyro.contacts.obj.ValueWithType
+import com.bnyro.contacts.domain.model.TranslatedType
+import com.bnyro.contacts.domain.model.ValueWithType
 
 /**
  * A composable function that creates a group of text fields.
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/editor/TextFieldEditor.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/editor/components/TextFieldEditor.kt
similarity index 94%
rename from app/src/main/java/com/bnyro/contacts/ui/components/editor/TextFieldEditor.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/editor/components/TextFieldEditor.kt
index a34a68f3..a6064cad 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/editor/TextFieldEditor.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/editor/components/TextFieldEditor.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components.editor
+package com.bnyro.contacts.presentation.screens.editor.components
 
 import androidx.annotation.StringRes
 import androidx.compose.foundation.clickable
@@ -25,9 +25,9 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import com.bnyro.contacts.R
-import com.bnyro.contacts.obj.TranslatedType
-import com.bnyro.contacts.obj.ValueWithType
-import com.bnyro.contacts.ui.components.base.LabeledTextField
+import com.bnyro.contacts.domain.model.TranslatedType
+import com.bnyro.contacts.domain.model.ValueWithType
+import com.bnyro.contacts.presentation.components.LabeledTextField
 
 /**
  * A composable function that renders a text field with a dropdown menu to select the type and a button to delete the text field.
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/editor/TextFieldGroup.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/editor/components/TextFieldGroup.kt
similarity index 94%
rename from app/src/main/java/com/bnyro/contacts/ui/components/editor/TextFieldGroup.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/editor/components/TextFieldGroup.kt
index 140d5a62..349194e8 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/editor/TextFieldGroup.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/editor/components/TextFieldGroup.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components.editor
+package com.bnyro.contacts.presentation.screens.editor.components
 
 import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.Column
@@ -22,8 +22,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
-import com.bnyro.contacts.obj.TranslatedType
-import com.bnyro.contacts.obj.ValueWithType
+import com.bnyro.contacts.domain.model.TranslatedType
+import com.bnyro.contacts.domain.model.ValueWithType
 
 /**
  * A composable function that creates a group of text fields.
diff --git a/app/src/main/java/com/bnyro/contacts/presentation/screens/settings/SettingsScreen.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/settings/SettingsScreen.kt
new file mode 100644
index 00000000..4fa63170
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/settings/SettingsScreen.kt
@@ -0,0 +1,157 @@
+package com.bnyro.contacts.presentation.screens.settings
+
+import android.os.Build
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.LargeTopAppBar
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.material3.rememberTopAppBarState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.bnyro.contacts.R
+import com.bnyro.contacts.domain.enums.ThemeMode
+import com.bnyro.contacts.presentation.components.ClickableIcon
+import com.bnyro.contacts.presentation.screens.settings.components.AutoBackupPref
+import com.bnyro.contacts.presentation.screens.settings.components.BlockPreference
+import com.bnyro.contacts.presentation.screens.settings.components.EncryptBackupsPref
+import com.bnyro.contacts.presentation.screens.settings.components.SettingsCategory
+import com.bnyro.contacts.presentation.screens.settings.components.SwitchPref
+import com.bnyro.contacts.presentation.screens.settings.components.SwitchPrefBase
+import com.bnyro.contacts.presentation.screens.settings.model.ThemeModel
+import com.bnyro.contacts.presentation.screens.sms.model.SmsModel
+import com.bnyro.contacts.util.BiometricAuthUtil
+import com.bnyro.contacts.util.Preferences
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun SettingsScreen(themeModel: ThemeModel, smsModel: SmsModel, onBackPress: () -> Unit) {
+    val context = LocalContext.current
+
+    val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(
+        rememberTopAppBarState()
+    )
+
+    Scaffold(
+        modifier = Modifier.nestedScroll((scrollBehavior.nestedScrollConnection)),
+        topBar = {
+            LargeTopAppBar(
+                title = {
+                    Text(stringResource(R.string.settings))
+                },
+                navigationIcon = {
+                    ClickableIcon(
+                        icon = Icons.Default.ArrowBack,
+                        contentDescription = R.string.okay
+                    ) {
+                        onBackPress.invoke()
+                    }
+                },
+                scrollBehavior = scrollBehavior
+            )
+        }
+    ) { pV ->
+        val scrollState = rememberScrollState()
+
+        Column(
+            modifier = Modifier
+                .padding(pV)
+                .padding(horizontal = 16.dp)
+                .verticalScroll(scrollState)
+        ) {
+            SettingsCategory(title = stringResource(R.string.appearance))
+            Text(stringResource(R.string.theme))
+            BlockPreference(
+                preferenceKey = Preferences.themeKey,
+                entries = listOf(
+                    R.string.system,
+                    R.string.light,
+                    R.string.dark,
+                    R.string.amoled
+                ).map {
+                    stringResource(it)
+                }
+            ) {
+                themeModel.themeMode = ThemeMode.fromInt(it)
+            }
+            SwitchPref(
+                prefKey = Preferences.colorfulContactIconsKey,
+                title = stringResource(R.string.colorful_contact_icons)
+            ) {
+                themeModel.colorfulIcons = it
+            }
+            HorizontalDivider(
+                modifier = Modifier.padding(top = 12.dp, bottom = 8.dp),
+                color = MaterialTheme.colorScheme.surfaceVariant
+            )
+            SettingsCategory(title = stringResource(R.string.messages))
+            SwitchPref(
+                prefKey = Preferences.storeSmsLocallyKey,
+                title = stringResource(R.string.private_sms_database),
+                summary = stringResource(R.string.private_sms_database_desc)
+            ) {
+                smsModel.refreshLocalSmsPreference()
+            }
+            HorizontalDivider(
+                modifier = Modifier.padding(top = 12.dp, bottom = 8.dp),
+                color = MaterialTheme.colorScheme.surfaceVariant
+            )
+            SettingsCategory(title = stringResource(R.string.behavior))
+            Text(stringResource(R.string.start_tab))
+            BlockPreference(
+                preferenceKey = Preferences.homeTabKey,
+                entries = listOf(R.string.dial, R.string.contacts, R.string.messages).map {
+                    stringResource(it)
+                }
+            )
+            SwitchPref(
+                prefKey = Preferences.collapseBottomBarKey,
+                title = stringResource(R.string.collapse_bottom_bar)
+            ) {
+                themeModel.collapsableBottomBar = it
+            }
+            HorizontalDivider(
+                modifier = Modifier.padding(top = 12.dp, bottom = 8.dp),
+                color = MaterialTheme.colorScheme.surfaceVariant
+            )
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                SettingsCategory(title = stringResource(R.string.security))
+
+                var biometricAuthEnabled by remember {
+                    mutableStateOf(Preferences.getBoolean(Preferences.biometricAuthKey, false))
+                }
+
+                SwitchPrefBase(
+                    title = stringResource(R.string.biometric_authentication),
+                    summary = stringResource(R.string.biometric_authentication_summary),
+                    checked = biometricAuthEnabled
+                ) { newValue ->
+                    BiometricAuthUtil.requestAuth(context) { authSuccess ->
+                        if (authSuccess) {
+                            Preferences.edit { putBoolean(Preferences.biometricAuthKey, newValue) }
+                            biometricAuthEnabled = newValue
+                        }
+                    }
+                }
+            }
+            AutoBackupPref()
+            EncryptBackupsPref()
+        }
+    }
+}
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/prefs/BackupPref.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/settings/components/BackupPref.kt
similarity index 83%
rename from app/src/main/java/com/bnyro/contacts/ui/components/prefs/BackupPref.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/settings/components/BackupPref.kt
index 2ec8cc7b..2b3c6b5a 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/prefs/BackupPref.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/settings/components/BackupPref.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components.prefs
+package com.bnyro.contacts.presentation.screens.settings.components
 
 import android.content.Intent
 import androidx.activity.compose.rememberLauncherForActivityResult
@@ -13,10 +13,11 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import com.bnyro.contacts.R
-import com.bnyro.contacts.enums.BackupType
+import com.bnyro.contacts.domain.enums.BackupType
+import com.bnyro.contacts.util.BackupHelper
 import com.bnyro.contacts.util.PickFolderContract
 import com.bnyro.contacts.util.Preferences
-import com.bnyro.contacts.workers.BackupWorker
+import com.bnyro.contacts.util.workers.BackupWorker
 
 @Composable
 fun AutoBackupPref() {
@@ -44,6 +45,14 @@ fun AutoBackupPref() {
     ) {
         backupType = BackupType.fromInt(it)
     }
+
+    EditTextPreference(
+        preferenceKey = Preferences.backupNamingSchemeKey,
+        title = R.string.backup_naming_scheme,
+        supportingHint = stringResource(R.string.backup_naming_scheme_hint),
+        defaultValue = BackupHelper.defaultBackupNamingScheme
+    )
+
     val backupIntervals = listOf(1, 2, 4, 6, 12, 24, 48)
     ListPreference(
         preferenceKey = Preferences.backupIntervalKey,
diff --git a/app/src/main/java/com/bnyro/contacts/presentation/screens/settings/components/BlockPreference.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/settings/components/BlockPreference.kt
new file mode 100644
index 00000000..32ad6924
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/settings/components/BlockPreference.kt
@@ -0,0 +1,49 @@
+package com.bnyro.contacts.presentation.screens.settings.components
+
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.SegmentedButton
+import androidx.compose.material3.SegmentedButtonDefaults
+import androidx.compose.material3.SingleChoiceSegmentedButtonRow
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.bnyro.contacts.util.rememberPreference
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun BlockPreference(
+    preferenceKey: String,
+    entries: List<String>,
+    onSelectionChange: (Int) -> Unit = {}
+) {
+    val scrollState = rememberScrollState()
+
+    SingleChoiceSegmentedButtonRow(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(vertical = 8.dp)
+            .horizontalScroll(scrollState)
+    ) {
+        var selectedItem by rememberPreference(key = preferenceKey, defaultValue = 0)
+
+        entries.forEachIndexed { index, entry ->
+            SegmentedButton(
+                selected = selectedItem == index,
+                onClick = {
+                    selectedItem = index
+                    onSelectionChange(index)
+                },
+                shape = SegmentedButtonDefaults.itemShape(index = index, count = entries.size)
+            ) {
+                Text(entry)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/bnyro/contacts/presentation/screens/settings/components/EditTextPreference.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/settings/components/EditTextPreference.kt
new file mode 100644
index 00000000..63e85847
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/settings/components/EditTextPreference.kt
@@ -0,0 +1,110 @@
+package com.bnyro.contacts.presentation.screens.settings.components
+
+import androidx.annotation.StringRes
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Visibility
+import androidx.compose.material.icons.filled.VisibilityOff
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Button
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.bnyro.contacts.R
+import com.bnyro.contacts.presentation.components.ClickableIcon
+import com.bnyro.contacts.presentation.features.DialogButton
+import com.bnyro.contacts.util.Preferences
+
+@Composable
+fun EditTextPreference(
+    preferenceKey: String,
+    @StringRes title: Int,
+    defaultValue: String,
+    isPassword: Boolean = false,
+    supportingHint: String? = null,
+    onChange: (value: String) -> Unit = {}
+) {
+    var showDialog by rememberSaveable {
+        mutableStateOf(false)
+    }
+    var preferenceValue by remember {
+        mutableStateOf(Preferences.getString(preferenceKey, defaultValue) ?: defaultValue)
+    }
+
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(vertical = 6.dp)
+    ) {
+        if (!isPassword) Text(text = stringResource(title), fontSize = 16.sp)
+        Button(
+            onClick = { showDialog = true }, modifier = Modifier.padding(vertical = 0.dp)
+        ) {
+            if (!isPassword) Text(preferenceValue.ifEmpty { defaultValue }) else Text(stringResource(title))
+        }
+    }
+
+    if (showDialog) {
+        var passwordVisible by remember { mutableStateOf(false) }
+        var inputValue by remember {
+            mutableStateOf(preferenceValue)
+        }
+
+        AlertDialog(
+            onDismissRequest = { showDialog = false },
+            confirmButton = {
+                DialogButton(text = stringResource(R.string.okay)) {
+                    Preferences.edit { putString(preferenceKey, inputValue) }
+                    preferenceValue = inputValue
+                    showDialog = false
+                }
+            }, dismissButton = {
+                DialogButton(text = stringResource(R.string.cancel)) {
+                    showDialog = false
+                }
+            }, title = {
+                Text(stringResource(title))
+            }, text = {
+                OutlinedTextField(
+                    value = inputValue,
+                    onValueChange = { inputValue = it },
+                    visualTransformation = if (passwordVisible || !isPassword) {
+                        VisualTransformation.None
+                    } else {
+                        PasswordVisualTransformation()
+                    },
+                    supportingText = {
+                        if (supportingHint != null) Text(supportingHint)
+                    },
+                    keyboardOptions = KeyboardOptions(keyboardType = if (isPassword) KeyboardType.Password else KeyboardType.Text),
+                    trailingIcon = {
+                        if (isPassword) {
+                            val image = if (passwordVisible) {
+                                Icons.Filled.Visibility
+                            } else {
+                                Icons.Filled.VisibilityOff
+                            }
+                            ClickableIcon(icon = image,
+                                onClick = { passwordVisible = !passwordVisible })
+                        }
+                    }
+                )
+            }
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/presentation/screens/settings/components/EncryptBackupsPref.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/settings/components/EncryptBackupsPref.kt
new file mode 100644
index 00000000..b12337d1
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/settings/components/EncryptBackupsPref.kt
@@ -0,0 +1,39 @@
+package com.bnyro.contacts.presentation.screens.settings.components
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.res.stringResource
+import com.bnyro.contacts.R
+import com.bnyro.contacts.util.BackupHelper
+import com.bnyro.contacts.util.PasswordUtils
+import com.bnyro.contacts.util.Preferences
+
+@Composable
+fun EncryptBackupsPref() {
+    var encryptBackups by remember { mutableStateOf(BackupHelper.encryptBackups) }
+
+    SwitchPref(
+        prefKey = Preferences.encryptBackupsKey,
+        title = stringResource(R.string.encrypt_backups)
+    ) {
+        encryptBackups = it
+        if (it) {
+            Preferences.edit {
+                putString(Preferences.encryptBackupPasswordKey, PasswordUtils.randomString(12))
+            }
+        }
+    }
+
+    AnimatedVisibility(encryptBackups) {
+        EditTextPreference(
+            preferenceKey = Preferences.encryptBackupPasswordKey,
+            title = R.string.backup_password,
+            isPassword = true,
+            defaultValue = "",
+        )
+    }
+}
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/prefs/ListPreference.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/settings/components/ListPreference.kt
similarity index 91%
rename from app/src/main/java/com/bnyro/contacts/ui/components/prefs/ListPreference.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/settings/components/ListPreference.kt
index 490aa381..ca0b8984 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/prefs/ListPreference.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/settings/components/ListPreference.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components.prefs
+package com.bnyro.contacts.presentation.screens.settings.components
 
 import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.padding
@@ -16,8 +16,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.bnyro.contacts.R
-import com.bnyro.contacts.ui.components.ClickableText
-import com.bnyro.contacts.ui.components.dialogs.DialogButton
+import com.bnyro.contacts.presentation.components.ClickableText
+import com.bnyro.contacts.presentation.features.DialogButton
 import com.bnyro.contacts.util.rememberPreference
 
 @Composable
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/prefs/SettingsCategory.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/settings/components/SettingsCategory.kt
similarity index 89%
rename from app/src/main/java/com/bnyro/contacts/ui/components/prefs/SettingsCategory.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/settings/components/SettingsCategory.kt
index 0d7775a5..a22d84ad 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/prefs/SettingsCategory.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/settings/components/SettingsCategory.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components.prefs
+package com.bnyro.contacts.presentation.screens.settings.components
 
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.MaterialTheme
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/prefs/SwitchPref.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/settings/components/SwitchPref.kt
similarity index 84%
rename from app/src/main/java/com/bnyro/contacts/ui/components/prefs/SwitchPref.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/settings/components/SwitchPref.kt
index 825b3261..d2a269b7 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/prefs/SwitchPref.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/settings/components/SwitchPref.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components.prefs
+package com.bnyro.contacts.presentation.screens.settings.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -22,14 +22,12 @@ import androidx.compose.ui.unit.sp
 import com.bnyro.contacts.util.rememberPreference
 
 @Composable
-fun SwitchPref(
-    prefKey: String,
+fun SwitchPrefBase(
     title: String,
     summary: String? = null,
-    defaultValue: Boolean = false,
-    onCheckedChange: (Boolean) -> Unit = {}
+    checked: Boolean,
+    onCheckedChange: (Boolean) -> Unit
 ) {
-    var checked by rememberPreference(key = prefKey, defaultValue = defaultValue)
     val interactionSource = remember { MutableInteractionSource() }
 
     Row(
@@ -39,7 +37,7 @@ fun SwitchPref(
                 interactionSource = interactionSource,
                 indication = null
             ) {
-                checked = !checked
+                onCheckedChange(!checked)
             },
         horizontalArrangement = Arrangement.SpaceBetween,
         verticalAlignment = Alignment.CenterVertically
@@ -62,9 +60,24 @@ fun SwitchPref(
         Switch(
             checked = checked,
             onCheckedChange = {
-                checked = it
                 onCheckedChange.invoke(it)
             }
         )
     }
 }
+
+@Composable
+fun SwitchPref(
+    prefKey: String,
+    title: String,
+    summary: String? = null,
+    defaultValue: Boolean = false,
+    onCheckedChange: (Boolean) -> Unit = {}
+) {
+    var checked by rememberPreference(key = prefKey, defaultValue = defaultValue)
+
+    SwitchPrefBase(title = title, summary = summary, checked = checked) {
+        checked = it
+        onCheckedChange.invoke(it)
+    }
+}
diff --git a/app/src/main/java/com/bnyro/contacts/ui/models/ThemeModel.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/settings/model/ThemeModel.kt
similarity index 85%
rename from app/src/main/java/com/bnyro/contacts/ui/models/ThemeModel.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/settings/model/ThemeModel.kt
index 0e2ca10e..34314a36 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/models/ThemeModel.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/settings/model/ThemeModel.kt
@@ -1,10 +1,10 @@
-package com.bnyro.contacts.ui.models
+package com.bnyro.contacts.presentation.screens.settings.model
 
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
-import com.bnyro.contacts.enums.ThemeMode
+import com.bnyro.contacts.domain.enums.ThemeMode
 import com.bnyro.contacts.util.Preferences
 
 class ThemeModel : ViewModel() {
diff --git a/app/src/main/java/com/bnyro/contacts/presentation/screens/sms/SmsListScreen.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/sms/SmsListScreen.kt
new file mode 100644
index 00000000..1f38d17c
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/sms/SmsListScreen.kt
@@ -0,0 +1,331 @@
+package com.bnyro.contacts.presentation.screens.sms
+
+import android.annotation.SuppressLint
+import android.os.Build
+import android.provider.BlockedNumberContract
+import android.util.Log
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Edit
+import androidx.compose.material.icons.filled.Search
+import androidx.compose.material.icons.rounded.FrontHand
+import androidx.compose.material.icons.rounded.Handshake
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
+import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.bnyro.contacts.R
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.domain.model.SmsThread
+import com.bnyro.contacts.navigation.NavRoutes
+import com.bnyro.contacts.presentation.components.BlobIconBox
+import com.bnyro.contacts.presentation.components.ClickableIcon
+import com.bnyro.contacts.presentation.components.TopBarMoreMenu
+import com.bnyro.contacts.presentation.features.NumberPickerDialog
+import com.bnyro.contacts.presentation.screens.calllog.SheetSettingItem
+import com.bnyro.contacts.presentation.screens.contacts.model.ContactsModel
+import com.bnyro.contacts.presentation.screens.settings.model.ThemeModel
+import com.bnyro.contacts.presentation.screens.sms.components.SmsSearchScreen
+import com.bnyro.contacts.presentation.screens.sms.components.SmsThreadItem
+import com.bnyro.contacts.presentation.screens.sms.model.SmsModel
+import com.bnyro.contacts.util.CalendarUtils
+import com.bnyro.contacts.util.ExportHelper
+import com.bnyro.contacts.util.IntentHelper
+import com.bnyro.contacts.util.PermissionHelper
+import com.bnyro.contacts.util.extension.toast
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun SmsListScreen(
+    smsModel: SmsModel,
+    contactsModel: ContactsModel,
+    scrollConnection: NestedScrollConnection?,
+    onNavigate: (NavRoutes) -> Unit,
+    onClickMessage: (address: String, contactData: ContactData?) -> Unit
+) {
+    val themeModel: ThemeModel = viewModel()
+    val context = LocalContext.current
+    val scope = rememberCoroutineScope()
+
+    var showNumberPicker by rememberSaveable {
+        mutableStateOf(false)
+    }
+    var showSearch by rememberSaveable {
+        mutableStateOf(false)
+    }
+
+    var selectedThread by rememberSaveable {
+        mutableStateOf<SmsThread?>(null)
+    }
+
+    val importSmsLauncher =
+        rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
+            scope.launch(Dispatchers.IO) {
+                try {
+                    ExportHelper(context, contactsModel.contactsRepository)
+                        .importSms(uri ?: return@launch, smsModel.app.smsRepo)
+                    context.toast(R.string.import_success)
+                } catch (e: Exception) {
+                    Log.e("Failed to import SMS", e.stackTraceToString())
+                    context.toast(e.message.orEmpty())
+                }
+            }
+        }
+
+    val exportSmsLauncher =
+        rememberLauncherForActivityResult(ActivityResultContracts.CreateDocument("application/json")) { uri ->
+            scope.launch(Dispatchers.IO) {
+                try {
+                    ExportHelper(context, contactsModel.contactsRepository)
+                        .exportSms(uri ?: return@launch, smsModel.smsList.value)
+                    context.toast(R.string.export_success)
+                } catch (e: Exception) {
+                    Log.e("Failed to export SMS", e.stackTraceToString())
+                    context.toast(e.message.orEmpty())
+                }
+            }
+        }
+
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = {
+                    Text(text = stringResource(R.string.messages))
+                },
+                actions = {
+                    ClickableIcon(
+                        icon = Icons.Default.Search,
+                        contentDescription = R.string.search
+                    ) {
+                        showSearch = true
+                    }
+                    TopBarMoreMenu(options = listOf(
+                        stringResource(R.string.import_sms),
+                        stringResource(R.string.export_sms),
+                        stringResource(R.string.settings),
+                        stringResource(R.string.about)
+                    ),
+                        onOptionClick = { index ->
+                            when (index) {
+                                0 -> {
+                                    importSmsLauncher.launch(arrayOf("application/json"))
+                                }
+
+                                1 -> {
+                                    val dateTime = CalendarUtils.getCurrentDateTime()
+                                    exportSmsLauncher.launch("sms-backup-${dateTime}.json")
+                                }
+
+                                2 -> {
+                                    onNavigate.invoke(NavRoutes.Settings)
+                                }
+
+                                3 -> {
+                                    onNavigate.invoke(NavRoutes.About)
+                                }
+                            }
+                        }
+                    )
+                }
+            )
+        },
+        floatingActionButton = {
+            FloatingActionButton(
+                onClick = {
+                    showNumberPicker = true
+                }
+            ) {
+                Icon(Icons.Default.Edit, null)
+            }
+        }) { pv ->
+        val smsList by smsModel.smsList.collectAsState()
+        if (smsList.isNotEmpty()) {
+            val threadList = smsList.groupBy { it.threadId }
+                .map { (threadId, smsList) ->
+                    val address = smsList.first().address
+                    SmsThread(
+                        threadId = threadId,
+                        contactData = contactsModel.getContactByNumber(address),
+                        address = address,
+                        smsList = smsList
+                    )
+                }
+                .sortedBy { thread -> thread.smsList.maxOf { it.timestamp } }
+                .reversed()
+
+            LazyColumn(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .padding(pv)
+                    .let { modifier ->
+                        scrollConnection?.let { modifier.nestedScroll(it) } ?: modifier
+                    }
+            ) {
+                items(threadList, key = SmsThread::threadId) { thread ->
+                    SmsThreadItem(smsModel, thread, onClick = onClickMessage, onLongClick = {
+                        selectedThread = thread
+                    })
+                }
+            }
+            if (showSearch) {
+                SmsSearchScreen(smsModel, threadList, { showSearch = false }, onClickMessage)
+            }
+        } else {
+            BlobIconBox(icon = R.drawable.ic_no_sms)
+        }
+
+        if (showNumberPicker) {
+            NumberPickerDialog(
+                contactsModel,
+                themeModel,
+                onDismissRequest = { showNumberPicker = false },
+                onNumberSelect = onClickMessage
+            )
+        }
+    }
+    selectedThread?.let { thread ->
+        SMSThreadOptionsSheet(onDismissRequest = { selectedThread = null }, thread = thread)
+    }
+}
+
+@SuppressLint("NewApi")
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun SMSThreadOptionsSheet(
+    onDismissRequest: () -> Unit,
+    thread: SmsThread
+) {
+    val songSettingsSheetState = rememberModalBottomSheetState(
+        skipPartiallyExpanded = true
+    )
+    val context = LocalContext.current
+    var isBlocked by remember {
+        mutableStateOf<Boolean?>(null)
+    }
+    LaunchedEffect(Unit) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            if (!PermissionHelper.canBlockNumbers(context)) return@LaunchedEffect
+            isBlocked = BlockedNumberContract.isBlocked(context, thread.address)
+        }
+    }
+    ModalBottomSheet(
+        onDismissRequest = onDismissRequest,
+        sheetState = songSettingsSheetState,
+        windowInsets = WindowInsets.systemBars,
+        dragHandle = null
+    ) {
+        Row(
+            Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 8.dp, vertical = 16.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Box(
+                modifier = Modifier
+                    .size(64.dp)
+                    .padding(8.dp)
+                    .clip(CircleShape)
+                    .background(MaterialTheme.colorScheme.surfaceVariant)
+            ) {
+                if (thread.contactData?.thumbnail != null) {
+                    Image(
+                        modifier = Modifier
+                            .fillMaxSize(),
+                        bitmap = thread.contactData.thumbnail!!.asImageBitmap(),
+                        contentDescription = null,
+                        contentScale = ContentScale.Crop
+                    )
+                } else {
+                    Icon(
+                        modifier = Modifier.fillMaxSize(),
+                        painter = painterResource(id = R.drawable.ic_person),
+                        contentDescription = null,
+                        tint = MaterialTheme.colorScheme.onSurfaceVariant
+                    )
+                }
+            }
+            Column(
+                Modifier
+                    .weight(1f)
+                    .padding(8.dp)
+            ) {
+                Text(
+                    thread.contactData?.displayName ?: thread.address,
+                    style = MaterialTheme.typography.titleLarge,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
+                )
+            }
+        }
+        Column(
+            Modifier
+                .padding(horizontal = 8.dp, vertical = 16.dp)
+        ) {
+            isBlocked?.let { isBlocked ->
+                if (isBlocked) {
+                    SheetSettingItem(
+                        icon = Icons.Rounded.Handshake,
+                        description = R.string.unblock_number,
+                        onClick = {
+                            BlockedNumberContract.unblock(context, thread.address)
+                            onDismissRequest()
+                        }
+                    )
+                } else {
+                    SheetSettingItem(
+                        icon = Icons.Rounded.FrontHand,
+                        description = R.string.block_number,
+                        onClick = {
+                            IntentHelper.blockNumberOrAddress(context, thread.address)
+                            onDismissRequest()
+                        }
+                    )
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/presentation/screens/sms/SmsThreadScreen.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/sms/SmsThreadScreen.kt
new file mode 100644
index 00000000..a2e5d847
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/sms/SmsThreadScreen.kt
@@ -0,0 +1,236 @@
+package com.bnyro.contacts.presentation.screens.sms
+
+import android.annotation.SuppressLint
+import android.os.Build
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.filled.PersonAddAlt1
+import androidx.compose.material.icons.filled.Send
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.FilledIconButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.PlainTooltip
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TooltipBox
+import androidx.compose.material3.TooltipDefaults
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.rememberTooltipState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.bnyro.contacts.R
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.presentation.components.ClickableIcon
+import com.bnyro.contacts.presentation.components.ElevatedTextInputField
+import com.bnyro.contacts.presentation.features.AddToContactDialog
+import com.bnyro.contacts.presentation.features.ConfirmationDialog
+import com.bnyro.contacts.presentation.screens.contact.SingleContactScreen
+import com.bnyro.contacts.presentation.screens.contacts.model.ContactsModel
+import com.bnyro.contacts.presentation.screens.sms.components.Messages
+import com.bnyro.contacts.presentation.screens.sms.model.SmsModel
+import com.bnyro.contacts.util.SmsUtil
+
+@SuppressLint("NewApi")
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun SmsThreadScreen(
+    smsModel: SmsModel,
+    contactsModel: ContactsModel,
+    address: String,
+    initialText: String = "",
+    contactsData: ContactData? = null,
+    onClose: () -> Unit
+) {
+    val context = LocalContext.current
+
+    val allSmsList by smsModel.smsList.collectAsState()
+    val smsList = allSmsList.filter { it.address == address }
+    val subscriptions = remember {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+            SmsUtil.getSubscriptions(context)
+        } else {
+            null
+        }
+    }
+
+    val contactData = remember {
+        contactsData ?: contactsModel.getContactByNumber(address)
+    }
+
+    var showContactScreen by remember {
+        mutableStateOf(false)
+    }
+    var showAddToContactDialog by remember {
+        mutableStateOf(false)
+    }
+
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = {
+                    val interactionSource = remember {
+                        MutableInteractionSource()
+                    }
+                    TooltipBox(
+                        tooltip = {
+                            PlainTooltip {
+                                Text(address)
+                            }
+                        },
+                        state = rememberTooltipState(),
+                        positionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider()
+                    ) {
+                        Text(
+                            modifier = Modifier
+                                .clickable(interactionSource, null) {
+                                    if (contactData != null) showContactScreen = true
+                                },
+                            text = contactData?.displayName ?: address
+                        )
+                    }
+                },
+                navigationIcon = {
+                    ClickableIcon(
+                        icon = Icons.Default.ArrowBack,
+                        contentDescription = R.string.okay
+                    ) {
+                        onClose.invoke()
+                    }
+                },
+                actions = {
+                    if (contactData == null) {
+                        ClickableIcon(icon = Icons.Default.PersonAddAlt1) {
+                            showAddToContactDialog = true
+                        }
+                    }
+                }
+            )
+        }
+    ) { pV ->
+        Column(
+            modifier = Modifier
+                .padding(pV)
+        ) {
+            Messages(messages = smsList, smsModel = smsModel)
+
+            Spacer(modifier = Modifier.height(10.dp))
+            if (subscriptions != null && subscriptions.size >= 2) {
+                var currentSub by remember { mutableIntStateOf(0) }
+                LaunchedEffect(Unit) {
+                    currentSub = 0
+                    smsModel.currentSubscription = subscriptions[currentSub]
+                }
+                Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End) {
+                    OutlinedButton(onClick = {
+                        currentSub = if (currentSub == 0) 1 else 0
+                        smsModel.currentSubscription = subscriptions[currentSub]
+                    }) {
+                        Text(
+                            text = "SIM ${subscriptions[currentSub].simSlotIndex + 1} - ${subscriptions[currentSub].displayName}"
+                        )
+                    }
+                }
+            }
+
+            // can't respond to address short codes that don't include a number
+            val showSendButton = remember {
+                address.any { !it.isLetter() }
+            }
+
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(start = 10.dp, end = 5.dp, bottom = 20.dp),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                var showConfirmSendMultipleSmsDialog by remember {
+                    mutableStateOf(false)
+                }
+
+                var text by remember {
+                    mutableStateOf(initialText)
+                }
+
+                ElevatedTextInputField(
+                    modifier = Modifier.weight(1f),
+                    query = text,
+                    onQueryChange = { text = it },
+                    placeholder = stringResource(if (showSendButton) R.string.send else R.string.cant_respond),
+                    enabled = showSendButton
+                )
+
+                Spacer(modifier = Modifier.width(8.dp))
+
+                FilledIconButton(
+                    modifier = Modifier.size(48.dp),
+                    enabled = showSendButton,
+                    onClick = {
+                        if (text.isBlank()) return@FilledIconButton
+                        if (!SmsUtil.isShortEnoughForSms(text)) {
+                            showConfirmSendMultipleSmsDialog = true
+                            return@FilledIconButton
+                        }
+
+                        smsModel.sendSms(context, address, text)
+
+                        text = ""
+                    }
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.Send,
+                        contentDescription = stringResource(R.string.send)
+                    )
+                }
+
+                if (showConfirmSendMultipleSmsDialog) {
+                    ConfirmationDialog(
+                        onDismissRequest = { showConfirmSendMultipleSmsDialog = false },
+                        title = stringResource(R.string.message_too_long),
+                        text = stringResource(R.string.send_message_as_multiple)
+                    ) {
+                        SmsUtil.splitSmsText(text).forEach {
+                            smsModel.sendSms(context, address, it)
+                        }
+
+                        text = ""
+                    }
+                }
+            }
+        }
+    }
+
+    if (showContactScreen && contactData != null) {
+        SingleContactScreen(contact = contactData, contactsModel) {
+            showContactScreen = false
+        }
+    }
+
+    if (showAddToContactDialog) {
+        AddToContactDialog(newNumber = address) {
+            showAddToContactDialog = false
+        }
+    }
+}
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/conversation/Message.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/sms/components/Message.kt
similarity index 71%
rename from app/src/main/java/com/bnyro/contacts/ui/components/conversation/Message.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/sms/components/Message.kt
index c8decce8..f1f5b0d8 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/conversation/Message.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/sms/components/Message.kt
@@ -1,16 +1,39 @@
-package com.bnyro.contacts.ui.components.conversation
+package com.bnyro.contacts.presentation.screens.sms.components
 
 import android.provider.Telephony
 import android.text.format.DateUtils
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.ClickableText
 import androidx.compose.foundation.text.selection.SelectionContainer
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.SwipeToDismissBox
+import androidx.compose.material3.SwipeToDismissBoxValue
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberSwipeToDismissBoxState
+import androidx.compose.material3.surfaceColorAtElevation
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -18,20 +41,24 @@ import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.bnyro.contacts.R
-import com.bnyro.contacts.db.obj.SmsData
-import com.bnyro.contacts.ui.components.dialogs.ConfirmationDialog
-import com.bnyro.contacts.ui.models.SmsModel
+import com.bnyro.contacts.data.database.obj.SmsData
+import com.bnyro.contacts.presentation.features.ConfirmationDialog
+import com.bnyro.contacts.presentation.screens.sms.model.SmsModel
 import com.bnyro.contacts.util.generateAnnotations
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun ColumnScope.Messages(
-    messages: List<SmsData>,
-    scrollState: LazyListState,
-    smsModel: SmsModel
-) {
-    LaunchedEffect(Unit) {
-        scrollState.scrollToItem(messages.size + 5)
+fun ColumnScope.Messages(messages: List<SmsData>, smsModel: SmsModel) {
+    val scrollState = rememberLazyListState()
+
+    var scrolledToBottom = remember { false }
+
+    LaunchedEffect(messages) {
+        // only scroll to the latest message once and only if not manually scrolled yet
+        if (scrollState.firstVisibleItemIndex == 0 && scrollState.firstVisibleItemScrollOffset == 0 && !scrolledToBottom) {
+            scrollState.scrollToItem(messages.size + 5)
+            scrolledToBottom = true
+        }
     }
 
     val timestamped = messages.groupBy {
@@ -52,11 +79,9 @@ fun ColumnScope.Messages(
     ) {
         timestamped.forEach { timestamp ->
             item {
-                DayHeader(
-                    timestamp.key
-                )
+                DayHeader(timestamp.key)
             }
-            items(items = timestamp.value) { smsData ->
+            items(items = timestamp.value, key = SmsData::id) { smsData ->
                 val isUserMe = smsData.type in listOf(
                     Telephony.Sms.MESSAGE_TYPE_DRAFT,
                     Telephony.Sms.MESSAGE_TYPE_SENT,
@@ -66,18 +91,18 @@ fun ColumnScope.Messages(
                     mutableStateOf(false)
                 }
 
-                val state = rememberDismissState(
+                val state = rememberSwipeToDismissBoxState(
                     confirmValueChange = {
-                        if (it == DismissValue.DismissedToEnd) {
+                        if (it == SwipeToDismissBoxValue.StartToEnd) {
                             showDeleteSmsDialog = true
                         }
-                        return@rememberDismissState false
+                        return@rememberSwipeToDismissBoxState false
                     }
                 )
-                SwipeToDismiss(
+                SwipeToDismissBox(
                     state = state,
-                    background = {},
-                    dismissContent = {
+                    backgroundContent = {},
+                    content = {
                         Message(
                             msg = smsData,
                             isUserMe = isUserMe
@@ -133,7 +158,7 @@ fun DayHeader(dayString: String) {
 
 @Composable
 private fun RowScope.DayHeaderLine() {
-    Divider(
+    HorizontalDivider(
         modifier = Modifier
             .weight(1f)
             .align(Alignment.CenterVertically),
diff --git a/app/src/main/java/com/bnyro/contacts/ui/screens/SmsSearchScreen.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/sms/components/SmsSearchScreen.kt
similarity index 81%
rename from app/src/main/java/com/bnyro/contacts/ui/screens/SmsSearchScreen.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/sms/components/SmsSearchScreen.kt
index 4201bdf0..589ae338 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/screens/SmsSearchScreen.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/sms/components/SmsSearchScreen.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.screens
+package com.bnyro.contacts.presentation.screens.sms.components
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
@@ -20,11 +20,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.unit.dp
 import com.bnyro.contacts.R
-import com.bnyro.contacts.obj.SmsThread
-import com.bnyro.contacts.ui.components.SmsThreadItem
-import com.bnyro.contacts.ui.components.base.ElevatedTextInputField
-import com.bnyro.contacts.ui.components.base.FullScreenDialog
-import com.bnyro.contacts.ui.models.SmsModel
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.domain.model.SmsThread
+import com.bnyro.contacts.presentation.components.ElevatedTextInputField
+import com.bnyro.contacts.presentation.components.FullScreenDialog
+import com.bnyro.contacts.presentation.screens.sms.model.SmsModel
 import com.bnyro.contacts.util.ContactsHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
@@ -34,7 +34,8 @@ import kotlinx.coroutines.withContext
 fun SmsSearchScreen(
     smsModel: SmsModel,
     threadList: List<SmsThread>,
-    onDismissRequest: () -> Unit
+    onDismissRequest: () -> Unit,
+    onClickMessage: (address: String, contactData: ContactData?) -> Unit
 ) {
     FullScreenDialog(onDismissRequest) {
         val focusRequester = remember {
@@ -83,8 +84,8 @@ fun SmsSearchScreen(
                 modifier = Modifier
                     .fillMaxSize()
             ) {
-                items(visibleThreads) { thread ->
-                    SmsThreadItem(smsModel, thread)
+                items(visibleThreads, key = SmsThread::threadId) { thread ->
+                    SmsThreadItem(smsModel, thread, onClickMessage)
                 }
             }
         }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/SmsThreadItem.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/sms/components/SmsThreadItem.kt
similarity index 68%
rename from app/src/main/java/com/bnyro/contacts/ui/components/SmsThreadItem.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/sms/components/SmsThreadItem.kt
index 89b5d6b4..0dfb491d 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/SmsThreadItem.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/sms/components/SmsThreadItem.kt
@@ -1,8 +1,9 @@
-package com.bnyro.contacts.ui.components
+package com.bnyro.contacts.presentation.screens.sms.components
 
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -15,17 +16,14 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Person
-import androidx.compose.material3.DismissDirection
-import androidx.compose.material3.DismissValue
 import androidx.compose.material3.ElevatedCard
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.SwipeToDismiss
+import androidx.compose.material3.SwipeToDismissBox
+import androidx.compose.material3.SwipeToDismissBoxValue
 import androidx.compose.material3.Text
-import androidx.compose.material3.rememberDismissState
-import androidx.compose.material3.surfaceColorAtElevation
+import androidx.compose.material3.rememberSwipeToDismissBoxState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -34,57 +32,59 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.bnyro.contacts.R
-import com.bnyro.contacts.obj.SmsThread
-import com.bnyro.contacts.ui.components.dialogs.ConfirmationDialog
-import com.bnyro.contacts.ui.models.SmsModel
-import com.bnyro.contacts.ui.screens.SmsThreadScreen
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.domain.model.SmsThread
+import com.bnyro.contacts.presentation.features.ConfirmationDialog
+import com.bnyro.contacts.presentation.screens.sms.model.SmsModel
+import com.bnyro.contacts.ui.theme.LocalDarkTheme
 
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
 @Composable
 fun SmsThreadItem(
     smsModel: SmsModel,
-    thread: SmsThread
+    thread: SmsThread,
+    onClick: (address: String, contactData: ContactData?) -> Unit,
+    onLongClick: (thread: SmsThread) -> Unit = {}
 ) {
     val context = LocalContext.current
 
-    var showThreadScreen by remember {
-        mutableStateOf(false)
-    }
     var showDeleteThreadDialog by remember {
         mutableStateOf(false)
     }
 
-    val dismissState = rememberDismissState(
+    val dismissState = rememberSwipeToDismissBoxState(
         confirmValueChange = {
-            if (it == DismissValue.DismissedToEnd) {
+            if (it == SwipeToDismissBoxValue.StartToEnd) {
                 showDeleteThreadDialog = true
             }
-            return@rememberDismissState false
+            return@rememberSwipeToDismissBoxState false
         }
     )
 
-    SwipeToDismiss(
+    SwipeToDismissBox(
         modifier = Modifier.padding(horizontal = 10.dp, vertical = 5.dp),
         state = dismissState,
-        background = {},
-        dismissContent = {
+        backgroundContent = {},
+        content = {
             val shape = RoundedCornerShape(20.dp)
 
             ElevatedCard(
                 modifier = Modifier
                     .fillMaxWidth()
                     .clip(shape)
-                    .clickable {
-                        showThreadScreen = true
-                    },
+                    .combinedClickable(onClick = {
+                        onClick.invoke(thread.address, thread.contactData)
+                    }, onLongClick = {
+                        onLongClick.invoke(thread)
+                    }),
                 shape = shape
             ) {
                 Row(
@@ -94,37 +94,30 @@ fun SmsThreadItem(
                     ),
                     verticalAlignment = Alignment.CenterVertically
                 ) {
+                    val darkTheme = LocalDarkTheme.current
                     Box(
                         modifier = Modifier
                             .size(58.dp)
                             .clip(CircleShape)
                             .background(
-                                MaterialTheme.colorScheme.primary,
-                                CircleShape
+                                if (darkTheme) MaterialTheme.colorScheme.onSurfaceVariant else MaterialTheme.colorScheme.surfaceVariant
                             ),
                         contentAlignment = Alignment.Center
                     ) {
                         if (thread.contactData?.thumbnail != null) {
                             Image(
                                 modifier = Modifier
-                                    .fillMaxSize()
-                                    .clip(CircleShape),
+                                    .fillMaxSize(),
                                 bitmap = thread.contactData.thumbnail!!.asImageBitmap(),
                                 contentDescription = null,
                                 contentScale = ContentScale.Crop
                             )
                         } else {
-                            Image(
-                                modifier = Modifier
-                                    .padding(vertical = 12.dp)
-                                    .fillMaxSize(),
-                                imageVector = Icons.Default.Person,
+                            Icon(
+                                modifier = Modifier.fillMaxSize(),
+                                painter = painterResource(id = R.drawable.ic_person),
                                 contentDescription = null,
-                                colorFilter = ColorFilter.tint(
-                                    MaterialTheme.colorScheme.surfaceColorAtElevation(
-                                        10.dp
-                                    )
-                                )
+                                tint = if (darkTheme) MaterialTheme.colorScheme.surfaceVariant else MaterialTheme.colorScheme.onSurfaceVariant
                             )
                         }
                     }
@@ -149,15 +142,9 @@ fun SmsThreadItem(
                 }
             }
         },
-        directions = setOf(DismissDirection.StartToEnd)
+        enableDismissFromStartToEnd = true
     )
 
-    if (showThreadScreen) {
-        SmsThreadScreen(smsModel, thread.contactData, thread.address) {
-            showThreadScreen = false
-        }
-    }
-
     if (showDeleteThreadDialog) {
         ConfirmationDialog(
             onDismissRequest = { showDeleteThreadDialog = false },
diff --git a/app/src/main/java/com/bnyro/contacts/ui/models/SmsModel.kt b/app/src/main/java/com/bnyro/contacts/presentation/screens/sms/model/SmsModel.kt
similarity index 68%
rename from app/src/main/java/com/bnyro/contacts/ui/models/SmsModel.kt
rename to app/src/main/java/com/bnyro/contacts/presentation/screens/sms/model/SmsModel.kt
index 3f471754..68efc332 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/models/SmsModel.kt
+++ b/app/src/main/java/com/bnyro/contacts/presentation/screens/sms/model/SmsModel.kt
@@ -1,31 +1,28 @@
-package com.bnyro.contacts.ui.models
+package com.bnyro.contacts.presentation.screens.sms.model
 
 import android.annotation.SuppressLint
+import android.app.Application
 import android.content.Context
 import android.telephony.SubscriptionInfo
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.setValue
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory.Companion.APPLICATION_KEY
+import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
-import androidx.lifecycle.viewmodel.initializer
-import androidx.lifecycle.viewmodel.viewModelFactory
 import com.bnyro.contacts.App
+import com.bnyro.contacts.domain.model.ContactData
 import com.bnyro.contacts.util.SmsUtil
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 
-class SmsModel(val app: App) : ViewModel() {
+class SmsModel(application: Application) : AndroidViewModel(application) {
+    val app = application as App
     var smsList = app.smsRepo.getSmsStream(context = app.applicationContext).stateIn(
         viewModelScope,
         started = SharingStarted.WhileSubscribed(5000L),
         initialValue = listOf()
     )
 
-    var initialAddressAndBody by mutableStateOf<Pair<String, String?>?>(null)
+    var currentContactData: ContactData? = null
 
     var currentSubscription: SubscriptionInfo? = null
 
@@ -60,13 +57,4 @@ class SmsModel(val app: App) : ViewModel() {
         app.initSmsRepo()
         updateSmsList()
     }
-
-    companion object {
-        val Factory = viewModelFactory {
-            initializer {
-                val application = this[APPLICATION_KEY] as App
-                SmsModel(application)
-            }
-        }
-    }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/activities/BaseActivity.kt b/app/src/main/java/com/bnyro/contacts/ui/activities/BaseActivity.kt
index ed20c1ff..805e548e 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/activities/BaseActivity.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/activities/BaseActivity.kt
@@ -7,22 +7,22 @@ import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.provider.Telephony
-import androidx.activity.ComponentActivity
 import androidx.activity.viewModels
+import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.get
-import com.bnyro.contacts.ui.models.ContactsModel
-import com.bnyro.contacts.ui.models.SmsModel
-import com.bnyro.contacts.ui.models.ThemeModel
+import com.bnyro.contacts.presentation.screens.contacts.model.ContactsModel
+import com.bnyro.contacts.presentation.screens.settings.model.ThemeModel
+import com.bnyro.contacts.presentation.screens.sms.model.SmsModel
 import com.bnyro.contacts.util.NotificationHelper
 import com.bnyro.contacts.util.PermissionHelper
 
-abstract class BaseActivity : ComponentActivity() {
+abstract class BaseActivity : FragmentActivity() {
     lateinit var themeModel: ThemeModel
     val contactsModel by viewModels<ContactsModel> {
         ContactsModel.Factory
     }
-    val smsModel by viewModels<SmsModel> { SmsModel.Factory }
+    val smsModel by viewModels<SmsModel>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -43,7 +43,7 @@ abstract class BaseActivity : ComponentActivity() {
             val roleManager = context.getSystemService(RoleManager::class.java)
             if (roleManager!!.isRoleAvailable(RoleManager.ROLE_SMS)) {
                 if (roleManager.isRoleHeld(RoleManager.ROLE_SMS)) {
-                    getSmsPermissions(context)
+                    getSmsPermissions()
                 } else {
                     val intent = roleManager.createRequestRoleIntent(RoleManager.ROLE_SMS)
                     context.startActivity(intent)
@@ -51,7 +51,7 @@ abstract class BaseActivity : ComponentActivity() {
             }
         } else {
             if (Telephony.Sms.getDefaultSmsPackage(context) == context.packageName) {
-                getSmsPermissions(context)
+                getSmsPermissions()
             } else {
                 val intent = Intent(Telephony.Sms.Intents.ACTION_CHANGE_DEFAULT)
                 intent.putExtra(Telephony.Sms.Intents.EXTRA_PACKAGE_NAME, context.packageName)
@@ -60,8 +60,8 @@ abstract class BaseActivity : ComponentActivity() {
         }
     }
 
-    private fun getSmsPermissions(context: Context) {
-        PermissionHelper.checkPermissions(context, smsPermissions)
+    private fun getSmsPermissions() {
+        PermissionHelper.checkPermissions(this, smsPermissions)
     }
 
     companion object {
diff --git a/app/src/main/java/com/bnyro/contacts/ui/activities/CallActivity.kt b/app/src/main/java/com/bnyro/contacts/ui/activities/CallActivity.kt
new file mode 100644
index 00000000..04de8a86
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/ui/activities/CallActivity.kt
@@ -0,0 +1,168 @@
+package com.bnyro.contacts.ui.activities
+
+import android.app.AlertDialog
+import android.content.BroadcastReceiver
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.ServiceConnection
+import android.os.Bundle
+import android.os.IBinder
+import android.os.PowerManager
+import android.view.Window
+import android.view.WindowManager
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.viewModels
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Scaffold
+import androidx.compose.ui.Modifier
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.get
+import com.bnyro.contacts.R
+import com.bnyro.contacts.presentation.screens.dialer.DialerScreen
+import com.bnyro.contacts.presentation.screens.dialer.model.DialerModel
+import com.bnyro.contacts.ui.theme.ConnectYouTheme
+import com.bnyro.contacts.util.services.CallService
+
+class CallActivity : ComponentActivity() {
+
+    lateinit var callService: CallService
+    val dialerModel: DialerModel by viewModels()
+
+    val powerManager by lazy { getSystemService(PowerManager::class.java) }
+
+    val wakeLock by lazy {
+        powerManager.newWakeLock(
+            PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK,
+            this::class.simpleName
+        )
+    }
+
+    private val serviceConnection = object : ServiceConnection {
+        override fun onServiceConnected(className: ComponentName, service: IBinder) {
+            val binder = (service as CallService.LocalBinder)
+            callService = binder.getService()
+
+            dialerModel.playDtmfTone = callService::playDtmfTone
+            dialerModel.acceptCall = callService::acceptCall
+            dialerModel.cancelCall = callService::cancelCall
+
+            callService.onUpdateState = dialerModel::onState
+            callService.onCallerInfoUpdate = dialerModel::onCallerInfoUpdate
+
+            callService.updateState()
+            callService.updateCallerInfo()
+        }
+
+        override fun onServiceDisconnected(p0: ComponentName?) {
+            dialerModel.playDtmfTone = {}
+            dialerModel.acceptCall = {}
+            dialerModel.cancelCall = {}
+
+            callService.onUpdateState = {}
+            callService.onCallerInfoUpdate = {}
+        }
+    }
+
+    private val closeAlertReciever = object : BroadcastReceiver() {
+        override fun onReceive(context: Context?, intent: Intent?) {
+            if (intent?.getStringExtra(ACTION_EXTRA_KEY) == CLOSE_ACTION) {
+                val reason = intent.getStringExtra(ACTION_EXTRA_REASON)
+                if (reason != null) {
+                    showAlert(getString(R.string.call_ended), reason)
+                } else {
+                    finish()
+                }
+            }
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        requestWindowFeature(Window.FEATURE_NO_TITLE)
+
+        if (!wakeLock.isHeld) {
+            wakeLock.acquire(10 * 60 * 1000L /*10 minutes*/)
+        }
+
+        window.addFlags(windowFlags)
+
+        ContextCompat.registerReceiver(
+            this, closeAlertReciever, IntentFilter(
+                CALL_ALERT_CLOSE_ACTION
+            ), ContextCompat.RECEIVER_NOT_EXPORTED
+        )
+
+        val dialerModel: DialerModel = ViewModelProvider(this).get()
+
+        setContent {
+            ConnectYouTheme {
+                Scaffold { pV ->
+                    Box(
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .padding(pV)
+                    ) {
+                        DialerScreen(dialerModel = dialerModel)
+                    }
+                }
+            }
+        }
+    }
+
+    override fun onStart() {
+        super.onStart()
+        Intent(this, CallService::class.java).setAction(CallService.CUSTOM_BIND_ACTION)
+            .also { intent ->
+                bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE)
+            }
+    }
+
+    override fun onDestroy() {
+        unregisterReceiver(closeAlertReciever)
+        super.onDestroy()
+    }
+
+    override fun onResume() {
+        if (!wakeLock.isHeld) {
+            wakeLock.acquire(10 * 60 * 1000L /*10 minutes*/)
+        }
+        super.onResume()
+    }
+
+    override fun onPause() {
+        wakeLock.release()
+        super.onPause()
+    }
+
+    override fun onStop() {
+        super.onStop()
+        unbindService(serviceConnection)
+    }
+
+    fun showAlert(title: String, message: String) {
+        AlertDialog.Builder(this)
+            .setTitle(title)
+            .setMessage(message)
+            .setPositiveButton(android.R.string.ok) { dialog, _ ->
+                dialog.dismiss()
+                finish()
+            }
+            .create()
+            .show()
+    }
+
+    companion object {
+        const val CALL_ALERT_CLOSE_ACTION = "com.bnyro.contacts.ALARM_ALERT_CLOSE_ACTION"
+        const val ACTION_EXTRA_KEY = "action"
+        const val CLOSE_ACTION = "CLOSE"
+        const val ACTION_EXTRA_REASON = "reason"
+        private const val windowFlags =
+            WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD or WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON or WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
+    }
+}
diff --git a/app/src/main/java/com/bnyro/contacts/ui/activities/MainActivity.kt b/app/src/main/java/com/bnyro/contacts/ui/activities/MainActivity.kt
index e465ea2c..1ec8e0d0 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/activities/MainActivity.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/activities/MainActivity.kt
@@ -1,21 +1,34 @@
 package com.bnyro.contacts.ui.activities
 
+import android.app.PendingIntent
+import android.app.TaskStackBuilder
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
-import android.os.Parcelable
 import android.provider.ContactsContract.Intents
 import android.provider.ContactsContract.QuickContact
 import androidx.activity.compose.setContent
-import com.bnyro.contacts.ext.parcelable
-import com.bnyro.contacts.obj.ContactData
-import com.bnyro.contacts.obj.ValueWithType
-import com.bnyro.contacts.ui.components.ConfirmImportContactsDialog
-import com.bnyro.contacts.ui.components.dialogs.AddToContactDialog
-import com.bnyro.contacts.ui.screens.MainAppContent
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.platform.LocalContext
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.navigation.HomeRoutes
+import com.bnyro.contacts.navigation.NavContainer
+import com.bnyro.contacts.navigation.NavRoutes
+import com.bnyro.contacts.presentation.features.AddToContactDialog
+import com.bnyro.contacts.presentation.features.ConfirmImportContactsDialog
 import com.bnyro.contacts.ui.theme.ConnectYouTheme
 import com.bnyro.contacts.util.BackupHelper
+import com.bnyro.contacts.util.BiometricAuthUtil
 import com.bnyro.contacts.util.ContactsHelper
+import com.bnyro.contacts.util.IntentHelper
+import com.bnyro.contacts.util.Preferences
+import com.bnyro.contacts.util.extension.parcelable
 import java.net.URLDecoder
 
 class MainActivity : BaseActivity() {
@@ -31,52 +44,121 @@ class MainActivity : BaseActivity() {
         contactsModel.initialContactId = getInitialContactId()
         contactsModel.initialContactData = getInsertContactData()
 
-        smsModel.initialAddressAndBody = getInitialSmsAddressAndBody()
-
+        val initialTabIndex = Preferences.getInt(Preferences.homeTabKey, 1)
         setContent {
             ConnectYouTheme(themeModel.themeMode) {
-                MainAppContent(smsModel)
-                getInsertOrEditNumber()?.let {
-                    AddToContactDialog(it)
+                val context = LocalContext.current
+
+                var authSuccess by rememberSaveable {
+                    mutableStateOf(!Preferences.getBoolean(Preferences.biometricAuthKey, false))
                 }
-                getSharedVcfUri()?.let {
-                    ConfirmImportContactsDialog(contactsModel, it)
+
+                if (authSuccess) {
+                    NavContainer(HomeRoutes.all[initialTabIndex.coerceIn(0, 2)].route)
+
+                    getInsertOrEditNumber()?.let {
+                        var showAddToContactDialog by remember {
+                            mutableStateOf(true)
+                        }
+
+                       if (showAddToContactDialog) {
+                           AddToContactDialog(it) {
+                               showAddToContactDialog = false
+                           }
+                       }
+                    }
+                    getSharedVcfUri()?.let {
+                        ConfirmImportContactsDialog(contactsModel, it)
+                    }
                 }
+
+                LaunchedEffect(Unit) {
+                    if (authSuccess) return@LaunchedEffect
+
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                        BiometricAuthUtil.requestAuth(context) { success ->
+                            if (success) authSuccess = true
+                            else finish()
+                        }
+                    }
+                }
+            }
+        }
+        processIntent(intent)
+    }
+
+    override fun onNewIntent(intent: Intent) {
+        processIntent(intent)
+        super.onNewIntent(intent)
+    }
+
+    private fun processIntent(intent: Intent) {
+        val initialSmsAddressAndBody = getInitialSmsAddressAndBody()
+        if (initialSmsAddressAndBody != null) {
+            openSMSThread(initialSmsAddressAndBody.first, initialSmsAddressAndBody.second)
+        }
+
+        var number: String? = null
+        if (intent.action == Intent.ACTION_INSERT_OR_EDIT) {
+            number = intent.getStringExtra(Intents.Insert.PHONE)
+        } else if (intent.action == Intent.ACTION_DIAL || intent.action == Intent.ACTION_VIEW) {
+            if (intent.data?.scheme == "tel") {
+                number = intent.data?.schemeSpecificPart
+            }
+        }
+        if (number != null) openDialPad(number)
+
+        var address: String? = null
+        if (intent.action == Intent.ACTION_INSERT_OR_EDIT) {
+            address = intent.getStringExtra(Intents.Insert.PHONE)
+        } else if (intent.action == Intent.ACTION_DIAL || intent.action == Intent.ACTION_VIEW) {
+            if (intent.data?.scheme == "sms") {
+                address = intent.data?.schemeSpecificPart
             }
         }
+        if (address != null) openSMSThread(address, null)
+    }
+
+    private fun openDialPad(number: String) {
+        val deepLinkIntent = Intent(
+            HomeRoutes.Phone.navAction,
+            HomeRoutes.Phone.getDeepLink(number),
+            this,
+            MainActivity::class.java
+        )
+
+        val deepLinkPendingIntent: PendingIntent? = TaskStackBuilder.create(this).run {
+            addNextIntentWithParentStack(deepLinkIntent)
+            getPendingIntent(
+                10,
+                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+            )
+        }
+        deepLinkPendingIntent?.send()
+    }
+
+    private fun openSMSThread(address: String, body: String?) {
+        val deepLinkIntent = Intent(
+            NavRoutes.MessageThread.navAction,
+            NavRoutes.MessageThread.getDeepLink(address, body),
+            this,
+            MainActivity::class.java
+        )
+
+        val deepLinkPendingIntent: PendingIntent? = TaskStackBuilder.create(this).run {
+            addNextIntentWithParentStack(deepLinkIntent)
+            getPendingIntent(
+                11,
+                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+            )
+        }
+        deepLinkPendingIntent?.send()
     }
 
     private fun getInsertContactData(): ContactData? {
         return when {
             intent?.action == Intent.ACTION_INSERT -> {
-                val name = intent.getStringExtra(Intents.Insert.NAME)
-                    ?: intent.getStringExtra(Intents.Insert.PHONETIC_NAME)
-                ContactData(
-                    displayName = name,
-                    firstName = name?.split(" ")?.firstOrNull(),
-                    surName = name?.split(" ", limit = 2)?.lastOrNull(),
-                    organization = intent.getStringExtra(Intents.Insert.COMPANY),
-                    numbers = listOfNotNull(
-                        intent.getStringExtra(Intents.Insert.PHONE)?.let {
-                            ValueWithType(it, 0)
-                        }
-                    ),
-                    emails = listOfNotNull(
-                        intent.getStringExtra(Intents.Insert.EMAIL)?.let {
-                            ValueWithType(it, 0)
-                        }
-                    ),
-                    notes = listOfNotNull(
-                        intent.getStringExtra(Intents.Insert.NOTES)?.let {
-                            ValueWithType(it, 0)
-                        }
-                    ),
-                    addresses = listOfNotNull(
-                        intent.getStringExtra(Intents.Insert.POSTAL)?.let {
-                            ValueWithType(it, 0)
-                        }
-                    )
-                )
+                IntentHelper.extractContactFromIntent(intent)
             }
 
             intent?.getStringExtra("action") == "create" -> ContactData()
@@ -101,9 +183,7 @@ class MainActivity : BaseActivity() {
     private fun getInitialSmsAddressAndBody(): Pair<String, String?>? {
         if (intent?.action !in smsSendIntents || intent?.type in BackupHelper.vCardMimeTypes) return null
 
-        val address = intent?.dataString
-            ?.split(":")
-            ?.lastOrNull()
+        val address = intent?.data?.schemeSpecificPart
             // the number is url encoded and hence must be decoded first
             ?.let { URLDecoder.decode(it, "UTF-8") }
             ?: return null
diff --git a/app/src/main/java/com/bnyro/contacts/ui/activities/PickContactActivity.kt b/app/src/main/java/com/bnyro/contacts/ui/activities/PickContactActivity.kt
index 11715fca..1dae3654 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/activities/PickContactActivity.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/activities/PickContactActivity.kt
@@ -31,9 +31,9 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.bnyro.contacts.R
-import com.bnyro.contacts.enums.SortOrder
-import com.bnyro.contacts.obj.ContactData
-import com.bnyro.contacts.ui.components.ContactItem
+import com.bnyro.contacts.domain.enums.SortOrder
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.presentation.screens.contacts.components.ContactItem
 import com.bnyro.contacts.ui.theme.ConnectYouTheme
 
 class PickContactActivity : BaseActivity() {
@@ -72,7 +72,7 @@ class PickContactActivity : BaseActivity() {
                             LazyColumn(
                                 modifier = Modifier.weight(1f)
                             ) {
-                                items(contactsModel.contacts) {
+                                items(contactsModel.contacts, key = ContactData::contactId) {
                                     ContactItem(
                                         modifier = Modifier.padding(horizontal = 10.dp),
                                         contact = it,
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/NumberPickerDialog.kt b/app/src/main/java/com/bnyro/contacts/ui/components/NumberPickerDialog.kt
deleted file mode 100644
index 287392d0..00000000
--- a/app/src/main/java/com/bnyro/contacts/ui/components/NumberPickerDialog.kt
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.bnyro.contacts.ui.components
-
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Send
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.lifecycle.viewmodel.compose.viewModel
-import com.bnyro.contacts.R
-import com.bnyro.contacts.enums.SortOrder
-import com.bnyro.contacts.ui.components.base.ClickableIcon
-import com.bnyro.contacts.ui.components.dialogs.DialogButton
-import com.bnyro.contacts.ui.models.ContactsModel
-
-@Composable
-fun NumberPickerDialog(
-    onDismissRequest: () -> Unit,
-    onNumberSelect: (number: String) -> Unit
-) {
-    val contactsModel: ContactsModel = viewModel()
-
-    var numbersToSelectFrom by remember {
-        mutableStateOf(listOf<String>())
-    }
-
-    AlertDialog(
-        onDismissRequest = onDismissRequest,
-        confirmButton = {
-            DialogButton(text = stringResource(R.string.cancel)) {
-                onDismissRequest.invoke()
-            }
-        },
-        title = {
-            Text(stringResource(R.string.pick_contact))
-        },
-        text = {
-            LazyColumn {
-                item {
-                    var numberInput by remember {
-                        mutableStateOf("")
-                    }
-                    Row(
-                        modifier = Modifier.fillMaxWidth(),
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        OutlinedTextField(
-                            modifier = Modifier.weight(1f),
-                            value = numberInput,
-                            onValueChange = { numberInput = it },
-                            label = {
-                                Text(stringResource(R.string.phone_number))
-                            }
-                        )
-                        ClickableIcon(
-                            modifier = Modifier.padding(top = 3.dp),
-                            icon = Icons.Default.Send
-                        ) {
-                            onNumberSelect.invoke(numberInput)
-                        }
-                    }
-                    Spacer(modifier = Modifier.height(10.dp))
-                }
-                items(contactsModel.contacts.filter { it.numbers.isNotEmpty() }) {
-                    ContactItem(
-                        contact = it,
-                        sortOrder = SortOrder.FIRSTNAME,
-                        selected = false,
-                        onSinglePress = {
-                            if (it.numbers.size > 1) {
-                                numbersToSelectFrom = it.numbers.map { num -> num.value }
-                                return@ContactItem true
-                            }
-
-                            onNumberSelect.invoke(it.numbers.first().value)
-                            onDismissRequest.invoke()
-                            true
-                        },
-                        onLongPress = {}
-                    )
-                }
-            }
-        }
-    )
-
-    if (numbersToSelectFrom.isNotEmpty()) {
-        AlertDialog(
-            onDismissRequest = { numbersToSelectFrom = emptyList() },
-            text = {
-                LazyColumn {
-                    items(numbersToSelectFrom) {
-                        ClickableText(text = it) {
-                            onNumberSelect.invoke(it)
-                            numbersToSelectFrom = emptyList()
-                            onDismissRequest.invoke()
-                        }
-                    }
-                }
-            },
-            confirmButton = {
-                DialogButton(stringResource(R.string.cancel)) {
-                    numbersToSelectFrom = emptyList()
-                }
-            }
-        )
-    }
-}
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/TopBarMoreMenu.kt b/app/src/main/java/com/bnyro/contacts/ui/components/TopBarMoreMenu.kt
deleted file mode 100644
index 5abfcd39..00000000
--- a/app/src/main/java/com/bnyro/contacts/ui/components/TopBarMoreMenu.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.bnyro.contacts.ui.components
-
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.MoreVert
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.res.stringResource
-import com.bnyro.contacts.R
-import com.bnyro.contacts.ui.components.base.ClickableIcon
-import com.bnyro.contacts.ui.components.base.OptionMenu
-import com.bnyro.contacts.ui.screens.AboutScreen
-import com.bnyro.contacts.ui.screens.SettingsScreen
-
-@Composable
-fun TopBarMoreMenu(
-    extraOptions: List<String> = emptyList(),
-    onExtraOptionClick: (Int) -> Unit = {}
-) {
-    var showSettings by remember {
-        mutableStateOf(false)
-    }
-
-    var showAbout by remember {
-        mutableStateOf(false)
-    }
-
-    var expandedOptions by remember {
-        mutableStateOf(false)
-    }
-
-    ClickableIcon(
-        icon = Icons.Default.MoreVert,
-        contentDescription = R.string.more
-    ) {
-        expandedOptions = !expandedOptions
-    }
-
-    val options = extraOptions + listOf(
-        stringResource(R.string.settings),
-        stringResource(R.string.about)
-    )
-    OptionMenu(
-        expanded = expandedOptions,
-        options = options,
-        onDismissRequest = {
-            expandedOptions = false
-        },
-        onSelect = {
-            when (it) {
-                options.size - 2 -> showSettings = true
-                options.size - 1 -> showAbout = true
-                else -> onExtraOptionClick(it)
-            }
-            expandedOptions = false
-        }
-    )
-
-    if (showSettings) {
-        SettingsScreen {
-            showSettings = false
-        }
-    }
-
-    if (showAbout) {
-        AboutScreen {
-            showAbout = false
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/prefs/BlockPreference.kt b/app/src/main/java/com/bnyro/contacts/ui/components/prefs/BlockPreference.kt
deleted file mode 100644
index 060c620b..00000000
--- a/app/src/main/java/com/bnyro/contacts/ui/components/prefs/BlockPreference.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.bnyro.contacts.ui.components.prefs
-
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.zIndex
-import com.bnyro.contacts.util.rememberPreference
-
-@Composable
-fun BlockPreference(
-    preferenceKey: String,
-    entries: List<String>,
-    onSelectionChange: (Int) -> Unit = {}
-) {
-    Column(
-        modifier = Modifier
-            .padding(vertical = 8.dp)
-    ) {
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-        ) {
-            val cornerRadius = 20.dp
-
-            var selectedItem by rememberPreference(key = preferenceKey, defaultValue = 0)
-
-            entries.forEachIndexed { index, entry ->
-                val startRadius = if (index != 0) 0.dp else cornerRadius
-                val endRadius = if (index == entries.size - 1) cornerRadius else 0.dp
-
-                OutlinedButton(
-                    onClick = {
-                        selectedItem = index
-                        onSelectionChange.invoke(index)
-                    },
-                    modifier = Modifier
-                        .offset(if (index == 0) 0.dp else (-1 * index).dp, 0.dp)
-                        .zIndex(if (selectedItem == index) 1f else 0f),
-                    shape = RoundedCornerShape(
-                        topStart = startRadius,
-                        topEnd = endRadius,
-                        bottomStart = startRadius,
-                        bottomEnd = endRadius
-                    ),
-                    border = BorderStroke(
-                        1.dp,
-                        if (selectedItem == index) {
-                            MaterialTheme.colorScheme.primary
-                        } else {
-                            MaterialTheme.colorScheme.primary.copy(alpha = 0.75f)
-                        }
-                    ),
-                    colors = if (selectedItem == index) {
-                        ButtonDefaults.outlinedButtonColors(
-                            containerColor = MaterialTheme.colorScheme.primary.copy(alpha = 0.2f),
-                            contentColor = MaterialTheme.colorScheme.primary
-                        )
-                    } else {
-                        ButtonDefaults.outlinedButtonColors(
-                            containerColor = MaterialTheme.colorScheme.surface,
-                            contentColor = MaterialTheme.colorScheme.onSurface
-                        )
-                    }
-                ) {
-                    Text(entry)
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/prefs/EncryptBackupsPref.kt b/app/src/main/java/com/bnyro/contacts/ui/components/prefs/EncryptBackupsPref.kt
deleted file mode 100644
index f4f9a101..00000000
--- a/app/src/main/java/com/bnyro/contacts/ui/components/prefs/EncryptBackupsPref.kt
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.bnyro.contacts.ui.components.prefs
-
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Visibility
-import androidx.compose.material.icons.filled.VisibilityOff
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Button
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.text.input.PasswordVisualTransformation
-import androidx.compose.ui.text.input.VisualTransformation
-import androidx.compose.ui.unit.dp
-import com.bnyro.contacts.R
-import com.bnyro.contacts.ui.components.base.ClickableIcon
-import com.bnyro.contacts.ui.components.dialogs.DialogButton
-import com.bnyro.contacts.util.BackupHelper
-import com.bnyro.contacts.util.PasswordUtils
-import com.bnyro.contacts.util.Preferences
-
-@Composable
-fun EncryptBackupsPref() {
-    var encryptBackups by remember { mutableStateOf(BackupHelper.encryptBackups) }
-    var showBackupPasswordDialog by remember { mutableStateOf(false) }
-
-    SwitchPref(
-        prefKey = Preferences.encryptBackupsKey,
-        title = stringResource(R.string.encrypt_backups)
-    ) {
-        encryptBackups = it
-        if (it) {
-            Preferences.edit {
-                putString(Preferences.encryptBackupPasswordKey, PasswordUtils.randomString(12))
-            }
-        }
-    }
-    AnimatedVisibility(encryptBackups) {
-        Button(
-            onClick = { showBackupPasswordDialog = true },
-            modifier = Modifier.padding(vertical = 0.dp)
-        ) {
-            Text(stringResource(R.string.backup_password))
-        }
-    }
-
-    if (showBackupPasswordDialog) {
-        var password by remember {
-            mutableStateOf(
-                Preferences.getString(Preferences.encryptBackupPasswordKey, "").orEmpty()
-            )
-        }
-        var passwordVisible by remember { mutableStateOf(false) }
-        AlertDialog(
-            onDismissRequest = { showBackupPasswordDialog = false },
-            confirmButton = {
-                DialogButton(text = stringResource(R.string.okay)) {
-                    Preferences.edit { putString(Preferences.encryptBackupPasswordKey, password) }
-                    showBackupPasswordDialog = false
-                }
-            },
-            dismissButton = {
-                DialogButton(text = stringResource(R.string.cancel)) {
-                    showBackupPasswordDialog = false
-                }
-            },
-            title = {
-                Text(stringResource(R.string.backup_password))
-            },
-            text = {
-                OutlinedTextField(
-                    value = password,
-                    onValueChange = { password = it },
-                    visualTransformation = if (passwordVisible) {
-                        VisualTransformation.None
-                    } else {
-                        PasswordVisualTransformation()
-                    },
-                    keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password),
-                    trailingIcon = {
-                        val image = if (passwordVisible) {
-                            Icons.Filled.Visibility
-                        } else {
-                            Icons.Filled.VisibilityOff
-                        }
-                        ClickableIcon(
-                            icon = image,
-                            onClick = { passwordVisible = !passwordVisible }
-                        )
-                    }
-                )
-            }
-        )
-    }
-}
diff --git a/app/src/main/java/com/bnyro/contacts/ui/screens/AboutScreen.kt b/app/src/main/java/com/bnyro/contacts/ui/screens/AboutScreen.kt
deleted file mode 100644
index f2aaa9ea..00000000
--- a/app/src/main/java/com/bnyro/contacts/ui/screens/AboutScreen.kt
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.bnyro.contacts.ui.screens
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
-import androidx.compose.material3.Divider
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.bnyro.contacts.BuildConfig
-import com.bnyro.contacts.R
-import com.bnyro.contacts.ui.components.about.AboutRow
-import com.bnyro.contacts.ui.components.base.ClickableIcon
-import com.bnyro.contacts.ui.components.base.FullScreenDialog
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun AboutScreen(onDismissRequest: () -> Unit) {
-    FullScreenDialog(onClose = onDismissRequest) {
-        Scaffold(
-            topBar = {
-                TopAppBar(
-                    title = {
-                        Text(stringResource(R.string.about))
-                    },
-                    navigationIcon = {
-                        ClickableIcon(
-                            icon = Icons.Default.ArrowBack,
-                            contentDescription = R.string.okay
-                        ) {
-                            onDismissRequest.invoke()
-                        }
-                    }
-                )
-            }
-        ) { pV ->
-            Column(
-                modifier = Modifier.padding(pV),
-                horizontalAlignment = Alignment.CenterHorizontally
-            ) {
-                Image(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(210.dp),
-                    painter = painterResource(R.drawable.ic_launcher_foreground),
-                    contentDescription = null
-                )
-                Divider(
-                    modifier = Modifier.fillMaxWidth()
-                        .height(2.dp)
-                )
-                Spacer(Modifier.height(10.dp))
-                AboutRow(
-                    title = stringResource(R.string.version),
-                    summary = "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})"
-                )
-                AboutRow(
-                    title = "GitHub",
-                    url = "https://github.com/you-apps/ConnectYou/"
-                )
-                AboutRow(
-                    title = stringResource(R.string.author),
-                    summary = "You Apps",
-                    url = "https://github.com/you-apps/"
-                )
-                AboutRow(
-                    title = stringResource(R.string.translation),
-                    summary = "Weblate",
-                    url = "https://hosted.weblate.org/projects/you-apps/connect-you/"
-                )
-                AboutRow(
-                    title = stringResource(R.string.license),
-                    summary = "GPL-3.0",
-                    url = "https://www.gnu.org/licenses/gpl-3.0.html"
-                )
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/com/bnyro/contacts/ui/screens/MainAppContent.kt b/app/src/main/java/com/bnyro/contacts/ui/screens/MainAppContent.kt
deleted file mode 100644
index 37db326f..00000000
--- a/app/src/main/java/com/bnyro/contacts/ui/screens/MainAppContent.kt
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.bnyro.contacts.ui.screens
-
-import android.annotation.SuppressLint
-import androidx.compose.animation.Crossfade
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.Message
-import androidx.compose.material.icons.rounded.People
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.NavigationBar
-import androidx.compose.material3.NavigationBarItem
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableFloatStateOf
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clipToBounds
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
-import androidx.compose.ui.input.nestedscroll.NestedScrollSource
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.lifecycle.viewmodel.compose.viewModel
-import com.bnyro.contacts.R
-import com.bnyro.contacts.obj.NavBarItem
-import com.bnyro.contacts.ui.models.ContactsModel
-import com.bnyro.contacts.ui.models.SmsModel
-import com.bnyro.contacts.ui.models.ThemeModel
-import com.bnyro.contacts.util.Preferences
-
-@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
-@Composable
-fun MainAppContent(smsModel: SmsModel) {
-    val themeModel: ThemeModel = viewModel()
-    val contactsModel: ContactsModel = viewModel(factory = ContactsModel.Factory)
-
-    val bottomBarHeight = 80.dp
-    val bottomBarHeightPx = LocalDensity.current.run { bottomBarHeight.toPx() }
-    var bottomBarOffset by remember { mutableFloatStateOf(0f) }
-
-    val nestedScrollConnection = remember {
-        object : NestedScrollConnection {
-            override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
-                val newOffset = bottomBarOffset + available.y
-                bottomBarOffset = newOffset.coerceIn(-bottomBarHeightPx, 0f)
-                return Offset.Zero
-            }
-        }
-    }
-
-    val navItems = listOf(
-        NavBarItem(
-            stringResource(R.string.contacts),
-            Icons.Rounded.People
-        ),
-        NavBarItem(
-            stringResource(R.string.messages),
-            Icons.Rounded.Message
-        )
-    )
-
-    var currentPage by remember {
-        mutableIntStateOf(
-            smsModel.initialAddressAndBody?.let { 1 } ?: Preferences.getInt(
-                Preferences.homeTabKey,
-                0
-            )
-        )
-    }
-
-    Scaffold(
-        bottomBar = {
-            NavigationBar(
-                modifier = if (themeModel.collapsableBottomBar) {
-                    Modifier
-                        .clipToBounds()
-                        .height(
-                            LocalDensity.current.run {
-                                (bottomBarHeightPx + bottomBarOffset).toDp()
-                            }
-                        )
-                } else {
-                    Modifier
-                },
-                tonalElevation = 10.dp
-            ) {
-                navItems.forEachIndexed { index, navItem ->
-                    NavigationBarItem(
-                        selected = (index == currentPage),
-                        onClick = {
-                            currentPage = index
-                        },
-                        icon = {
-                            Icon(navItem.icon, null)
-                        },
-                        label = {
-                            Text(navItem.label)
-                        }
-                    )
-                }
-            }
-        }
-    ) { pV ->
-        Surface(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(pV),
-            color = MaterialTheme.colorScheme.background
-        ) {
-            Crossfade(targetState = currentPage, label = "crossfade pager") { index ->
-                val scrollConnectionIfEnabled = nestedScrollConnection.takeIf { themeModel.collapsableBottomBar }
-
-                when (index) {
-                    0 -> ContactsPage(scrollConnectionIfEnabled)
-
-                    1 -> SmsListScreen(smsModel, contactsModel, scrollConnectionIfEnabled)
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/com/bnyro/contacts/ui/screens/SettingsScreen.kt b/app/src/main/java/com/bnyro/contacts/ui/screens/SettingsScreen.kt
deleted file mode 100644
index 1f8481e7..00000000
--- a/app/src/main/java/com/bnyro/contacts/ui/screens/SettingsScreen.kt
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.bnyro.contacts.ui.screens
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
-import androidx.compose.material3.Divider
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.LargeTopAppBar
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.lifecycle.viewmodel.compose.viewModel
-import com.bnyro.contacts.R
-import com.bnyro.contacts.enums.ThemeMode
-import com.bnyro.contacts.ui.components.base.ClickableIcon
-import com.bnyro.contacts.ui.components.base.FullScreenDialog
-import com.bnyro.contacts.ui.components.prefs.AutoBackupPref
-import com.bnyro.contacts.ui.components.prefs.BlockPreference
-import com.bnyro.contacts.ui.components.prefs.EncryptBackupsPref
-import com.bnyro.contacts.ui.components.prefs.SettingsCategory
-import com.bnyro.contacts.ui.components.prefs.SwitchPref
-import com.bnyro.contacts.ui.models.SmsModel
-import com.bnyro.contacts.ui.models.ThemeModel
-import com.bnyro.contacts.util.Preferences
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun SettingsScreen(onDismissRequest: () -> Unit) {
-    val themeModel: ThemeModel = viewModel()
-    val smsModel: SmsModel = viewModel()
-
-    FullScreenDialog(onClose = onDismissRequest) {
-        val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(
-            rememberTopAppBarState()
-        )
-
-        Scaffold(
-            modifier = Modifier.nestedScroll((scrollBehavior.nestedScrollConnection)),
-            topBar = {
-                LargeTopAppBar(
-                    title = {
-                        Text(stringResource(R.string.settings))
-                    },
-                    navigationIcon = {
-                        ClickableIcon(
-                            icon = Icons.Default.ArrowBack,
-                            contentDescription = R.string.okay
-                        ) {
-                            onDismissRequest.invoke()
-                        }
-                    },
-                    scrollBehavior = scrollBehavior
-                )
-            }
-        ) { pV ->
-            val scrollState = rememberScrollState()
-
-            Column(
-                modifier = Modifier
-                    .padding(pV)
-                    .padding(horizontal = 16.dp)
-                    .verticalScroll(scrollState)
-            ) {
-                SettingsCategory(title = stringResource(R.string.appearance))
-                Text(stringResource(R.string.theme))
-                BlockPreference(
-                    preferenceKey = Preferences.themeKey,
-                    entries = listOf(R.string.system, R.string.light, R.string.dark, R.string.amoled).map {
-                        stringResource(it)
-                    }
-                ) {
-                    themeModel.themeMode = ThemeMode.fromInt(it)
-                }
-                SwitchPref(
-                    prefKey = Preferences.colorfulContactIconsKey,
-                    title = stringResource(R.string.colorful_contact_icons)
-                ) {
-                    themeModel.colorfulIcons = it
-                }
-                Divider(
-                    modifier = Modifier.padding(top = 12.dp, bottom = 8.dp),
-                    color = MaterialTheme.colorScheme.surfaceVariant
-                )
-                SettingsCategory(title = stringResource(R.string.messages))
-                SwitchPref(
-                    prefKey = Preferences.storeSmsLocallyKey,
-                    title = stringResource(R.string.private_sms_database),
-                    summary = stringResource(R.string.private_sms_database_desc)
-                ) {
-                    smsModel.refreshLocalSmsPreference()
-                }
-                Divider(
-                    modifier = Modifier.padding(top = 12.dp, bottom = 8.dp),
-                    color = MaterialTheme.colorScheme.surfaceVariant
-                )
-                SettingsCategory(title = stringResource(R.string.behavior))
-                Text(stringResource(R.string.start_tab))
-                BlockPreference(
-                    preferenceKey = Preferences.homeTabKey,
-                    entries = listOf(R.string.contacts, R.string.messages).map {
-                        stringResource(it)
-                    }
-                )
-                SwitchPref(
-                    prefKey = Preferences.collapseBottomBarKey,
-                    title = stringResource(R.string.collapse_bottom_bar)
-                ) {
-                    themeModel.collapsableBottomBar = it
-                }
-                Divider(
-                    modifier = Modifier.padding(top = 12.dp, bottom = 8.dp),
-                    color = MaterialTheme.colorScheme.surfaceVariant
-                )
-                AutoBackupPref()
-                EncryptBackupsPref()
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/com/bnyro/contacts/ui/screens/SmsListScreen.kt b/app/src/main/java/com/bnyro/contacts/ui/screens/SmsListScreen.kt
deleted file mode 100644
index 8d89e738..00000000
--- a/app/src/main/java/com/bnyro/contacts/ui/screens/SmsListScreen.kt
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.bnyro.contacts.ui.screens
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Edit
-import androidx.compose.material.icons.filled.Search
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.FloatingActionButton
-import androidx.compose.material3.Icon
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.res.stringResource
-import com.bnyro.contacts.R
-import com.bnyro.contacts.obj.SmsThread
-import com.bnyro.contacts.ui.components.NothingHere
-import com.bnyro.contacts.ui.components.NumberPickerDialog
-import com.bnyro.contacts.ui.components.SmsThreadItem
-import com.bnyro.contacts.ui.components.TopBarMoreMenu
-import com.bnyro.contacts.ui.components.base.ClickableIcon
-import com.bnyro.contacts.ui.models.ContactsModel
-import com.bnyro.contacts.ui.models.SmsModel
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun SmsListScreen(
-    smsModel: SmsModel,
-    contactsModel: ContactsModel,
-    scrollConnection: NestedScrollConnection?
-) {
-    var showNumberPicker by remember {
-        mutableStateOf(false)
-    }
-
-    var smsAddress by remember {
-        mutableStateOf<String?>(null)
-    }
-
-    var showSearch by remember {
-        mutableStateOf(false)
-    }
-
-    Scaffold(
-        topBar = {
-            TopAppBar(
-                title = {
-                    Text(text = stringResource(R.string.messages))
-                },
-                actions = {
-                    ClickableIcon(
-                        icon = Icons.Default.Search,
-                        contentDescription = R.string.search
-                    ) {
-                        showSearch = true
-                    }
-                    TopBarMoreMenu()
-                }
-            )
-        },
-        floatingActionButton = {
-            FloatingActionButton(
-                onClick = {
-                    showNumberPicker = true
-                }
-            ) {
-                Icon(Icons.Default.Edit, null)
-            }
-        }) { pv ->
-        val smsList by smsModel.smsList.collectAsState()
-        if (smsList.isNotEmpty()) {
-            val threadList = smsList.groupBy { it.threadId }
-                .map { (threadId, smsList) ->
-                    val address = smsList.first().address
-                    SmsThread(
-                        threadId = threadId,
-                        contactData = contactsModel.getContactByNumber(address),
-                        address = address,
-                        smsList = smsList
-                    )
-                }
-                .sortedBy { thread -> thread.smsList.maxOf { it.timestamp } }
-                .reversed()
-
-            LazyColumn(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .padding(pv)
-                    .let { modifier ->
-                        scrollConnection?.let { modifier.nestedScroll(it) } ?: modifier
-                    }
-            ) {
-                items(threadList) { thread ->
-                    SmsThreadItem(smsModel, thread)
-                }
-            }
-            if (showSearch) {
-                SmsSearchScreen(smsModel, threadList) {
-                    showSearch = false
-                }
-            }
-        } else {
-            Column(Modifier.padding(pv)) {
-                NothingHere()
-            }
-        }
-
-        if (showNumberPicker) {
-            NumberPickerDialog(
-                onDismissRequest = { showNumberPicker = false },
-                onNumberSelect = {
-                    smsAddress = it
-                }
-            )
-        }
-
-        smsAddress?.let {
-            val contactData = contactsModel.getContactByNumber(it)
-            SmsThreadScreen(smsModel, contactData, it) {
-                smsAddress = null
-            }
-        }
-
-        smsModel.initialAddressAndBody?.let {
-            val contactData = contactsModel.getContactByNumber(it.first)
-            SmsThreadScreen(smsModel, contactData, it.first) {
-                smsModel.initialAddressAndBody = null
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/com/bnyro/contacts/ui/screens/SmsThreadScreen.kt b/app/src/main/java/com/bnyro/contacts/ui/screens/SmsThreadScreen.kt
deleted file mode 100644
index 04e66684..00000000
--- a/app/src/main/java/com/bnyro/contacts/ui/screens/SmsThreadScreen.kt
+++ /dev/null
@@ -1,216 +0,0 @@
-package com.bnyro.contacts.ui.screens
-
-import android.annotation.SuppressLint
-import android.os.Build
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
-import androidx.compose.material.icons.filled.PersonAddAlt1
-import androidx.compose.material.icons.filled.Send
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.FilledIconButton
-import androidx.compose.material3.Icon
-import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.PlainTooltipBox
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.bnyro.contacts.R
-import com.bnyro.contacts.obj.ContactData
-import com.bnyro.contacts.ui.components.base.ClickableIcon
-import com.bnyro.contacts.ui.components.base.ElevatedTextInputField
-import com.bnyro.contacts.ui.components.base.FullScreenDialog
-import com.bnyro.contacts.ui.components.conversation.Messages
-import com.bnyro.contacts.ui.components.dialogs.AddToContactDialog
-import com.bnyro.contacts.ui.components.dialogs.ConfirmationDialog
-import com.bnyro.contacts.ui.models.SmsModel
-import com.bnyro.contacts.util.SmsUtil
-
-@SuppressLint("NewApi")
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun SmsThreadScreen(
-    smsModel: SmsModel,
-    contactData: ContactData?,
-    address: String,
-    initialText: String = "",
-    onClose: () -> Unit
-) {
-    val context = LocalContext.current
-
-    val allSmsList by smsModel.smsList.collectAsState()
-    val smsList = allSmsList.filter { it.address == address }
-    val subscriptions = remember {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
-            SmsUtil.getSubscriptions(context)
-        } else {
-            null
-        }
-    }
-
-    var showContactScreen by remember {
-        mutableStateOf(false)
-    }
-    var showAddToContactDialog by remember {
-        mutableStateOf(false)
-    }
-
-    FullScreenDialog(onClose = onClose) {
-        Scaffold(
-            topBar = {
-                TopAppBar(
-                    title = {
-                        val interactionSource = remember {
-                            MutableInteractionSource()
-                        }
-                        PlainTooltipBox(
-                            tooltip = { Text(address) }
-                        ) {
-                            Text(
-                                modifier = Modifier
-                                    .tooltipTrigger()
-                                    .clickable(interactionSource, null) {
-                                        if (contactData != null) showContactScreen = true
-                                    },
-                                text = contactData?.displayName ?: address
-                            )
-                        }
-                    },
-                    navigationIcon = {
-                        ClickableIcon(
-                            icon = Icons.Default.ArrowBack,
-                            contentDescription = R.string.okay
-                        ) {
-                            onClose.invoke()
-                        }
-                    },
-                    actions = {
-                        if (contactData == null) {
-                            ClickableIcon(icon = Icons.Default.PersonAddAlt1) {
-                                showAddToContactDialog = true
-                            }
-                        }
-                    }
-                )
-            }
-        ) { pV ->
-            Column(
-                modifier = Modifier
-                    .padding(pV)
-            ) {
-                val state = rememberLazyListState()
-                Messages(messages = smsList, scrollState = state, smsModel = smsModel)
-
-                Spacer(modifier = Modifier.height(10.dp))
-                if (subscriptions != null && subscriptions.size >= 2) {
-                    var currentSub by remember { mutableIntStateOf(0) }
-                    LaunchedEffect(Unit) {
-                        currentSub = 0
-                        smsModel.currentSubscription = subscriptions[currentSub]
-                    }
-                    Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End) {
-                        OutlinedButton(onClick = {
-                            currentSub = if (currentSub == 0) 1 else 0
-                            smsModel.currentSubscription = subscriptions[currentSub]
-                        }) {
-                            Text(
-                                text = "SIM ${subscriptions[currentSub].simSlotIndex + 1} - ${subscriptions[currentSub].displayName}"
-                            )
-                        }
-                    }
-                }
-                Row(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(start = 10.dp, end = 5.dp, bottom = 20.dp),
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    var showConfirmSendMultipleSmsDialog by remember {
-                        mutableStateOf(false)
-                    }
-
-                    var text by remember {
-                        mutableStateOf(initialText)
-                    }
-
-                    ElevatedTextInputField(
-                        modifier = Modifier.weight(1f),
-                        query = text,
-                        onQueryChange = { text = it },
-                        placeholder = stringResource(R.string.send)
-                    )
-
-                    Spacer(modifier = Modifier.width(8.dp))
-
-                    FilledIconButton(
-                        modifier = Modifier.size(48.dp),
-                        onClick = {
-                            if (text.isBlank()) return@FilledIconButton
-                            if (!SmsUtil.isShortEnoughForSms(text)) {
-                                showConfirmSendMultipleSmsDialog = true
-                                return@FilledIconButton
-                            }
-
-                            smsModel.sendSms(context, address, text)
-
-                            text = ""
-                        }
-                    ) {
-                        Icon(
-                            imageVector = Icons.Default.Send,
-                            contentDescription = stringResource(R.string.send)
-                        )
-                    }
-
-                    if (showConfirmSendMultipleSmsDialog) {
-                        ConfirmationDialog(
-                            onDismissRequest = { showConfirmSendMultipleSmsDialog = false },
-                            title = stringResource(R.string.message_too_long),
-                            text = stringResource(R.string.send_message_as_multiple)
-                        ) {
-                            SmsUtil.splitSmsText(text).forEach {
-                                smsModel.sendSms(context, address, it)
-                            }
-
-                            text = ""
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    if (showContactScreen && contactData != null) {
-        SingleContactScreen(contact = contactData) {
-            showContactScreen = false
-        }
-    }
-
-    if (showAddToContactDialog) {
-        AddToContactDialog(newNumber = address)
-    }
-}
diff --git a/app/src/main/java/com/bnyro/contacts/ui/theme/Theme.kt b/app/src/main/java/com/bnyro/contacts/ui/theme/Theme.kt
index 71adea1d..80dc12eb 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/theme/Theme.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/theme/Theme.kt
@@ -3,16 +3,23 @@ package com.bnyro.contacts.ui.theme
 import android.app.Activity
 import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material3.*
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.unit.dp
 import androidx.core.view.WindowCompat
-import com.bnyro.contacts.enums.ThemeMode
+import com.bnyro.contacts.domain.enums.ThemeMode
 
 private val DarkColorScheme = darkColorScheme(
     primary = Purple80,
@@ -62,7 +69,8 @@ fun ConnectYouTheme(
         SideEffect {
             val activity = view.context as Activity
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                activity.window.navigationBarColor = colorScheme.surfaceColorAtElevation(10.dp).toArgb()
+                activity.window.navigationBarColor =
+                    colorScheme.surfaceColorAtElevation(10.dp).toArgb()
                 activity.window.statusBarColor = colorScheme.background.toArgb()
                 WindowCompat.getInsetsController(
                     activity.window,
@@ -75,10 +83,13 @@ fun ConnectYouTheme(
             }
         }
     }
-
-    MaterialTheme(
-        colorScheme = colorScheme,
-        typography = Typography,
-        content = content
-    )
+    CompositionLocalProvider(LocalDarkTheme provides (darkTheme || amoledDark)) {
+        MaterialTheme(
+            colorScheme = colorScheme,
+            typography = Typography,
+            content = content
+        )
+    }
 }
+
+val LocalDarkTheme = compositionLocalOf { false }
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/util/BackupHelper.kt b/app/src/main/java/com/bnyro/contacts/util/BackupHelper.kt
index 8ce085b7..78bccc2f 100644
--- a/app/src/main/java/com/bnyro/contacts/util/BackupHelper.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/BackupHelper.kt
@@ -4,14 +4,15 @@ import android.content.Context
 import android.net.Uri
 import android.util.Log
 import androidx.documentfile.provider.DocumentFile
-import com.bnyro.contacts.repo.ContactsRepository
+import com.bnyro.contacts.domain.repositories.ContactsRepository
 
 object BackupHelper {
     val vCardMimeTypes = arrayOf("text/vcard", "text/x-vcard", "text/directory")
     val encryptBackups get() = Preferences.getBoolean(Preferences.encryptBackupsKey, false)
     val mimeType get() = if (encryptBackups) "application/zip" else "text/vcard"
     val openMimeTypes get() = if (encryptBackups) arrayOf("application/zip") else vCardMimeTypes
-    val backupFileName get() = if (encryptBackups) "contacts.zip" else "contacts.vcf"
+    val defaultBackupFileName get() = if (encryptBackups) "contacts.zip" else "contacts.vcf"
+    const val defaultBackupNamingScheme = "%s-backup-%d-%t"
 
     suspend fun backup(context: Context, contactsRepository: ContactsRepository) {
         val backupDirPref = Preferences.getString(Preferences.backupDirKey, "").takeIf {
@@ -21,10 +22,22 @@ object BackupHelper {
         val backupDir = DocumentFile.fromTreeUri(context, Uri.parse(backupDirPref)) ?: return
         val maxBackupAmount = Preferences.getString(Preferences.maxBackupAmountKey, "5")!!.toInt()
 
-        val dateTime = CalendarUtils.getCurrentDateTime()
+        var backupNamingScheme =
+            Preferences.getString(Preferences.backupNamingSchemeKey, defaultBackupNamingScheme)
+                ?: defaultBackupNamingScheme
 
+        // these are required for uniqueness and automatic backup deletion
+        if (!backupNamingScheme.contains("%s")
+            || !(backupNamingScheme.contains("%d") || backupNamingScheme.contains("%t"))
+        ) backupNamingScheme = defaultBackupNamingScheme
+
+        val backupType = contactsRepository.label.lowercase()
+        val (date, time) = CalendarUtils.getCurrentDateAndTime()
         val extension = if (encryptBackups) "zip" else "vcf"
-        val fullName = "${contactsRepository.label.lowercase()}-backup-$dateTime.$extension"
+        val fileName = backupNamingScheme.replace("%s", backupType)
+            .replace("%d", date)
+            .replace("%t", time)
+        val fullName = "${fileName}.$extension"
 
         runCatching {
             backupDir.findFile(fullName)?.delete()
@@ -41,11 +54,11 @@ object BackupHelper {
 
         // delete all the old backup files
         val backupFiles = backupDir.listFiles().filter {
-            it.name.orEmpty().startsWith(contactsRepository.label.lowercase())
+            it.name.orEmpty().contains(backupType)
         }
         if (backupFiles.size <= maxBackupAmount) return
 
-        backupFiles.sortedBy { it.name.orEmpty() }
+        backupFiles.sortedBy { it.lastModified() }
             .take(backupFiles.size - maxBackupAmount)
             .forEach { it.delete() }
     }
diff --git a/app/src/main/java/com/bnyro/contacts/util/BiometricAuthUtil.kt b/app/src/main/java/com/bnyro/contacts/util/BiometricAuthUtil.kt
new file mode 100644
index 00000000..4018161c
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/util/BiometricAuthUtil.kt
@@ -0,0 +1,48 @@
+package com.bnyro.contacts.util
+
+import android.content.Context
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.biometric.BiometricManager
+import androidx.biometric.BiometricPrompt
+import androidx.core.content.ContextCompat
+import com.bnyro.contacts.R
+import com.bnyro.contacts.ui.activities.BaseActivity
+
+object BiometricAuthUtil {
+    private const val ALLOWED_AUTHENTICATORS =
+        BiometricManager.Authenticators.BIOMETRIC_STRONG or
+                BiometricManager.Authenticators.BIOMETRIC_WEAK or
+                BiometricManager.Authenticators.DEVICE_CREDENTIAL
+
+    @RequiresApi(Build.VERSION_CODES.P)
+    fun requestAuth(context: Context, onResult: (Boolean) -> Unit) {
+        val executor = ContextCompat.getMainExecutor(context)
+
+        val biometricPrompt = BiometricPrompt(context as BaseActivity, executor,
+            object : BiometricPrompt.AuthenticationCallback() {
+                override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
+                    super.onAuthenticationError(errorCode, errString)
+                    onResult(false)
+                }
+
+                override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
+                    super.onAuthenticationSucceeded(result)
+                    onResult(true)
+                }
+
+                override fun onAuthenticationFailed() {
+                    super.onAuthenticationFailed()
+                    onResult(false)
+                }
+            }
+        )
+
+        val promptInfo = BiometricPrompt.PromptInfo.Builder()
+            .setTitle(context.getString(R.string.biometric_authentication))
+            .setAllowedAuthenticators(ALLOWED_AUTHENTICATORS)
+            .build()
+
+        biometricPrompt.authenticate(promptInfo)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/util/CalendarUtils.kt b/app/src/main/java/com/bnyro/contacts/util/CalendarUtils.kt
index c5ce5209..94195ed1 100644
--- a/app/src/main/java/com/bnyro/contacts/util/CalendarUtils.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/CalendarUtils.kt
@@ -9,21 +9,25 @@ object CalendarUtils {
     @SuppressLint("SimpleDateFormat")
     val isoDateFormat = SimpleDateFormat("yyyy-MM-dd")
 
+    @SuppressLint("SimpleDateFormat")
+    val isoTimeFormat = SimpleDateFormat("HH:mm:ss")
+
     @SuppressLint("SimpleDateFormat")
     val isoDateFormatWithoutYear = SimpleDateFormat("MM-dd")
 
     @SuppressLint("SimpleDateFormat")
-    val isoTimeFormat = SimpleDateFormat("yyyy-MM-dd-HH:mm:ss")
+    val isoDateTimeFormat = SimpleDateFormat("yyyy-MM-dd-HH:mm:ss")
     private val localizedFormat get() = DateFormat.getDateInstance()
 
     fun millisToDate(milliSeconds: Long, formatter: DateFormat = localizedFormat): String {
         val calendar = Calendar.getInstance()
         calendar.clear(Calendar.ZONE_OFFSET)
         calendar.timeInMillis = milliSeconds
+
         return formatter.format(calendar.time)
     }
 
-    fun dateToMillis(date: String) = isoDateFormat.parse(date)?.time
+    fun dateToMillis(date: String) = kotlin.runCatching { isoDateFormat.parse(date) }.getOrNull()?.time
 
     fun localizeIsoDate(isoDate: String): String {
         val isDateWithoutYear = isoDate.startsWith('-')
@@ -45,6 +49,12 @@ object CalendarUtils {
 
     fun getCurrentDateTime(): String {
         val calendar = Calendar.getInstance()
-        return isoTimeFormat.format(calendar.time)
+        return isoDateTimeFormat.format(calendar.time)
+    }
+
+    fun getCurrentDateAndTime(): Pair<String, String> {
+        val calendar = Calendar.getInstance()
+
+        return isoDateFormat.format(calendar.time) to isoTimeFormat.format(calendar.time)
     }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/util/ColorUtils.kt b/app/src/main/java/com/bnyro/contacts/util/ColorUtils.kt
index 2875b2ed..217bf367 100644
--- a/app/src/main/java/com/bnyro/contacts/util/ColorUtils.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/ColorUtils.kt
@@ -1,5 +1,23 @@
 package com.bnyro.contacts.util
 
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
+import kotlin.random.Random
+
+
 object ColorUtils {
-    fun getRandomColor(): Int = (Math.random() * 16777215).toInt() or (0xFF shl 24)
+    private val random = Random(System.currentTimeMillis())
+
+    fun getRandomMaterialColorPair(container: Color, content: Color): Pair<Color, Color> {
+        val hue = random.nextFloat() * 360
+        val color1 = getMaterialColorWithHue(container, hue)
+        val color2 = getMaterialColorWithHue(content, hue)
+        return Pair(color1, color2)
+    }
+
+    private fun getMaterialColorWithHue(original: Color, hue: Float): Color {
+        val hsv = FloatArray(3)
+        android.graphics.Color.colorToHSV(original.toArgb(), hsv)
+        return Color.hsv(hue, hsv[1], hsv[2])
+    }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/util/ContactsHelper.kt b/app/src/main/java/com/bnyro/contacts/util/ContactsHelper.kt
index 6f0e6573..eefba4e6 100644
--- a/app/src/main/java/com/bnyro/contacts/util/ContactsHelper.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/ContactsHelper.kt
@@ -1,30 +1,82 @@
 package com.bnyro.contacts.util
 
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.net.Uri
 import android.provider.ContactsContract
 import com.bnyro.contacts.R
-import com.bnyro.contacts.obj.ContactData
-import com.bnyro.contacts.obj.TranslatedType
+import com.bnyro.contacts.domain.enums.Addresses
+import com.bnyro.contacts.domain.enums.Emails
+import com.bnyro.contacts.domain.enums.Events
+import com.bnyro.contacts.domain.enums.Nickname
+import com.bnyro.contacts.domain.enums.Notes
+import com.bnyro.contacts.domain.enums.Numbers
+import com.bnyro.contacts.domain.enums.Organization
+import com.bnyro.contacts.domain.enums.Title
+import com.bnyro.contacts.domain.enums.Websites
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.domain.model.TranslatedType
 import com.google.i18n.phonenumbers.PhoneNumberUtil
 import ezvcard.parameter.AddressType
 import ezvcard.parameter.EmailType
 import ezvcard.parameter.TelephoneType
+import java.text.Normalizer
 
 object ContactsHelper {
+    private val REGEX_NORMALIZE = "\\p{InCombiningDiacriticalMarks}+".toRegex()
+
     val emailTypes = listOf(
-        TranslatedType(ContactsContract.CommonDataKinds.Email.TYPE_HOME, R.string.home, EmailType.HOME),
-        TranslatedType(ContactsContract.CommonDataKinds.Email.TYPE_WORK, R.string.work, EmailType.WORK),
-        TranslatedType(ContactsContract.CommonDataKinds.Email.TYPE_MOBILE, R.string.mobile, EmailType.PREF),
+        TranslatedType(
+            ContactsContract.CommonDataKinds.Email.TYPE_HOME,
+            R.string.home,
+            EmailType.HOME
+        ),
+        TranslatedType(
+            ContactsContract.CommonDataKinds.Email.TYPE_WORK,
+            R.string.work,
+            EmailType.WORK
+        ),
+        TranslatedType(
+            ContactsContract.CommonDataKinds.Email.TYPE_MOBILE,
+            R.string.mobile,
+            EmailType.PREF
+        ),
         TranslatedType(ContactsContract.CommonDataKinds.Email.TYPE_CUSTOM, R.string.custom),
         TranslatedType(ContactsContract.CommonDataKinds.Email.TYPE_OTHER, R.string.other)
     )
 
     val phoneNumberTypes = listOf(
-        TranslatedType(ContactsContract.CommonDataKinds.Phone.TYPE_HOME, R.string.home, TelephoneType.HOME),
-        TranslatedType(ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE, R.string.mobile, TelephoneType.CELL),
-        TranslatedType(ContactsContract.CommonDataKinds.Phone.TYPE_WORK, R.string.work, TelephoneType.WORK),
-        TranslatedType(ContactsContract.CommonDataKinds.Phone.TYPE_CAR, R.string.car, TelephoneType.CAR),
-        TranslatedType(ContactsContract.CommonDataKinds.Phone.TYPE_FAX_HOME, R.string.fax_home, TelephoneType.FAX),
-        TranslatedType(ContactsContract.CommonDataKinds.Phone.TYPE_FAX_WORK, R.string.fax_work, TelephoneType.FAX),
+        TranslatedType(
+            ContactsContract.CommonDataKinds.Phone.TYPE_HOME,
+            R.string.home,
+            TelephoneType.HOME
+        ),
+        TranslatedType(
+            ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE,
+            R.string.mobile,
+            TelephoneType.CELL
+        ),
+        TranslatedType(
+            ContactsContract.CommonDataKinds.Phone.TYPE_WORK,
+            R.string.work,
+            TelephoneType.WORK
+        ),
+        TranslatedType(
+            ContactsContract.CommonDataKinds.Phone.TYPE_CAR,
+            R.string.car,
+            TelephoneType.CAR
+        ),
+        TranslatedType(
+            ContactsContract.CommonDataKinds.Phone.TYPE_FAX_HOME,
+            R.string.fax_home,
+            TelephoneType.FAX
+        ),
+        TranslatedType(
+            ContactsContract.CommonDataKinds.Phone.TYPE_FAX_WORK,
+            R.string.fax_work,
+            TelephoneType.FAX
+        ),
         TranslatedType(
             ContactsContract.CommonDataKinds.Phone.TYPE_ASSISTANT,
             R.string.assistant
@@ -77,6 +129,11 @@ object ContactsHelper {
         TranslatedType(ContactsContract.CommonDataKinds.Website.TYPE_OTHER, R.string.other)
     )
 
+    val contactAttributesTypes = listOf(
+        Nickname(), Title(), Organization(),
+        Numbers(), Addresses(), Emails(), Events(), Websites(), Notes()
+    )
+
     fun splitFullName(displayName: String?): Pair<String, String> {
         val displayNameParts = displayName.orEmpty().split(" ")
         return when {
@@ -96,6 +153,12 @@ object ContactsHelper {
         }
     }
 
+    private fun normalizeText(text: String): String {
+        return Normalizer.normalize(text, Normalizer.Form.NFD)
+            .replace(REGEX_NORMALIZE, "")
+            .lowercase()
+    }
+
     fun normalizePhoneNumber(number: String): String {
         val phoneUtil = PhoneNumberUtil.getInstance()
         val phoneNumber = runCatching { phoneUtil.parse(number, null) }
@@ -104,25 +167,56 @@ object ContactsHelper {
     }
 
     fun matches(contactData: ContactData, query: String): Boolean {
-        val contactInfoStrings = listOf(contactData.numbers, contactData.emails, contactData.addresses, contactData.notes, contactData.websites, contactData.events)
+        val normalizedQuery = normalizeText(query)
+
+        val contactInfoStrings = listOf(
+            contactData.numbers,
+            contactData.emails,
+            contactData.addresses,
+            contactData.notes,
+            contactData.websites,
+            contactData.events
+        )
             .flatten()
-            .map { (value, _) -> value } + listOf(contactData.organization, contactData.nickName, contactData.displayName)
+            .map { (value, _) -> value } + listOf(
+            contactData.organization,
+            contactData.nickName,
+            contactData.displayName
+        )
 
         return contactInfoStrings.filterNotNull().any { str ->
-            str.lowercase().contains(query)
+            normalizeText(str).contains(normalizedQuery)
         }
     }
 
-    fun filter(contacts: List<ContactData>, searchQuery: String): List<ContactData> {
-        val query = searchQuery.lowercase()
-
-        return contacts.filter { matches(it, query) }
-    }
+    fun filter(contacts: List<ContactData>, searchQuery: String): List<ContactData> =
+        contacts.filter { matches(it, searchQuery) }
 
     fun isContactEmpty(contactData: ContactData): Boolean {
-        val stringProperties = listOf(contactData.firstName, contactData.surName, contactData.nickName, contactData.organization)
-        val listProperties = listOf(contactData.numbers, contactData.emails, contactData.events, contactData.addresses, contactData.notes)
+        val stringProperties = listOf(
+            contactData.firstName,
+            contactData.surName,
+            contactData.nickName,
+            contactData.organization
+        )
+        val listProperties = listOf(
+            contactData.numbers,
+            contactData.emails,
+            contactData.events,
+            contactData.addresses,
+            contactData.notes
+        )
 
         return stringProperties.none { !it.isNullOrBlank() } && listProperties.flatten().isEmpty()
     }
+
+    fun getContactPhotoThumbnail(context: Context, photoThumbnailUri: Uri): Bitmap? {
+        val contentResolver = context.contentResolver
+        val assetFileDescriptor =
+            contentResolver.openAssetFileDescriptor(photoThumbnailUri, "r") ?: return null
+        val fileDescriptor = assetFileDescriptor.fileDescriptor
+        val bitmap = BitmapFactory.decodeFileDescriptor(fileDescriptor)
+        assetFileDescriptor.close()
+        return bitmap
+    }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/util/ExportHelper.kt b/app/src/main/java/com/bnyro/contacts/util/ExportHelper.kt
index d868344e..ffb1d2a1 100644
--- a/app/src/main/java/com/bnyro/contacts/util/ExportHelper.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/ExportHelper.kt
@@ -4,17 +4,30 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.net.Uri
 import androidx.core.content.FileProvider
-import com.bnyro.contacts.ext.pmap
-import com.bnyro.contacts.obj.ContactData
-import com.bnyro.contacts.repo.ContactsRepository
-import java.io.File
+import com.bnyro.contacts.data.database.obj.SmsData
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.domain.model.SmsBackup
+import com.bnyro.contacts.domain.repositories.ContactsRepository
+import com.bnyro.contacts.domain.repositories.SmsRepository
+import com.bnyro.contacts.util.extension.pmap
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.decodeFromStream
+import kotlinx.serialization.json.encodeToStream
+import java.io.File
+import java.io.IOException
 
 class ExportHelper(
     private val context: Context,
     private val contactsRepository: ContactsRepository
 ) {
+    private val json = Json {
+        ignoreUnknownKeys = true
+        coerceInputValues = true
+        encodeDefaults = true
+    }
+
     private val contentResolver = context.contentResolver
     private val encryptBackups get() = Preferences.getBoolean(Preferences.encryptBackupsKey, false)
     private val password get() = Preferences.getString(
@@ -81,6 +94,24 @@ class ExportHelper(
         )
     }
 
+    suspend fun importSms(uri: Uri, smsRepository: SmsRepository) {
+        val smsList = context.contentResolver.openInputStream(uri)?.use { inputStream ->
+            json.decodeFromStream<List<SmsBackup>>(inputStream)
+        } ?: throw IOException()
+
+        for (sms in smsList) {
+            if (sms.backupType != "sms") continue
+
+            smsRepository.persistSms(context, sms.toSmsData())
+        }
+    }
+
+    suspend fun exportSms(uri: Uri, sms: List<SmsData>) {
+        context.contentResolver.openOutputStream(uri)?.use { outputStream ->
+            json.encodeToStream(sms.map(SmsData::toSmsBackup), outputStream)
+        }
+    }
+
     companion object {
         private const val CONTACTS_EXPORT_FILE_SUFFIX = "contacts-export"
     }
diff --git a/app/src/main/java/com/bnyro/contacts/util/IntentHelper.kt b/app/src/main/java/com/bnyro/contacts/util/IntentHelper.kt
index 2a6ee4ce..b0f0549d 100644
--- a/app/src/main/java/com/bnyro/contacts/util/IntentHelper.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/IntentHelper.kt
@@ -1,13 +1,26 @@
 package com.bnyro.contacts.util
 
 import android.content.ContentUris
+import android.content.ContentValues
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
+import android.provider.BlockedNumberContract
+import android.provider.BlockedNumberContract.BlockedNumbers
 import android.provider.ContactsContract
+import android.telecom.TelecomManager
+import android.widget.Toast
+import androidx.annotation.RequiresApi
 import androidx.core.net.toUri
 import com.bnyro.contacts.R
-import com.bnyro.contacts.enums.IntentActionType
+import com.bnyro.contacts.domain.enums.IntentActionType
+import com.bnyro.contacts.domain.enums.ListAttribute
+import com.bnyro.contacts.domain.enums.StringAttribute
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.domain.model.TranslatedType
+import com.bnyro.contacts.domain.model.ValueWithType
+
 
 object IntentHelper {
     fun launchAction(context: Context, type: IntentActionType, argument: String) {
@@ -67,4 +80,75 @@ object IntentHelper {
         val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
         context.startActivity(intent)
     }
+
+    fun extractContactFromIntent(intent: Intent): ContactData {
+        val name = intent.getStringExtra(ContactsContract.Intents.Insert.NAME)
+            ?: intent.getStringExtra(ContactsContract.Intents.Insert.PHONETIC_NAME)
+
+        val data = ContactData(
+            displayName = name,
+            firstName = name?.split(" ")?.firstOrNull(),
+            surName = name?.split(" ", limit = 2)?.lastOrNull(),
+        )
+
+        ContactsHelper.contactAttributesTypes.forEach { attribute ->
+            if (attribute is StringAttribute) {
+                attribute.set(data, intent.getStringExtra(attribute.insertKey))
+            } else if (attribute is ListAttribute) {
+                val values = attribute.insertKeys.mapNotNull { insertKey ->
+                    extractIntentValue(intent, insertKey.first, insertKey.second)
+                }
+                attribute.set(data, values)
+            }
+        }
+
+        return data
+    }
+
+    @RequiresApi(Build.VERSION_CODES.N)
+    fun openBlockedNumberManager(context: Context) {
+        val telecomManager = context.getSystemService(TelecomManager::class.java)
+        val intent = telecomManager.createManageBlockedNumbersIntent()
+        context.startActivity(intent)
+    }
+
+    @RequiresApi(Build.VERSION_CODES.N)
+    fun blockNumberOrAddress(context: Context, number: String) {
+        if (!BlockedNumberContract.canCurrentUserBlockNumbers(context)) {
+            Toast.makeText(
+                context,
+                context.getString(R.string.blocking_number_is_not_supported),
+                Toast.LENGTH_LONG
+            ).show()
+            return
+        }
+        val values = ContentValues().apply {
+            put(BlockedNumbers.COLUMN_ORIGINAL_NUMBER, number)
+        }
+        context.contentResolver.insert(BlockedNumbers.CONTENT_URI, values)
+        Toast.makeText(
+            context,
+            context.getString(R.string.number_blocked),
+            Toast.LENGTH_SHORT
+        ).show()
+    }
+
+    private fun extractIntentValue(
+        intent: Intent,
+        key: String,
+        typeKey: String? = null,
+        types: List<TranslatedType> = emptyList()
+    ): ValueWithType? {
+        val entry = intent.getStringExtra(key) ?: return null
+
+        val type = if (typeKey != null) {
+            val typeIdentifier = intent.getStringExtra(typeKey)
+
+            types.firstOrNull {
+                it.vcardType?.value?.uppercase() == typeIdentifier
+            }?.id
+        } else null
+
+        return ValueWithType(entry, type ?: 0)
+    }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/util/NotificationHelper.kt b/app/src/main/java/com/bnyro/contacts/util/NotificationHelper.kt
index 2e651257..87a62db3 100644
--- a/app/src/main/java/com/bnyro/contacts/util/NotificationHelper.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/NotificationHelper.kt
@@ -10,6 +10,7 @@ import com.bnyro.contacts.R
 
 object NotificationHelper {
     const val MESSAGES_CHANNEL_ID = "messages_channel"
+    const val CALL_CHANNEL_ID = "call_channel"
     val notificationPermissions = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
         arrayOf(Manifest.permission.POST_NOTIFICATIONS)
     } else {
@@ -26,8 +27,22 @@ object NotificationHelper {
             .setVibrationEnabled(true)
             .setLightColor(Color.WHITE)
             .build()
+        val callChannel = NotificationChannelCompat.Builder(
+            CALL_CHANNEL_ID,
+            NotificationManagerCompat.IMPORTANCE_HIGH
+        )
+            .setName(context.getString(R.string.calls))
+            .setLightsEnabled(true)
+            .setVibrationEnabled(true)
+            .setLightColor(Color.WHITE)
+            .build()
 
         val notificationManagerCompat = NotificationManagerCompat.from(context)
-        notificationManagerCompat.createNotificationChannelsCompat(listOf(messagesChannel))
+        notificationManagerCompat.createNotificationChannelsCompat(
+            listOf(
+                messagesChannel,
+                callChannel
+            )
+        )
     }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/util/PermissionHelper.kt b/app/src/main/java/com/bnyro/contacts/util/PermissionHelper.kt
index c6b05d62..899c144f 100644
--- a/app/src/main/java/com/bnyro/contacts/util/PermissionHelper.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/PermissionHelper.kt
@@ -3,26 +3,40 @@ package com.bnyro.contacts.util
 import android.app.Activity
 import android.content.Context
 import android.content.pm.PackageManager
+import android.os.Build
+import android.provider.BlockedNumberContract
+import android.provider.Telephony
+import android.telecom.TelecomManager
+import androidx.annotation.RequiresApi
 import androidx.core.app.ActivityCompat
+import androidx.core.content.getSystemService
 
 object PermissionHelper {
-    fun checkPermissions(context: Context, permissions: Array<String>): Boolean {
+    fun checkPermissions(activity: Activity, permissions: Array<String>): Boolean {
         if (permissions.isEmpty()) return true
-        if (!hasPermission(context, permissions.first())) {
-            ActivityCompat.requestPermissions(
-                context as Activity,
-                permissions,
-                1
-            )
+
+        if (!hasPermission(activity, *permissions)) {
+            ActivityCompat.requestPermissions(activity, permissions, 1)
             return false
         }
+
         return true
     }
 
-    fun hasPermission(context: Context, permission: String): Boolean {
-        return ActivityCompat.checkSelfPermission(
-            context,
-            permission
-        ) == PackageManager.PERMISSION_GRANTED
+    fun hasPermission(context: Context, vararg permissions: String): Boolean {
+        return permissions.all { permission ->
+            ActivityCompat.checkSelfPermission(
+                context,
+                permission
+            ) == PackageManager.PERMISSION_GRANTED
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.N)
+    fun canBlockNumbers(context: Context): Boolean {
+        if (!BlockedNumberContract.canCurrentUserBlockNumbers(context)) return false
+
+        return Telephony.Sms.getDefaultSmsPackage(context) == context.packageName ||
+                context.getSystemService<TelecomManager>()?.defaultDialerPackage == context.packageName
     }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/util/Preferences.kt b/app/src/main/java/com/bnyro/contacts/util/Preferences.kt
index 7464feea..6c232b8c 100644
--- a/app/src/main/java/com/bnyro/contacts/util/Preferences.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/Preferences.kt
@@ -7,8 +7,8 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.SnapshotMutationPolicy
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import com.bnyro.contacts.enums.BackupType
-import com.bnyro.contacts.obj.AccountType
+import com.bnyro.contacts.domain.enums.BackupType
+import com.bnyro.contacts.domain.model.AccountType
 
 object Preferences {
     private const val prefFile = "preferences"
@@ -19,6 +19,7 @@ object Preferences {
     const val themeKey = "theme"
     const val backupDirKey = "backupDir"
     const val backupTypeKey = "backupType"
+    const val backupNamingSchemeKey = "backupNamingScheme"
     const val sortOrderKey = "sorting"
     const val hiddenAccountsKey = "hiddenAccounts"
     const val backupIntervalKey = "backupInterval"
@@ -29,6 +30,8 @@ object Preferences {
     const val encryptBackupPasswordKey = "encryptBackupsPassword"
     const val storeSmsLocallyKey = "storeSmsLocally"
     const val lastChosenAccount = "lastChosenAccount"
+    const val biometricAuthKey = "biometricAuth"
+    const val favoritesOnlyKey = "favoritesOnly"
 
     fun init(context: Context) {
         preferences = context.getSharedPreferences(prefFile, Context.MODE_PRIVATE)
diff --git a/app/src/main/java/com/bnyro/contacts/util/RingtonePickContract.kt b/app/src/main/java/com/bnyro/contacts/util/RingtonePickContract.kt
new file mode 100644
index 00000000..1b9332d1
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/util/RingtonePickContract.kt
@@ -0,0 +1,26 @@
+package com.bnyro.contacts.util
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.media.RingtoneManager
+import android.net.Uri
+import androidx.activity.result.contract.ActivityResultContract
+import com.bnyro.contacts.R
+
+class RingtonePickContract : ActivityResultContract<Void?, Uri?>() {
+    override fun createIntent(context: Context, input: Void?): Intent {
+        return Intent(RingtoneManager.ACTION_RINGTONE_PICKER).apply {
+            putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, RingtoneManager.TYPE_RINGTONE)
+            putExtra(
+                RingtoneManager.EXTRA_RINGTONE_TITLE,
+                context.getString(R.string.select_custom_ringtone)
+            )
+        }
+    }
+
+    override fun parseResult(resultCode: Int, intent: Intent?): Uri? {
+        return intent.takeIf { resultCode == Activity.RESULT_OK }
+            ?.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/util/ShortcutsHelper.kt b/app/src/main/java/com/bnyro/contacts/util/ShortcutsHelper.kt
index 92b96c4f..2a9cb89b 100644
--- a/app/src/main/java/com/bnyro/contacts/util/ShortcutsHelper.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/ShortcutsHelper.kt
@@ -8,8 +8,8 @@ import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.drawable.IconCompat
 import com.bnyro.contacts.R
-import com.bnyro.contacts.enums.IntentActionType
-import com.bnyro.contacts.obj.ContactData
+import com.bnyro.contacts.domain.enums.IntentActionType
+import com.bnyro.contacts.domain.model.ContactData
 import com.bnyro.contacts.ui.activities.MainActivity
 
 object ShortcutHelper {
diff --git a/app/src/main/java/com/bnyro/contacts/util/SimContactsHelper.kt b/app/src/main/java/com/bnyro/contacts/util/SimContactsHelper.kt
index 8adb9f0f..37dbd984 100644
--- a/app/src/main/java/com/bnyro/contacts/util/SimContactsHelper.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/SimContactsHelper.kt
@@ -2,9 +2,9 @@ package com.bnyro.contacts.util
 
 import android.content.Context
 import android.net.Uri
-import com.bnyro.contacts.ext.stringValue
-import com.bnyro.contacts.obj.ContactData
-import com.bnyro.contacts.obj.ValueWithType
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.domain.model.ValueWithType
+import com.bnyro.contacts.util.extension.stringValue
 
 object SimContactsHelper {
     fun getSimContacts(context: Context): List<ContactData> {
diff --git a/app/src/main/java/com/bnyro/contacts/util/SmsUtil.kt b/app/src/main/java/com/bnyro/contacts/util/SmsUtil.kt
index 9c70dcf6..0eaa54f3 100644
--- a/app/src/main/java/com/bnyro/contacts/util/SmsUtil.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/SmsUtil.kt
@@ -12,7 +12,7 @@ import android.widget.Toast
 import androidx.annotation.RequiresApi
 import com.bnyro.contacts.App
 import com.bnyro.contacts.R
-import com.bnyro.contacts.db.obj.SmsData
+import com.bnyro.contacts.data.database.obj.SmsData
 import java.lang.Character.UnicodeBlock
 import java.util.Calendar
 
diff --git a/app/src/main/java/com/bnyro/contacts/util/VcardHelper.kt b/app/src/main/java/com/bnyro/contacts/util/VcardHelper.kt
index e90692a4..2877fbfc 100644
--- a/app/src/main/java/com/bnyro/contacts/util/VcardHelper.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/VcardHelper.kt
@@ -2,8 +2,8 @@ package com.bnyro.contacts.util
 
 import android.graphics.BitmapFactory
 import android.provider.ContactsContract
-import com.bnyro.contacts.obj.ContactData
-import com.bnyro.contacts.obj.ValueWithType
+import com.bnyro.contacts.domain.model.ContactData
+import com.bnyro.contacts.domain.model.ValueWithType
 import ezvcard.Ezvcard
 import ezvcard.VCard
 import ezvcard.VCardVersion
@@ -17,7 +17,7 @@ import ezvcard.property.Birthday
 import ezvcard.property.FormattedName
 import ezvcard.property.Photo
 import ezvcard.property.StructuredName
-import java.util.Date
+import ezvcard.util.PartialDate
 
 object VcardHelper {
     fun exportVcard(contacts: List<ContactData>): String {
@@ -74,20 +74,19 @@ object VcardHelper {
                     addNote(note.value)
                 }
             }
-            contact.events.forEach { event ->
-                when (event.type) {
-                    ContactsContract.CommonDataKinds.Event.TYPE_BIRTHDAY -> {
-                        CalendarUtils.dateToMillis(event.value)?.let { time ->
-                            birthday = Birthday(Date(time))
+            contact.events
+                .filter { it.value.isNotBlank() }
+                .forEach { event ->
+                    when (event.type) {
+                        ContactsContract.CommonDataKinds.Event.TYPE_BIRTHDAY -> {
+                            birthday = Birthday(PartialDate.parse(event.value))
                         }
-                    }
-                    ContactsContract.CommonDataKinds.Event.TYPE_ANNIVERSARY -> {
-                        CalendarUtils.dateToMillis(event.value)?.let { time ->
-                            anniversary = Anniversary(Date(time))
+
+                        ContactsContract.CommonDataKinds.Event.TYPE_ANNIVERSARY -> {
+                            anniversary = Anniversary(PartialDate.parse(event.value))
                         }
                     }
                 }
-            }
             (contact.photo ?: contact.thumbnail)?.let {
                 val photo = Photo(ImageHelper.bitmapToByteArray(it), ImageType.PNG)
                 addPhoto(photo)
@@ -146,12 +145,18 @@ object VcardHelper {
                 },
                 events = it.anniversaries.map { anniversary ->
                     ValueWithType(
-                        CalendarUtils.millisToDate(anniversary.date.time, formatter = CalendarUtils.isoDateFormat),
+                        CalendarUtils.millisToDate(
+                            anniversary.date.time,
+                            formatter = CalendarUtils.isoDateFormat
+                        ),
                         ContactsContract.CommonDataKinds.Event.TYPE_BIRTHDAY
                     )
                 } + it.birthdays.map { birthday ->
                     ValueWithType(
-                        CalendarUtils.millisToDate(birthday.date.time, formatter = CalendarUtils.isoDateFormat),
+                        CalendarUtils.millisToDate(
+                            birthday.date.time,
+                            formatter = CalendarUtils.isoDateFormat
+                        ),
                         ContactsContract.CommonDataKinds.Event.TYPE_ANNIVERSARY
                     )
                 },
diff --git a/app/src/main/java/com/bnyro/contacts/ext/Cursor.kt b/app/src/main/java/com/bnyro/contacts/util/extension/Cursor.kt
similarity index 77%
rename from app/src/main/java/com/bnyro/contacts/ext/Cursor.kt
rename to app/src/main/java/com/bnyro/contacts/util/extension/Cursor.kt
index 3d605c28..efb99d8b 100644
--- a/app/src/main/java/com/bnyro/contacts/ext/Cursor.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/extension/Cursor.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ext
+package com.bnyro.contacts.util.extension
 
 import android.database.Cursor
 import androidx.core.database.getIntOrNull
@@ -16,3 +16,7 @@ fun Cursor.intValue(index: String): Int? {
 fun Cursor.longValue(index: String): Long? {
     return getLongOrNull(getColumnIndex(index))
 }
+
+fun Cursor.boolValue(index: String): Boolean? {
+    return intValue(index)?.let { it == 1 }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/util/extension/DigitsToWords.kt b/app/src/main/java/com/bnyro/contacts/util/extension/DigitsToWords.kt
new file mode 100644
index 00000000..81aa981d
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/util/extension/DigitsToWords.kt
@@ -0,0 +1,38 @@
+package com.bnyro.contacts.util.extension
+
+val digitsToWordsMap = mapOf(
+    '2' to arrayOf('A', 'B', 'C'),
+    '3' to arrayOf('D', 'E', 'F'),
+    '4' to arrayOf('G', 'H', 'I'),
+    '5' to arrayOf('J', 'K', 'L'),
+    '6' to arrayOf('M', 'N', 'O'),
+    '7' to arrayOf('P', 'Q', 'R', 'S'),
+    '8' to arrayOf('T', 'U', 'V'),
+    '9' to arrayOf('W', 'X', 'Y', 'Z')
+)
+
+fun letterCombinations(digits: String): List<String> {
+    if (digits.isEmpty()) return emptyList()
+    if (digits.contains(Regex("[01+#*]"))) return emptyList()
+    val arrays = digits.map { digitsToWordsMap[it]!! }
+    return getPossibleStrings(arrays)
+}
+
+private fun getPossibleStrings(arrays: List<Array<Char>>): List<String> {
+    if (arrays.isEmpty()) return emptyList()
+    val result = mutableListOf<String>()
+
+    // Create a tree of depth [arrays.size] and return the result from the leaf node
+    fun backtrack(index: Int, currentString: String) {
+        if (index == arrays.size) {
+            result.add(currentString)
+            return
+        }
+        for (char in arrays[index]) {
+            backtrack(index + 1, currentString + char)
+        }
+    }
+
+    backtrack(0, "")
+    return result
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/ext/NotAName.kt b/app/src/main/java/com/bnyro/contacts/util/extension/NotAName.kt
similarity index 77%
rename from app/src/main/java/com/bnyro/contacts/ext/NotAName.kt
rename to app/src/main/java/com/bnyro/contacts/util/extension/NotAName.kt
index f3c960c6..474598c4 100644
--- a/app/src/main/java/com/bnyro/contacts/ext/NotAName.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/extension/NotAName.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ext
+package com.bnyro.contacts.util.extension
 
 fun String?.notAName(): Boolean {
     this ?: return true
diff --git a/app/src/main/java/com/bnyro/contacts/ext/Parcelable.kt b/app/src/main/java/com/bnyro/contacts/util/extension/Parcelable.kt
similarity index 82%
rename from app/src/main/java/com/bnyro/contacts/ext/Parcelable.kt
rename to app/src/main/java/com/bnyro/contacts/util/extension/Parcelable.kt
index 3f827a1b..84da213a 100644
--- a/app/src/main/java/com/bnyro/contacts/ext/Parcelable.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/extension/Parcelable.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ext
+package com.bnyro.contacts.util.extension
 
 import android.content.Intent
 import androidx.core.content.IntentCompat
diff --git a/app/src/main/java/com/bnyro/contacts/ext/Pmap.kt b/app/src/main/java/com/bnyro/contacts/util/extension/Pmap.kt
similarity index 85%
rename from app/src/main/java/com/bnyro/contacts/ext/Pmap.kt
rename to app/src/main/java/com/bnyro/contacts/util/extension/Pmap.kt
index c5436d6f..2f5ea677 100644
--- a/app/src/main/java/com/bnyro/contacts/ext/Pmap.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/extension/Pmap.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ext
+package com.bnyro.contacts.util.extension
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
diff --git a/app/src/main/java/com/bnyro/contacts/util/extension/String.kt b/app/src/main/java/com/bnyro/contacts/util/extension/String.kt
new file mode 100644
index 00000000..4968972e
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/util/extension/String.kt
@@ -0,0 +1,6 @@
+package com.bnyro.contacts.util.extension
+
+fun String.removeLastChar(): String {
+    return if (isEmpty()) this
+    else substring(0, length - 1)
+}
diff --git a/app/src/main/java/com/bnyro/contacts/ext/Toast.kt b/app/src/main/java/com/bnyro/contacts/util/extension/Toast.kt
similarity index 61%
rename from app/src/main/java/com/bnyro/contacts/ext/Toast.kt
rename to app/src/main/java/com/bnyro/contacts/util/extension/Toast.kt
index 447dbd50..0e52a239 100644
--- a/app/src/main/java/com/bnyro/contacts/ext/Toast.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/extension/Toast.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ext
+package com.bnyro.contacts.util.extension
 
 import android.content.Context
 import android.os.Handler
@@ -11,3 +11,9 @@ fun Context.toast(@StringRes text: Int) {
         Toast.makeText(this, text, Toast.LENGTH_SHORT).show()
     }
 }
+
+fun Context.toast(text: String) {
+    Handler(Looper.getMainLooper()).post {
+        Toast.makeText(this, text, Toast.LENGTH_SHORT).show()
+    }
+}
diff --git a/app/src/main/java/com/bnyro/contacts/receivers/CopyTextReceiver.kt b/app/src/main/java/com/bnyro/contacts/util/receivers/CopyTextReceiver.kt
similarity index 90%
rename from app/src/main/java/com/bnyro/contacts/receivers/CopyTextReceiver.kt
rename to app/src/main/java/com/bnyro/contacts/util/receivers/CopyTextReceiver.kt
index 26a3fab0..d7958952 100644
--- a/app/src/main/java/com/bnyro/contacts/receivers/CopyTextReceiver.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/receivers/CopyTextReceiver.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.receivers
+package com.bnyro.contacts.util.receivers
 
 import android.content.BroadcastReceiver
 import android.content.Context
diff --git a/app/src/main/java/com/bnyro/contacts/receivers/DeleteSmsReceiver.kt b/app/src/main/java/com/bnyro/contacts/util/receivers/DeleteSmsReceiver.kt
similarity index 94%
rename from app/src/main/java/com/bnyro/contacts/receivers/DeleteSmsReceiver.kt
rename to app/src/main/java/com/bnyro/contacts/util/receivers/DeleteSmsReceiver.kt
index 877980c9..eb8ed045 100644
--- a/app/src/main/java/com/bnyro/contacts/receivers/DeleteSmsReceiver.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/receivers/DeleteSmsReceiver.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.receivers
+package com.bnyro.contacts.util.receivers
 
 import android.content.BroadcastReceiver
 import android.content.Context
diff --git a/app/src/main/java/com/bnyro/contacts/receivers/MmsReceiver.kt b/app/src/main/java/com/bnyro/contacts/util/receivers/MmsReceiver.kt
similarity index 87%
rename from app/src/main/java/com/bnyro/contacts/receivers/MmsReceiver.kt
rename to app/src/main/java/com/bnyro/contacts/util/receivers/MmsReceiver.kt
index e050a0e2..a6a260ca 100644
--- a/app/src/main/java/com/bnyro/contacts/receivers/MmsReceiver.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/receivers/MmsReceiver.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.receivers
+package com.bnyro.contacts.util.receivers
 
 import android.annotation.SuppressLint
 import android.content.BroadcastReceiver
diff --git a/app/src/main/java/com/bnyro/contacts/receivers/ReplyReceiver.kt b/app/src/main/java/com/bnyro/contacts/util/receivers/ReplyReceiver.kt
similarity index 96%
rename from app/src/main/java/com/bnyro/contacts/receivers/ReplyReceiver.kt
rename to app/src/main/java/com/bnyro/contacts/util/receivers/ReplyReceiver.kt
index 75fd9b4d..88c9ac8f 100644
--- a/app/src/main/java/com/bnyro/contacts/receivers/ReplyReceiver.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/receivers/ReplyReceiver.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.receivers
+package com.bnyro.contacts.util.receivers
 
 import android.content.BroadcastReceiver
 import android.content.Context
diff --git a/app/src/main/java/com/bnyro/contacts/receivers/SmsReceiver.kt b/app/src/main/java/com/bnyro/contacts/util/receivers/SmsReceiver.kt
similarity index 94%
rename from app/src/main/java/com/bnyro/contacts/receivers/SmsReceiver.kt
rename to app/src/main/java/com/bnyro/contacts/util/receivers/SmsReceiver.kt
index cc5867ce..e1be50fa 100644
--- a/app/src/main/java/com/bnyro/contacts/receivers/SmsReceiver.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/receivers/SmsReceiver.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.receivers
+package com.bnyro.contacts.util.receivers
 
 import android.annotation.SuppressLint
 import android.app.Notification
@@ -12,8 +12,8 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.RemoteInput
 import com.bnyro.contacts.App
 import com.bnyro.contacts.R
-import com.bnyro.contacts.db.obj.SmsData
-import com.bnyro.contacts.enums.IntentActionType
+import com.bnyro.contacts.data.database.obj.SmsData
+import com.bnyro.contacts.domain.enums.IntentActionType
 import com.bnyro.contacts.util.IntentHelper
 import com.bnyro.contacts.util.NotificationHelper
 import com.bnyro.contacts.util.NotificationHelper.MESSAGES_CHANNEL_ID
@@ -140,13 +140,10 @@ class SmsReceiver : BroadcastReceiver() {
             builder.addAction(copyMessageAction)
         }
 
-        if (!PermissionHelper.checkPermissions(
-                context,
-                NotificationHelper.notificationPermissions
-            )
-        ) {
-            return
+        NotificationHelper.notificationPermissions.firstOrNull()?.let {
+            if (!PermissionHelper.hasPermission(context, it)) return
         }
+
         NotificationManagerCompat.from(context).notify(notificationId, builder.build())
     }
 
diff --git a/app/src/main/java/com/bnyro/contacts/util/services/CallService.kt b/app/src/main/java/com/bnyro/contacts/util/services/CallService.kt
new file mode 100644
index 00000000..a437db8e
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/util/services/CallService.kt
@@ -0,0 +1,282 @@
+package com.bnyro.contacts.util.services
+
+import android.annotation.SuppressLint
+import android.app.Notification
+import android.app.PendingIntent
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.graphics.Bitmap
+import android.os.Binder
+import android.os.IBinder
+import android.telecom.Call
+import android.telecom.InCallService
+import android.view.View
+import android.widget.RemoteViews
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.ContextCompat
+import com.bnyro.contacts.App
+import com.bnyro.contacts.R
+import com.bnyro.contacts.domain.model.CallerInfo
+import com.bnyro.contacts.presentation.screens.dialer.model.state.CallState
+import com.bnyro.contacts.ui.activities.CallActivity
+import com.bnyro.contacts.util.ContactsHelper
+import com.bnyro.contacts.util.NotificationHelper
+import com.google.i18n.phonenumbers.PhoneNumberUtil
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+
+class CallService : InCallService() {
+
+    private val binder = LocalBinder()
+
+    private val scope = CoroutineScope(Dispatchers.Main)
+
+    private var currentCallState = Call.STATE_DISCONNECTED
+    private var callerInfo = CallerInfo()
+
+    var onUpdateState: (CallState) -> Unit = {}
+
+    var onCallerInfoUpdate: (CallerInfo) -> Unit = {}
+
+    private val callActionReciever = object : BroadcastReceiver() {
+        override fun onReceive(context: Context?, intent: Intent?) {
+            when (intent?.getStringExtra(ACTION_EXTRA_KEY)) {
+                ACCEPT_CALL ->
+                    acceptCall()
+
+                DECLINE_CALL -> cancelCall()
+            }
+        }
+    }
+
+    override fun onCreate() {
+        ContextCompat.registerReceiver(
+            this,
+            callActionReciever,
+            IntentFilter(CALL_INTENT_ACTION),
+            ContextCompat.RECEIVER_EXPORTED
+        )
+        super.onCreate()
+    }
+
+    override fun onDestroy() {
+        unregisterReceiver(callActionReciever)
+        super.onDestroy()
+    }
+
+    private val callCallback = object : Call.Callback() {
+        override fun onStateChanged(call: Call, state: Int) {
+            currentCallState = state
+            updateState(state)
+            if (state == Call.STATE_DISCONNECTED) {
+                val closeCallAlertIntent = Intent(CallActivity.CALL_ALERT_CLOSE_ACTION).apply {
+                    putExtra(CallActivity.ACTION_EXTRA_KEY, CallActivity.CLOSE_ACTION)
+                    putExtra(CallActivity.ACTION_EXTRA_REASON,
+                        call.details?.disconnectCause?.description?.takeIf { it.isNotBlank() }
+                            ?.toString()
+                    )
+                    `package` = packageName
+                }
+                sendBroadcast(closeCallAlertIntent)
+            }
+        }
+    }
+
+    fun updateState(state: Int = currentCallState) {
+        when (state) {
+            Call.STATE_RINGING, Call.STATE_PULLING_CALL -> onUpdateState.invoke(CallState.Incoming)
+            Call.STATE_DIALING -> onUpdateState.invoke(CallState.Outgoing)
+            Call.STATE_ACTIVE -> onUpdateState.invoke(CallState.InCall)
+            Call.STATE_DISCONNECTED -> onUpdateState.invoke(CallState.Disconnected)
+            Call.STATE_CONNECTING -> onUpdateState.invoke(CallState.Connecting)
+            Call.STATE_DISCONNECTING -> onUpdateState.invoke(CallState.Disconnecting)
+            else -> {}
+        }
+    }
+
+    fun updateCallerInfo() {
+        onCallerInfoUpdate(callerInfo)
+    }
+
+    @SuppressLint("MissingPermission")
+    override fun onCallAdded(call: Call) {
+        super.onCallAdded(call)
+        val intent = Intent(applicationContext, CallActivity::class.java).apply {
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
+        }
+        startActivity(intent)
+
+        call.registerCallback(callCallback)
+
+        val callerNumber = call.details.gatewayInfo?.originalAddress?.schemeSpecificPart
+            ?: call.details.handle.schemeSpecificPart
+
+        currentCallState = call.state
+        updateState(call.state)
+
+        val formattedPhoneNumber = formatPhoneNumber(callerNumber)
+        callerInfo = CallerInfo(
+            rawPhoneNumber = callerNumber,
+            formattedPhoneNumber = formattedPhoneNumber
+        )
+        updateCallerInfo()
+
+        scope.launch {
+            val phoneLookupRepository =
+                (this@CallService.applicationContext as App).phoneLookupRepository
+            val contactData = phoneLookupRepository.getContactByNumber(callerNumber)
+            val contactPhoto = if (contactData.thumbnail != null) {
+                withContext(Dispatchers.IO) {
+                    ContactsHelper.getContactPhotoThumbnail(this@CallService, contactData.thumbnail)
+                }
+            } else {
+                null
+            }
+
+            val notification = buildNotification(call, callerNumber, contactData.name, contactPhoto)
+            NotificationManagerCompat.from(this@CallService)
+                .notify(CALL_NOTIFICATION_ID, notification)
+
+            callerInfo = CallerInfo(
+                callerName = contactData.name,
+                rawPhoneNumber = callerNumber,
+                callerPhoto = contactData.thumbnail,
+                formattedPhoneNumber = formattedPhoneNumber
+            )
+            updateCallerInfo()
+        }
+    }
+
+    private fun formatPhoneNumber(number: String): String {
+        val phoneUtil = PhoneNumberUtil.getInstance()
+        val phoneNumber = runCatching { phoneUtil.parse(number, null) }
+            .getOrElse { return number }
+        return phoneUtil.format(phoneNumber, PhoneNumberUtil.PhoneNumberFormat.NATIONAL)
+    }
+
+    override fun onCallRemoved(call: Call) {
+        super.onCallRemoved(call)
+        NotificationManagerCompat.from(this).cancel(CALL_NOTIFICATION_ID)
+        call.unregisterCallback(callCallback)
+
+        currentCallState = Call.STATE_DISCONNECTED
+    }
+
+    private fun buildNotification(
+        call: Call,
+        callerNumber: String,
+        callerName: String?,
+        callersPhoto: Bitmap?
+    ): Notification {
+        val acceptPendingIntent =
+            getPendingIntent(Intent(CALL_INTENT_ACTION).putExtra(ACTION_EXTRA_KEY, ACCEPT_CALL), 1)
+        val declinePendingIntent =
+            getPendingIntent(Intent(CALL_INTENT_ACTION).putExtra(ACTION_EXTRA_KEY, DECLINE_CALL), 2)
+
+        val collapsedView = RemoteViews(packageName, R.layout.call_notification).apply {
+            setTextViewText(
+                R.id.notification_caller_name,
+                callerName ?: getString(R.string.unknown_number)
+            )
+            setTextViewText(R.id.notification_call_status, callerNumber)
+            setViewVisibility(
+                R.id.notification_accept_call,
+                if (call.state == Call.STATE_RINGING) View.VISIBLE else View.GONE
+            )
+
+            if (callersPhoto != null) {
+                setImageViewBitmap(R.id.notification_thumbnail, callersPhoto)
+            } else {
+                setImageViewResource(R.id.notification_thumbnail, R.drawable.round_person)
+            }
+            setOnClickPendingIntent(R.id.notification_decline_call, declinePendingIntent)
+            setOnClickPendingIntent(R.id.notification_accept_call, acceptPendingIntent)
+        }
+
+        val intent = Intent(applicationContext, CallActivity::class.java)
+        val pendingIntent = PendingIntent.getActivity(
+            this,
+            2,
+            intent,
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE
+        )
+        return NotificationCompat.Builder(this, NotificationHelper.CALL_CHANNEL_ID)
+            .setSmallIcon(R.drawable.ic_call)
+            .setCategory(Notification.CATEGORY_CALL)
+            .setCustomContentView(collapsedView)
+            .setContentIntent(pendingIntent)
+            .setOngoing(true)
+            .setSound(null)
+            .setUsesChronometer(true)
+            .setStyle(NotificationCompat.DecoratedCustomViewStyle())
+            .build()
+    }
+
+    val currentCall: Call?
+        get() = calls.firstOrNull()
+
+    fun playDtmfTone(digit: Char) {
+        scope.launch {
+            currentCall?.playDtmfTone(digit)
+            delay(200)
+            currentCall?.stopDtmfTone()
+        }
+    }
+
+    fun cancelCall() {
+        if (currentCall == null) return
+
+        if (currentCallState == Call.STATE_RINGING) {
+            rejectCall()
+        } else {
+            disconnectCall()
+        }
+    }
+
+    fun acceptCall() {
+        currentCall?.let { it.answer(it.details.videoState) }
+    }
+
+    private fun rejectCall() {
+        currentCall?.reject(false, "")
+    }
+
+    private fun disconnectCall() {
+        currentCall?.disconnect()
+    }
+
+    override fun onBind(intent: Intent): IBinder? {
+        if (intent.action == CUSTOM_BIND_ACTION) {
+            return binder;
+        }
+        return super.onBind(intent)
+    }
+
+    inner class LocalBinder : Binder() {
+        fun getService() = this@CallService
+    }
+
+    private fun getPendingIntent(intent: Intent, requestCode: Int): PendingIntent =
+        PendingIntent.getBroadcast(
+            this,
+            requestCode,
+            intent,
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        )
+
+    companion object {
+        const val CALL_INTENT_ACTION = "com.bnyro.contacts.CALL_ACTION"
+        const val ACTION_EXTRA_KEY = "call_action"
+        const val ACCEPT_CALL = "ACCEPT"
+        const val DECLINE_CALL = "DECLINE"
+        const val CALL_NOTIFICATION_ID = 10
+        const val CUSTOM_BIND_ACTION = "custom_bind"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/services/HeadlessSmsSendService.kt b/app/src/main/java/com/bnyro/contacts/util/services/HeadlessSmsSendService.kt
similarity index 78%
rename from app/src/main/java/com/bnyro/contacts/services/HeadlessSmsSendService.kt
rename to app/src/main/java/com/bnyro/contacts/util/services/HeadlessSmsSendService.kt
index 274a89d6..817877ad 100644
--- a/app/src/main/java/com/bnyro/contacts/services/HeadlessSmsSendService.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/services/HeadlessSmsSendService.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.services
+package com.bnyro.contacts.util.services
 
 import android.app.Service
 import android.content.Intent
diff --git a/app/src/main/java/com/bnyro/contacts/workers/BackupWorker.kt b/app/src/main/java/com/bnyro/contacts/util/workers/BackupWorker.kt
similarity index 95%
rename from app/src/main/java/com/bnyro/contacts/workers/BackupWorker.kt
rename to app/src/main/java/com/bnyro/contacts/util/workers/BackupWorker.kt
index a87f39c8..ac6800a2 100644
--- a/app/src/main/java/com/bnyro/contacts/workers/BackupWorker.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/workers/BackupWorker.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.workers
+package com.bnyro.contacts.util.workers
 
 import android.content.Context
 import androidx.work.CoroutineWorker
@@ -7,7 +7,7 @@ import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.WorkerParameters
 import com.bnyro.contacts.App
-import com.bnyro.contacts.enums.BackupType
+import com.bnyro.contacts.domain.enums.BackupType
 import com.bnyro.contacts.util.BackupHelper
 import com.bnyro.contacts.util.Preferences
 import java.util.concurrent.TimeUnit
diff --git a/app/src/main/res/drawable/blob.xml b/app/src/main/res/drawable/blob.xml
new file mode 100755
index 00000000..3bd4d837
--- /dev/null
+++ b/app/src/main/res/drawable/blob.xml
@@ -0,0 +1,10 @@
+<!-- Design by SuhasDissa -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="480"
+    android:viewportHeight="480">
+    <path
+        android:fillColor="#000"
+        android:pathData="M431.5,295.5Q452,351 404.5,380Q357,409 311.5,430.5Q266,452 220.5,431Q175,410 142,383Q109,356 70.5,323.5Q32,291 31,239.5Q30,188 56,144Q82,100 122.5,68.5Q163,37 213,44.5Q263,52 319,48Q375,44 398,94.5Q421,145 416,192.5Q411,240 431.5,295.5Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_no_sms.xml b/app/src/main/res/drawable/ic_no_sms.xml
new file mode 100644
index 00000000..425cccb0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_no_sms.xml
@@ -0,0 +1,29 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="180dp"
+    android:height="180dp"
+    android:viewportWidth="180"
+    android:viewportHeight="180">
+    <path
+        android:fillAlpha="0.75"
+        android:fillColor="#00000000"
+        android:pathData="m122.26,53.97v45.14c0,6.73 -5.42,12.14 -12.14,12.14L57.74,111.26v3.73c0,6.73 5.41,12.14 12.14,12.14h53.15c0,0 13.17,8.36 18.55,11.78 4.86,3.09 9.13,5.81 9.11,-2.78 -0.11,-56.76 0.04,-70.02 0.04,-70.02 0,-6.73 -5.42,-12.14 -12.14,-12.14z"
+        android:strokeWidth="7.322"
+        android:strokeAlpha="0.75"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="m70.13,88.43c3.37,-3.54 8.93,-2.52 11.36,0m9.53,-20.73v3.51M60.52,67.7v3.51"
+        android:strokeWidth="7.322"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="m41.41,38.1h68.71c6.73,0 12.14,5.42 12.14,12.14v48.88c0,6.73 -5.42,12.14 -12.14,12.14L56.97,111.26c0,0 -13.17,8.35 -18.55,11.78 -4.86,3.09 -9.13,5.81 -9.11,-2.78 0.11,-56.76 -0.04,-70.02 -0.04,-70.02 0,-6.73 5.42,-12.14 12.14,-12.14z"
+        android:strokeWidth="7.322"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_person.xml b/app/src/main/res/drawable/ic_person.xml
new file mode 100644
index 00000000..48497443
--- /dev/null
+++ b/app/src/main/res/drawable/ic_person.xml
@@ -0,0 +1,56 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="180dp"
+    android:height="180dp"
+    android:viewportWidth="47.625"
+    android:viewportHeight="47.625">
+    <path
+        android:fillColor="#00000000"
+        android:pathData="m32.16,21.664c0.954,-0.292 1.799,-0.675 2.261,-2.228V10.865C33.716,7.555 32.031,5.093 27.99,4.676H20.842C17.437,5.469 16.567,7.08 15.645,8.776 14.798,9.194 13.823,8.816 13.295,11.007v8.659c0.326,0.999 0.831,2.083 2.148,2.006m16.698,-5.846v5.841c-0.137,10.746 -16.009,11.851 -16.725,0v-6.163c2.494,0.195 4.44,-1.336 5.812,-3.528 3.515,1.614 6.34,4.448 10.912,3.85z"
+        android:strokeWidth="1.3544"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="m28.488,32.748c-3.165,2.323 -6.787,1.953 -9.337,0.009m8.47,-3.365c0.262,0.524 0.754,1.959 0.854,3.346 4.267,3.609 8.815,0.959 8.475,9.503 -7.989,5.468 -18.481,5.382 -26.314,-0.293 -0.341,-8.526 4.245,-5.602 8.513,-9.21 0.1,-1.387 0.592,-2.822 0.854,-3.346"
+        android:strokeWidth="1.42169"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillAlpha="0.501934"
+        android:fillColor="#000000"
+        android:pathData="M22.825,45.496C18.935,45.283 15.42,44.141 12.044,41.995l-0.709,-0.451 0.037,-0.927c0.079,-1.978 0.427,-3.083 1.199,-3.805 0.51,-0.477 0.994,-0.711 2.6,-1.256 1.949,-0.662 2.635,-0.967 3.585,-1.597l0.401,-0.265 0.418,0.244c1.297,0.758 2.692,1.134 4.2,1.134 1.434,-0.001 2.47,-0.25 3.814,-0.921l0.889,-0.443 0.452,0.3c0.686,0.455 1.997,1.07 3.223,1.512 1.612,0.581 2.361,0.958 2.828,1.425 0.821,0.821 1.221,2.161 1.224,4.097l0.001,0.814 -0.76,0.457c-2.639,1.589 -5.655,2.644 -8.686,3.039 -0.578,0.075 -2.954,0.229 -3.069,0.199 -0.016,-0.004 -0.405,-0.028 -0.864,-0.054z"
+        android:strokeWidth="0.275"
+        android:strokeAlpha="0.501934"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillAlpha="0.809791"
+        android:fillColor="#000000"
+        android:pathData="M14.53,20.58C14.458,20.503 14.311,20.253 14.202,20.024L14.005,19.607L14.005,15.286 14.005,10.965l0.143,-0.358c0.224,-0.559 0.459,-0.752 1.194,-0.98 0.741,-0.23 0.851,-0.327 1.285,-1.129 0.793,-1.468 1.778,-2.288 3.422,-2.851l0.75,-0.257 3.874,0.017 3.874,0.017 0.569,0.156c2.389,0.656 3.715,2.087 4.464,4.816 0.118,0.43 0.122,0.595 0.122,4.729l0,4.283l-0.175,0.366c-0.096,0.201 -0.284,0.472 -0.417,0.602l-0.242,0.236 -0,-2.441c-0,-2.712 -0.003,-2.735 -0.398,-2.963 -0.172,-0.099 -0.253,-0.104 -0.88,-0.049 -1.3,0.113 -2.636,-0.1 -3.966,-0.63 -0.927,-0.37 -1.497,-0.661 -3.151,-1.613 -2.117,-1.218 -2.929,-1.625 -3.24,-1.625 -0.141,0 -0.313,0.039 -0.382,0.087 -0.069,0.048 -0.309,0.35 -0.534,0.67 -0.225,0.321 -0.651,0.825 -0.946,1.122 -1.125,1.129 -2.252,1.636 -3.638,1.636 -0.554,0 -0.75,0.063 -0.906,0.292 -0.096,0.141 -0.108,0.405 -0.135,2.886l-0.03,2.731z"
+        android:strokeWidth="0.275"
+        android:strokeAlpha="0.809791"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillAlpha="0.149069"
+        android:fillColor="#000000"
+        android:pathData="M23.083,29.402C21.295,29.285 19.634,28.52 18.402,27.245 17.261,26.065 16.658,24.835 16.258,22.868 16.183,22.497 16.16,21.811 16.138,19.329l-0.027,-3.078 0.168,-0.032c0.092,-0.018 0.316,-0.05 0.496,-0.072 0.774,-0.094 1.8,-0.526 2.622,-1.105 0.651,-0.458 1.506,-1.342 2.061,-2.129 0.026,-0.036 0.759,0.359 2.157,1.163 3.254,1.871 4.779,2.425 6.882,2.503l0.939,0.035l0,2.73c0,2.978 -0.047,3.637 -0.331,4.621 -0.371,1.288 -0.901,2.194 -1.844,3.156 -1.629,1.661 -3.741,2.441 -6.178,2.281z"
+        android:strokeWidth="0.275"
+        android:strokeAlpha="0.149069"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillAlpha="0.149069"
+        android:fillColor="#000000"
+        android:pathData="m23.129,33.576c-0.598,-0.064 -1.266,-0.233 -1.863,-0.471 -0.527,-0.21 -1.265,-0.628 -1.308,-0.741 -0.038,-0.1 0.125,-0.893 0.319,-1.544 0.139,-0.469 0.17,-0.523 0.279,-0.497 0.068,0.016 0.365,0.099 0.66,0.184 0.896,0.257 1.722,0.351 2.771,0.315 1.036,-0.036 1.733,-0.147 2.536,-0.404 0.3,-0.096 0.573,-0.175 0.607,-0.175 0.065,0 0.377,1.077 0.499,1.723 0.07,0.373 0.069,0.385 -0.072,0.498 -0.223,0.181 -1.137,0.624 -1.618,0.784 -0.901,0.3 -1.938,0.421 -2.811,0.327z"
+        android:strokeWidth="0.275"
+        android:strokeAlpha="0.149069"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+</vector>
diff --git a/app/src/main/res/drawable/round_person.xml b/app/src/main/res/drawable/round_person.xml
new file mode 100644
index 00000000..91a34853
--- /dev/null
+++ b/app/src/main/res/drawable/round_person.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="50dp"
+    android:height="50dp"
+    android:tint="#5E5E5E"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v1c0,0.55 0.45,1 1,1h14c0.55,0 1,-0.45 1,-1v-1c0,-2.66 -5.33,-4 -8,-4z" />
+
+</vector>
diff --git a/app/src/main/res/layout/call_notification.xml b/app/src/main/res/layout/call_notification.xml
new file mode 100644
index 00000000..c96d9d5b
--- /dev/null
+++ b/app/src/main/res/layout/call_notification.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/notification_holder"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/notification_caller_name"
+                style="@style/TextAppearance.Compat.Notification.Title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textStyle="bold"
+                tools:text="Caller name" />
+
+            <TextView
+                android:id="@+id/notification_call_status"
+                style="@style/TextAppearance.Compat.Notification.Title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="123 456 789" />
+
+        </LinearLayout>
+
+        <ImageView
+            android:id="@+id/notification_thumbnail"
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            tools:src="@tools:sample/avatars" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/notification_actions_holder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/notification_decline_call"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/decline"
+            android:textColor="#D32F2F"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/notification_accept_call"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/accept"
+            android:textColor="#4CAF50"
+            android:textStyle="bold" />
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/resources.properties b/app/src/main/res/resources.properties
new file mode 100644
index 00000000..d5a3ddc9
--- /dev/null
+++ b/app/src/main/res/resources.properties
@@ -0,0 +1 @@
+unqualifiedResLocale=en-US
\ No newline at end of file
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 2b694d41..e34765fb 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -28,7 +28,7 @@
     <string name="author">المؤلِّف</string>
     <string name="translation">الترجمة</string>
     <string name="copied">نُسخ للحافظة</string>
-    <string name="search" tools:ignore="PrivateResource">ابحث</string>
+    <string name="search" tools:ignore="PrivateResource">بحث</string>
     <string name="reset">أعِد التعيين</string>
     <string name="create_contact">أنشئ جهة اتِّصال</string>
     <string name="retry">أعد المحاولة</string>
@@ -116,4 +116,41 @@
     <string name="add_event">أضف حدثًا</string>
     <string name="date">‪التاريخ</string>
     <string name="import_confirm">هل ترغب في استيراد ملف VCF المحدد؟</string>
+    <string name="amoled">‬أموليد</string>
+    <string name="security">الأمان</string>
+    <string name="biometric_authentication">المصادقة البيومترية</string>
+    <string name="biometric_authentication_summary">اطلب المصادقة البيومترية (مثل بصمة الإصبع) قبل أن تتمكن من الوصول إلى التطبيق.</string>
+    <string name="in_progress">قيد التنفيذ</string>
+    <string name="ringing">الرنين…</string>
+    <string name="disconnecting">جارٍ قطع الاتصال…</string>
+    <string name="mute">كتم</string>
+    <string name="calls">المكالمات</string>
+    <string name="decline">رفض</string>
+    <string name="accept">قبول</string>
+    <string name="connecting">جارِ الاتصال…</string>
+    <string name="confirm_start_call">هل تريد الاتصال بـ %1$s؟</string>
+    <string name="speakers">مكبرات الصوت</string>
+    <string name="unknown_number">رقم غير معروف</string>
+    <string name="dial_pad">لوحة الطلب</string>
+    <string name="call_ended">انتهت المكالمة</string>
+    <string name="dialing">الطلب...</string>
+    <string name="call_from">اتصال من</string>
+    <string name="key_pad">لوحة المفاتيح</string>
+    <string name="recent_calls">المكالمات الأخيرة</string>
+    <string name="block_numbers">حظر الأرقام</string>
+    <string name="blocking_number_is_not_supported">حظر الأرقام غير مدعوم، Connect You ليس هو التطبيق الافتراضي للرسائل القصيرة/الهاتف</string>
+    <string name="number_blocked">الرقم محظور</string>
+    <string name="block_number">حظر الرقم</string>
+    <string name="unblock_number">إلغاء حظر الرقم</string>
+    <string name="select_custom_ringtone">حدد نغمة رنين مخصصة</string>
+    <string name="change_ringtone">تغيير نغمة الرنين</string>
+    <string name="search_contacts">بحث في جهات الاتصال</string>
+    <string name="start_a_new_conversation">بدء محادثة جديدة</string>
+    <string name="favorite">المفضلة</string>
+    <string name="favorites_only">المفضّلات فقط</string>
+    <string name="import_sms">استيراد رسالة نصية قصيرة</string>
+    <string name="cant_respond">لا يمكن الرد</string>
+    <string name="export_sms">تصدير الرسائل</string>
+    <string name="backup_naming_scheme">نظام التسمية لنسخ الاحتياطية</string>
+    <string name="backup_naming_scheme_hint">%d: التاريخ، %t: الوقت، %s: المصدر (المحلي، الجهاز)، المصدر يتطلب التاريخ أو الوقت</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index af1114ab..b291c50a 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -9,10 +9,10 @@
     <string name="translation">Tərcümə</string>
     <string name="app_name">Connect You</string>
     <string name="search" tools:ignore="PrivateResource">Axtarış</string>
-    <string name="copied">Buferə kopyalandı</string>
+    <string name="copied">Buferə köçürüldü</string>
     <string name="delete_contact">Əlaqəni sil</string>
     <string name="retry">Təkrar cəhd et</string>
-    <string name="event">Hadisə</string>
+    <string name="event">Tədbir</string>
     <string name="irreversible">Siz əminsiniz\? Bu geri qaytarıla bilməz!</string>
     <string name="cancel">Ləğv et</string>
     <string name="export_success">İxrac edildi.</string>
@@ -39,10 +39,10 @@
     <string name="fax_work">İş faks</string>
     <string name="okay">Oldu</string>
     <string name="reset">Sıfırla</string>
-    <string name="copy">Kopyala</string>
+    <string name="copy">Köçür</string>
     <string name="move">Köçürt</string>
     <string name="settings">Tənzimləmələr</string>
-    <string name="start_tab">Başlanğıc paneli</string>
+    <string name="start_tab">Başlanğıc səhifəsi</string>
     <string name="nothing_here">Burada heç nə yoxdur.</string>
     <string name="device">Cihaz</string>
     <string name="local">Yerli</string>
@@ -53,9 +53,9 @@
     <string name="theme">Tema</string>
     <string name="system">Sistem</string>
     <string name="light">İşıqlı</string>
-    <string name="dark">Qaranlıq</string>
-    <string name="auto_backup">Avtomatik Nüsxələmə</string>
-    <string name="choose_dir">Kataloq seç</string>
+    <string name="dark">Qara</string>
+    <string name="auto_backup">Avtomatik nüsxələmə</string>
+    <string name="choose_dir">Kataloq</string>
     <string name="both">Hər ikisi</string>
     <string name="none">Heç biri</string>
     <string name="manage_groups">Qrupları idarə et</string>
@@ -87,4 +87,71 @@
     <string name="nick_name">Ləqəb</string>
     <string name="new_contact">Yeni əlaqə</string>
     <string name="contact">Əlaqə</string>
+    <string name="photo">Şəkil</string>
+    <string name="name">Ad</string>
+    <string name="contacts">Əlaqələr</string>
+    <string name="pick_contact">Əlaqə seç</string>
+    <string name="save">Saxla</string>
+    <string name="phone_number">Telefon nömrəsi</string>
+    <string name="behavior">Davranış</string>
+    <string name="appearance">Görünüş</string>
+    <string name="select_custom_ringtone">Fərdi zəng səsi seç</string>
+    <string name="change_ringtone">Zəng səsin dəyişdir</string>
+    <string name="block_numbers">Nömrələri əngəllə</string>
+    <string name="recent_calls">Son zənglər</string>
+    <string name="blocking_number_is_not_supported">Nömrə bloklanması dəstəklənmir, Connect You ilkin SMS/Telefon tətbiqi deyil</string>
+    <string name="block_number">Nömrəni əngəllə</string>
+    <string name="unblock_number">Nömrə əngəlin sil</string>
+    <string name="ringing">Zəng edilir…</string>
+    <string name="send">Mesaj göndər</string>
+    <string name="import_confirm">Seçilmiş VCF faylını idxal etmək istəyirsiniz?</string>
+    <string name="favorites_only">Yalnız sevimlilər</string>
+    <string name="message_too_long">Mesaj çox uzundur!</string>
+    <string name="search_contacts">Əlaqələri axtar</string>
+    <string name="start_a_new_conversation">Yeni söhbətə başla</string>
+    <string name="amoled">Amoled</string>
+    <string name="send_message_as_multiple">Bir neçə kiçik mesaj kimi göndərmək istəyirsiniz?</string>
+    <string name="add_phone_number">Telefon nömrəsi əlavə et</string>
+    <string name="add_e_mail">E-poçt Əlavə Et</string>
+    <string name="add_address">Ünvan Əlavə Et</string>
+    <string name="add_note">Qeyd Əlavə Et</string>
+    <string name="add_event">Hadisə Əlavə Et</string>
+    <string name="favorite">Sevimli</string>
+    <string name="messages">Mesajlar</string>
+    <string name="reply">Cavab ver</string>
+    <string name="connection_error">Qoşulmaq alınmadı. Təyyarə rejiminin söndürüldüyünə əmin olun.</string>
+    <string name="private_sms_database">Şəxsi SMS Məlumat Bazası</string>
+    <string name="private_sms_database_desc">SMS yalnız tətbiqdə saxlanılacaq və digər tətbiqlərdə əlçatan olmayacaq.</string>
+    <string name="delete_thread">Mətni sil</string>
+    <string name="delete_message">Mesajı silin</string>
+    <string name="in_progress">Davam edir</string>
+    <string name="disconnecting">Bağlantı kəsilir…</string>
+    <string name="connecting">Qoşulur…</string>
+    <string name="confirm_start_call">%1$s-a zəng etmək istəyirsiniz?</string>
+    <string name="mute">Səssiz</string>
+    <string name="speakers">Dinamiklər</string>
+    <string name="import_sim">SIM-dən idxal et</string>
+    <string name="backup">Nüsxələmə</string>
+    <string name="encrypt_backups">Nüsxələmələri zip kimi şifrələ</string>
+    <string name="backup_password">Parol</string>
+    <string name="security">Təhlükəsizlik</string>
+    <string name="biometric_authentication">Biometrik Təsdiqləmə</string>
+    <string name="biometric_authentication_summary">Tətbiqə daxil olmaq üçün biometrik təsdiqləmə (məsələn, barmaq izi) tələb edin.</string>
+    <string name="add_website">Veb Sayt Əlavə Et</string>
+    <string name="date">Tarix</string>
+    <string name="calls">Zənglər</string>
+    <string name="decline">İmtina et</string>
+    <string name="accept">Qəbul et</string>
+    <string name="unknown_number">Gizli Nömrə</string>
+    <string name="dial_pad">Zəng lövhəsi</string>
+    <string name="call_ended">Zəng bitdi</string>
+    <string name="dialing">Zəng edilir...</string>
+    <string name="call_from">Zəng edən</string>
+    <string name="number_blocked">Nömrə əngəllənib</string>
+    <string name="key_pad">Klaviatura</string>
+    <string name="cant_respond">Cavab verə bilmir</string>
+    <string name="backup_naming_scheme">Nüsxə adlandırma təsviri</string>
+    <string name="backup_naming_scheme_hint">%d: tarix, %t: vaxt, %s: mənbə (yerli, cihaz), mənbə tələb olunur və tarix və ya vaxt</string>
+    <string name="export_sms">SMS İxrac Et</string>
+    <string name="import_sms">SMS İdxal Et</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 6c5eb6fa..c0479092 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="copy">Копиране</string>
-    <string name="irreversible">Сигурни ли сте\? Действието е необратимо.</string>
+    <string name="irreversible">Сигурни ли сте? Това не може да бъде отменено!</string>
+    <string name="save">Запазване</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 04c6f764..7c6b95cd 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -72,7 +72,7 @@
     <string name="colorful_contact_icons">Barevné ikony kontaktů</string>
     <string name="message">Zpráva</string>
     <string name="create_shortcut">Vytvořit zástupce</string>
-    <string name="dial">Zavolat</string>
+    <string name="dial">Hovor</string>
     <string name="new_contact">Nový kontakt</string>
     <string name="contact">Kontakt</string>
     <string name="more">Další</string>
@@ -116,4 +116,41 @@
     <string name="add_phone_number">Přidat telefonní číslo</string>
     <string name="date">Datum</string>
     <string name="import_confirm">Chcete importovat vybraný soubor VCF?</string>
+    <string name="amoled">Amoled</string>
+    <string name="security">Zabezpečení</string>
+    <string name="biometric_authentication">Biometrické ověřování</string>
+    <string name="biometric_authentication_summary">Vyžadovat biometrické ověřování (např. otisk prstu) před přístupem do aplikace.</string>
+    <string name="in_progress">Probíhá</string>
+    <string name="ringing">Vyzvánění…</string>
+    <string name="disconnecting">Odpojování…</string>
+    <string name="connecting">Připojování…</string>
+    <string name="confirm_start_call">Chcete zavolat kontaktu %1$s?</string>
+    <string name="mute">Ztlumit</string>
+    <string name="speakers">Reproduktory</string>
+    <string name="calls">Hovory</string>
+    <string name="decline">Odmítnout</string>
+    <string name="accept">Přijmout</string>
+    <string name="unknown_number">Neznámé číslo</string>
+    <string name="dial_pad">Číselník</string>
+    <string name="call_ended">Hovor ukončen</string>
+    <string name="dialing">Vyzvánění...</string>
+    <string name="call_from">Hovor od</string>
+    <string name="key_pad">Číselník</string>
+    <string name="number_blocked">Číslo zablokováno</string>
+    <string name="block_number">Zablokovat číslo</string>
+    <string name="recent_calls">Nedávné hovory</string>
+    <string name="select_custom_ringtone">Nastavit vlastní vyzvánění</string>
+    <string name="change_ringtone">Změnit vyzvánění</string>
+    <string name="block_numbers">Zablokovat čísla</string>
+    <string name="blocking_number_is_not_supported">Blokování čísla není podporováno, aplikace Connect You není výchozí aplikací telefonu/SMS</string>
+    <string name="unblock_number">Odblokovat číslo</string>
+    <string name="search_contacts">Hledat kontakty</string>
+    <string name="start_a_new_conversation">Začít novou konverzaci</string>
+    <string name="favorites_only">Pouze oblíbené</string>
+    <string name="favorite">Oblíbené</string>
+    <string name="cant_respond">Nelze odpovědět</string>
+    <string name="import_sms">Importovat SMS</string>
+    <string name="export_sms">Exportovat SMS</string>
+    <string name="backup_naming_scheme">Schéma názvů záloh</string>
+    <string name="backup_naming_scheme_hint">%d: datum, %t: čas, %s: zdroj (local, device), je vyžadován zdroj a buď datum nebo čas</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 5e8d443d..1e5fafd8 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="copied">Kopieret til udklipsholder</string>
-    <string name="cancel">Annullér</string>
+    <string name="cancel">Annuller</string>
     <string name="reset">Nulstil</string>
     <string name="retry">Prøv igen</string>
     <string name="new_contact">Ny kontakt</string>
@@ -9,10 +9,10 @@
     <string name="dial">Ring</string>
     <string name="contact">Kontakt</string>
     <string name="contacts">Kontakter</string>
-    <string name="filter">Filtrér</string>
+    <string name="filter">Filtrer</string>
     <string name="more">Mere</string>
     <string name="save">Gem</string>
-    <string name="empty_name">Navn kan ikke være tomt!</string>
+    <string name="empty_name">Navn må ikke være tomt!</string>
     <string name="import_success">Importeret.</string>
     <string name="phone">Telefon</string>
     <string name="phone_number">Telefonnummer</string>
@@ -24,7 +24,7 @@
     <string name="anniversary">Årsdag</string>
     <string name="note">Note</string>
     <string name="new_group">Ny</string>
-    <string name="group_already_exists">Gruppe eksisterer allerede</string>
+    <string name="group_already_exists">Gruppe findes allerede</string>
     <string name="groups">Grupper</string>
     <string name="device">Enhed</string>
     <string name="local">Lokal</string>
@@ -48,9 +48,9 @@
     <string name="add_to_contact">Føj til kontakt</string>
     <string name="show_more_fields">Vis flere felter</string>
     <string name="message">Besked</string>
-    <string name="edit">Redigér</string>
+    <string name="edit">Rediger</string>
     <string name="max_backup_amount">Maks. antal backups</string>
-    <string name="author">Autor</string>
+    <string name="author">Udvikler</string>
     <string name="choose_dir">Mappe</string>
     <string name="misc">Diverse</string>
     <string name="both">Begge</string>
@@ -94,7 +94,7 @@
     <string name="custom">Brugerdefineret</string>
     <string name="homepage">Startside</string>
     <string name="ftp">FTP</string>
-    <string name="manage_groups">Administrér grupper</string>
+    <string name="manage_groups">Administrer grupper</string>
     <string name="blog">Blog</string>
     <string name="delete_group">Slet gruppe for alle</string>
     <string name="title">Titel</string>
@@ -114,4 +114,33 @@
     <string name="dark">Mørk</string>
     <string name="auto_backup">Automatisk backup</string>
     <string name="start_tab">Start-fane</string>
+    <string name="select_custom_ringtone">Vælg brugerdefineret ringetone</string>
+    <string name="change_ringtone">Skift ringetone</string>
+    <string name="recent_calls">Seneste opkald</string>
+    <string name="block_numbers">Bloker numre</string>
+    <string name="blocking_number_is_not_supported">Blokering af numre understøttes ikke, da Connect You ikke er standardappen for SMS/Telefon</string>
+    <string name="number_blocked">Nummer blokeret</string>
+    <string name="block_number">Bloker nummer</string>
+    <string name="search_contacts">Søg i kontakter</string>
+    <string name="start_a_new_conversation">Start en ny samtale</string>
+    <string name="fax_home">Fax hjem</string>
+    <string name="fax_work">Fax arbejde</string>
+    <string name="in_progress">Igangværende</string>
+    <string name="ringing">Ringer…</string>
+    <string name="disconnecting">Afbryder…</string>
+    <string name="connecting">Forbinder…</string>
+    <string name="mute">Sæt på lydløs</string>
+    <string name="calls">Opkald</string>
+    <string name="decline">Afvis</string>
+    <string name="accept">Acceptér</string>
+    <string name="unknown_number">Ukendt Nummer</string>
+    <string name="confirm_start_call">Vil du ringe til %1$s?</string>
+    <string name="biometric_authentication_summary">Kræv biometrisk godkendelse (fx fingeraftryk), før appen kan tilgås.</string>
+    <string name="speakers">Højtalere</string>
+    <string name="security">Sikkerhed</string>
+    <string name="biometric_authentication">Biometrisk Godkendelse</string>
+    <string name="amoled">Amoled</string>
+    <string name="call_ended">Opkald Afsluttet</string>
+    <string name="call_from">Opkald fra</string>
+    <string name="favorites_only">Kun favoritter</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 8b444d6e..c3ecb7b7 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -13,7 +13,7 @@
     <string name="mobile">Mobil</string>
     <string name="other">Andere</string>
     <string name="search" tools:ignore="PrivateResource">Suchen</string>
-    <string name="irreversible">Bist du Sicher\? Es kann nicht Rückgängig gemacht werden.</string>
+    <string name="irreversible">Sind Sie Sicher? Dies kann nicht rückgängig gemacht werden.</string>
     <string name="cancel">Abbrechen</string>
     <string name="retry">Erneut versuchen</string>
     <string name="delete_contact">Kontakt löschen</string>
@@ -101,10 +101,55 @@
     <string name="contacts">Kontakte</string>
     <string name="send">Nachricht senden</string>
     <string name="messages">Nachrichten</string>
-    <string name="connection_error">Verbindungsfehler! Stellen sie sicher, dass der Flugmodus ausgeschaltet ist!</string>
+    <string name="connection_error">Verbindungsfehler! Stellen Sie sicher, dass der Flugmodus ausgeschaltet ist.</string>
     <string name="phone_number">Telefonnummer</string>
     <string name="delete_thread">Unterhaltung löschen</string>
     <string name="delete_message">Nachricht löschen</string>
     <string name="private_sms_database">Private SMS Datenbank</string>
     <string name="save">Speichern</string>
+    <string name="amoled">Amoled</string>
+    <string name="private_sms_database_desc">Die SMS wir nur in der App gespeichert und ist für andere Apps nicht zugänglich.</string>
+    <string name="import_confirm">Möchten Sie die ausgewählte VCF-Datei importieren?</string>
+    <string name="add_website">Website hinzufügen</string>
+    <string name="add_phone_number">Telefonnummer hinzufügen</string>
+    <string name="add_address">Adresse hinzufügen</string>
+    <string name="add_note">Notiz hinzufügen</string>
+    <string name="add_event">Ereignis hinzufügen</string>
+    <string name="date">Datum</string>
+    <string name="add_e_mail">E-Mail-Adresse hinzufügen</string>
+    <string name="send_message_as_multiple">Möchten Sie die Nachricht als mehrere kleinere Nachrichten versenden?</string>
+    <string name="biometric_authentication_summary">Biometrische Authentifizierung (z.B. Fingerabdruck) verlangen, wenn die App geöffnet wird.</string>
+    <string name="biometric_authentication">Biometrische Authentifizierung</string>
+    <string name="security">Sicherheit</string>
+    <string name="confirm_start_call">Möchten Sie %1$s anrufen?</string>
+    <string name="ringing">Klingeln…</string>
+    <string name="speakers">Lautsprecher</string>
+    <string name="connecting">Verbinden…</string>
+    <string name="disconnecting">Trennen…</string>
+    <string name="decline">Ablehnen</string>
+    <string name="accept">Annehmen</string>
+    <string name="calls">Anrufe</string>
+    <string name="unknown_number">Unbekannte Nummer</string>
+    <string name="dialing">Wählen…</string>
+    <string name="call_from">Anruf von</string>
+    <string name="call_ended">Anruf beendet</string>
+    <string name="block_numbers">Nummern blockieren</string>
+    <string name="recent_calls">Letzte Anrufe</string>
+    <string name="select_custom_ringtone">Benutzerdefinierten Klingelton auswählen</string>
+    <string name="number_blocked">Nummer blockiert</string>
+    <string name="change_ringtone">Klingelton ändern</string>
+    <string name="block_number">Nummer blockieren</string>
+    <string name="start_a_new_conversation">Eine neue Unterhaltung beginnen</string>
+    <string name="search_contacts">Kontakte suchen</string>
+    <string name="blocking_number_is_not_supported">"Rufnummerblockade wird nicht unterstützt,  Connect you ist nicht die Standard SMS/Telefon App"</string>
+    <string name="unblock_number">Rufnummer wieder freigeben</string>
+    <string name="in_progress">In Bearbeitung</string>
+    <string name="mute">Stumm, lautlos</string>
+    <string name="dial_pad">Nummerneingabe Telefon</string>
+    <string name="key_pad">Tastatur</string>
+    <string name="favorite">Favorit</string>
+    <string name="favorites_only">Nur Favoriten</string>
+    <string name="import_sms">SMS importieren</string>
+    <string name="export_sms">SMS exportieren</string>
+    <string name="backup_naming_scheme_hint">%d: Datum, %t: Zeit. %s: Quelle (lokal, Gerät), die Quelle und entweder Datum oder Zeit müssen angegeben werden</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 815d50ad..74eab847 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -116,4 +116,41 @@
     <string name="add_note">Añadir nota</string>
     <string name="date">Fecha</string>
     <string name="import_confirm">¿Desea importar el archivo VCF seleccionado?</string>
+    <string name="amoled">Amoled</string>
+    <string name="biometric_authentication">Autenticación biométrica</string>
+    <string name="security">Seguridad</string>
+    <string name="biometric_authentication_summary">Requerir autenticación biométrica (por ejemplo, huella digital) antes de poder acceder a la aplicación.</string>
+    <string name="in_progress">En curso</string>
+    <string name="ringing">Sonando…</string>
+    <string name="disconnecting">Desconectando…</string>
+    <string name="connecting">Conectando…</string>
+    <string name="confirm_start_call">¿Quieres llamar a %1$s?</string>
+    <string name="mute">Silenciar</string>
+    <string name="speakers">Altavoces</string>
+    <string name="calls">Llamadas</string>
+    <string name="decline">Rechazar</string>
+    <string name="accept">Aceptar</string>
+    <string name="unknown_number">Número desconocido</string>
+    <string name="dial_pad">Marcador</string>
+    <string name="call_ended">Llamada terminada</string>
+    <string name="call_from">Llamada de</string>
+    <string name="dialing">Llamando...</string>
+    <string name="key_pad">Teclado</string>
+    <string name="change_ringtone">Cambiar tono de llamada</string>
+    <string name="block_numbers">Bloquar números</string>
+    <string name="blocking_number_is_not_supported">No se admite el bloqueo de números, Connect You no es la aplicación SMS/Teléfono predeterminada</string>
+    <string name="block_number">Bloquar número</string>
+    <string name="select_custom_ringtone">Seleccionar tono de llamada personalizado</string>
+    <string name="recent_calls">Últimas llamadas</string>
+    <string name="number_blocked">Número bloqueado</string>
+    <string name="unblock_number">Desbloquear número</string>
+    <string name="start_a_new_conversation">Iniciar una nueva conversión</string>
+    <string name="search_contacts">Buscar contactos</string>
+    <string name="favorites_only">Solo favoritos</string>
+    <string name="favorite">Favorito</string>
+    <string name="export_sms">Exportar SMS</string>
+    <string name="backup_naming_scheme">Esquema de nombres de la copia de seguridad</string>
+    <string name="cant_respond">No puedo responder</string>
+    <string name="import_sms">Importar SMS</string>
+    <string name="backup_naming_scheme_hint">%d: fecha, %t: hora, %s: fuente (local, dispositivo), se requiere la fuente y la fecha o la hora</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index d0302cba..6297b6aa 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -116,4 +116,41 @@
     <string name="light">Hele kujundus</string>
     <string name="about">Rakenduse teave</string>
     <string name="import_confirm">Kas sa soovid importida valitud VCF-faili?</string>
+    <string name="amoled">Amoled</string>
+    <string name="security">Turvalisus</string>
+    <string name="biometric_authentication">Biomeetriline autentimine</string>
+    <string name="biometric_authentication_summary">Muuda biomeetriline autentimine (näiteks sõrmejälje alusel) nõutavaks enne rakenduse avamist.</string>
+    <string name="in_progress">Toimetamisel</string>
+    <string name="ringing">Helistame…</string>
+    <string name="disconnecting">Katkestame ühendust…</string>
+    <string name="connecting">Ühendame…</string>
+    <string name="confirm_start_call">Kas sa soovid helistada %1$sle?</string>
+    <string name="mute">Summuta</string>
+    <string name="speakers">Kõlarid</string>
+    <string name="calls">Kõned</string>
+    <string name="decline">Keeldu</string>
+    <string name="accept">Võta vastu</string>
+    <string name="unknown_number">Tundmatu number</string>
+    <string name="dial_pad">Klahvistik</string>
+    <string name="call_ended">Kõne on lõppenud</string>
+    <string name="dialing">Helistame…</string>
+    <string name="call_from">Kõne teine osapool:</string>
+    <string name="key_pad">Klahvistik</string>
+    <string name="recent_calls">Hiljutised kõned</string>
+    <string name="block_numbers">Blokeeri telefoninumbreid</string>
+    <string name="number_blocked">Telefoninumber on blokeeritud</string>
+    <string name="block_number">Blokeeri telefoninumber</string>
+    <string name="select_custom_ringtone">Vali sobilik telefonihelin</string>
+    <string name="change_ringtone">Muuda telefonihelinat</string>
+    <string name="blocking_number_is_not_supported">Kuna Connect You pole selles nutiseadmes vaikimisi kasutatav telefoni- ja SMS-sõnumirakendus, siis telefoninumbrite blokeerimine ei ole võimalik</string>
+    <string name="unblock_number">Lõpeta telefoninumbri blokeerimine</string>
+    <string name="search_contacts">Otsi kontaktide hulgast</string>
+    <string name="start_a_new_conversation">Alusta uut vestlust</string>
+    <string name="favorites_only">Ainult lemmikud</string>
+    <string name="favorite">Lemmik</string>
+    <string name="cant_respond">Ma ei saa vastata</string>
+    <string name="import_sms">Impordi SMS\'id</string>
+    <string name="export_sms">Ekspordi SMD\'id</string>
+    <string name="backup_naming_scheme">Varukoopiate nimeloogika</string>
+    <string name="backup_naming_scheme_hint">%d: kuupäev, %t: kellaaeg, %s: allikas (kohalik, seade), nõutav on allikas ja kas kuupäev või kellaaeg</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 0d6a5f54..5d0aee5f 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -3,36 +3,36 @@
     <string name="reset">بازنشانی</string>
     <string name="new_contact">مخاطب جدید</string>
     <string name="copy">رونوشت</string>
-    <string name="delete_contact">حذف مخاطب</string>
+    <string name="delete_contact">پاک‌کردن مخاطب</string>
     <string name="create_contact">ایجاد مخاطب</string>
     <string name="retry">تلاش دوباره</string>
     <string name="about">درباره ما</string>
-    <string name="cancel">انصراف</string>
-    <string name="irreversible">آیا مطمئن هستید؟ این کار برگشت‌ناپذیر است!</string>
-    <string name="okay">باشه</string>
+    <string name="cancel">وازدن</string>
+    <string name="irreversible">آیا آسوده دل هستید؟ این کار برگشت‌ناپذیر است!</string>
+    <string name="okay">باشد</string>
     <string name="search" tools:ignore="PrivateResource">جستجو</string>
     <string name="share">هم‌رسانی</string>
     <string name="theme">پوسته</string>
     <string name="light">روشن</string>
-    <string name="delete">حذف</string>
+    <string name="delete">پاک‌کردن</string>
     <string name="copied">در بریده‌دان کپی شد</string>
-    <string name="translation">ترجمه</string>
+    <string name="translation">ترزبانی</string>
     <string name="dark">تیره</string>
     <string name="settings">تنظیمات</string>
     <string name="author">نویسنده</string>
     <string name="system">سامانه</string>
     <string name="message_too_long">پیام شما بسیار بلند است!</string>
     <string name="backup">پشتیبان گیری</string>
-    <string name="type">نوع</string>
-    <string name="photo">تصویر</string>
+    <string name="type">سردگ</string>
+    <string name="photo">فرتور</string>
     <string name="name">نام</string>
-    <string name="max_backup_amount">بیشینه تعداد پشتیبان گیری ها</string>
-    <string name="choose_dir">مسیر</string>
-    <string name="version">نسخه</string>
+    <string name="max_backup_amount">بیشینه شمار پشتیبان‌گیری‌ها</string>
+    <string name="choose_dir">پوشه</string>
+    <string name="version">نگارش</string>
     <string name="appearance">ظاهر</string>
     <string name="backup_password">رمز</string>
     <string name="add_to_contact">افزودن به مخاطبین</string>
-    <string name="create_shortcut">ایجاد میان بر</string>
+    <string name="create_shortcut">ساختن میان‌بر</string>
     <string name="dial">تماس</string>
     <string name="message">پیام</string>
     <string name="contact">مخاطب</string>
@@ -40,15 +40,15 @@
     <string name="filter">پالایه</string>
     <string name="more">بیشتر</string>
     <string name="show_more_fields">نمایش جستار های بیشتر</string>
-    <string name="empty_name">نام نمی تواند خالی باشد!</string>
-    <string name="export_success">برون بُرد شد.</string>
-    <string name="import_success">درون بُرد شد.</string>
+    <string name="empty_name">نام نمی‌تواند تهی باشد!</string>
+    <string name="export_success">برون‌بُرد شد.</string>
+    <string name="import_success">درون‌بُرد شد.</string>
     <string name="home">خانه</string>
     <string name="work">پیشه</string>
     <string name="mobile">شماره تلفن</string>
     <string name="other">دیگر</string>
     <string name="local">برزنی</string>
-    <string name="pick_contact">انتخاب مخاطب</string>
+    <string name="pick_contact">گزیدن مخاطب</string>
     <string name="website">وبسایت</string>
     <string name="fax_work">فاکس محل کار</string>
     <string name="assistant">دستیار</string>
@@ -78,21 +78,21 @@
     <string name="new_group">نو</string>
     <string name="reply">پاسخ</string>
     <string name="device">دستگاه</string>
-    <string name="auto_backup">پشتیبان گیری (بکاپ) خودکار</string>
+    <string name="auto_backup">پشتیبان‌گیری (زاپاس) خودکار</string>
     <string name="misc">متفرقه (بقیه)</string>
     <string name="behavior">رفتار</string>
     <string name="encrypt_backups">رمزگذاری پشتیبان گیری به عنوان فایل زیپ</string>
     <string name="add_address">افزودن نشانی</string>
     <string name="import_vcf">درون بردن vCard</string>
     <string name="export_vcf">برون بردن vCard</string>
-    <string name="start_tab">آغاز برگه</string>
-    <string name="backup_interval">فاصله پشتیبان گیری ها</string>
+    <string name="start_tab">برگه‌ی آغازین</string>
+    <string name="backup_interval">فاصله پشتیبان‌گیری‌ها</string>
     <string name="none">هیچ کدام</string>
     <string name="colorful_contact_icons">رگارنگ کردن پرتره مخاطبین</string>
     <string name="blog">وبلاگ</string>
     <string name="manage_groups">مدیریت گروه ها</string>
     <string name="delete_group">پاک کردن گروه برای همه</string>
-    <string name="title">سر تیتر</string>
+    <string name="title">سرنویس</string>
     <string name="group_already_exists">گروه از پیش وجود دارد</string>
     <string name="groups">گروه ها</string>
     <string name="nothing_here">اینجا چیزی نیست.</string>
@@ -100,7 +100,7 @@
     <string name="email">ایمیل</string>
     <string name="address">نشانی</string>
     <string name="phone_number">شماره تلفن</string>
-    <string name="account_type">نوع حساب</string>
+    <string name="account_type">سردگ شناسه</string>
     <string name="first_name">نام</string>
     <string name="last_name">نام خانوادگی</string>
     <string name="nick_name">آوازه</string>
@@ -116,4 +116,36 @@
     <string name="private_sms_database">دیتابیس پیامک خصوصی</string>
     <string name="collapse_bottom_bar">فروریختن کادر پایینی هنگام پیمایش</string>
     <string name="import_confirm">آیا میخواهید فایل VCF انتخاب شده را درون بری کنید؟</string>
+    <string name="speakers">بلندگوها</string>
+    <string name="security">امنیت</string>
+    <string name="calls">تماس ها</string>
+    <string name="select_custom_ringtone">گزیدن صدای زنگ سفارشی</string>
+    <string name="change_ringtone">دگرش صدای زنگ</string>
+    <string name="recent_calls">تماس‌های تازه</string>
+    <string name="block_numbers">شماره‌های بندآمده</string>
+    <string name="blocking_number_is_not_supported">بندآوردن شماره پشتیبانی نمی‌شود، کانتکت‌یو برنامه‌ی پیش‌گزیده‌ی پیامک/تلفن نیست</string>
+    <string name="number_blocked">شماره بندآمد</string>
+    <string name="block_number">بندآوردن شماره</string>
+    <string name="unblock_number">بازگشودن شماره</string>
+    <string name="search_contacts">جستجو مخاطبین</string>
+    <string name="amoled">مشکی ناب</string>
+    <string name="disconnecting">گسستن…</string>
+    <string name="connecting">پیوستن…</string>
+    <string name="confirm_start_call">آیا می‌خواهید به %1$s زنگ بزنید؟</string>
+    <string name="biometric_authentication">اُستوانش کیستی با بایومتریک</string>
+    <string name="accept">پذیرش</string>
+    <string name="decline">پس‌زدن</string>
+    <string name="unknown_number">شماره‌ی ناشناس</string>
+    <string name="dial_pad">شماره‌گیر</string>
+    <string name="in_progress">در جریان</string>
+    <string name="ringing">زنگ خوردن…</string>
+    <string name="mute">بی‌صدا</string>
+    <string name="biometric_authentication_summary">نیاز به اُستوانش کیستی با بایومتریک (مانند اثرانگشت) پیش از دسترسی به برنامه.</string>
+    <string name="call_ended">تماس پایان یافت</string>
+    <string name="dialing">زنگ زدن...</string>
+    <string name="call_from">تماس از</string>
+    <string name="start_a_new_conversation">آغاز گفتگو‌یی نو</string>
+    <string name="favorite">برگزیدن</string>
+    <string name="favorites_only">تنها برگزیدگان</string>
+    <string name="key_pad">برگه کلید</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index e7d2110c..a7ca3f57 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -116,4 +116,36 @@
     <string name="date">Päiväys</string>
     <string name="add_note">Lisää muistiinpano</string>
     <string name="import_confirm">Haluatko tuoda valitun VCF-tiedoston?</string>
+    <string name="number_blocked">Numero estetty</string>
+    <string name="block_number">Estä numero</string>
+    <string name="unblock_number">Poista numeron esto</string>
+    <string name="blocking_number_is_not_supported">Numeron esto ei ole tuettu. Connect You ei ole oletusarvoinen tekstiviesti-/puhelinsovellus</string>
+    <string name="search_contacts">Etsi yhteystietoja</string>
+    <string name="start_a_new_conversation">Aloita uusi keskustelu</string>
+    <string name="accept">Hyväksy</string>
+    <string name="decline">Kieltäydy</string>
+    <string name="unknown_number">Tuntematon numero</string>
+    <string name="change_ringtone">Vaihda soittoääni</string>
+    <string name="dialing">Soitetaan...</string>
+    <string name="recent_calls">Viimeisimmät puhelut</string>
+    <string name="amoled">Amoled</string>
+    <string name="disconnecting">Katkaistaan yhteys…</string>
+    <string name="favorite">Suosikki</string>
+    <string name="favorites_only">Vain suosikit</string>
+    <string name="in_progress">Meneillään</string>
+    <string name="ringing">Soitetaan…</string>
+    <string name="connecting">Yhdistetään…</string>
+    <string name="confirm_start_call">Haluatko soittaa %1$s?</string>
+    <string name="mute">Mykistä</string>
+    <string name="speakers">Kaiuttimet</string>
+    <string name="security">Turvallisuus</string>
+    <string name="biometric_authentication">Biometrinen todennus</string>
+    <string name="biometric_authentication_summary">Vaadi biometrinen todennus (esim. sormenjälki), ennen kuin sovellusta voi käyttää.</string>
+    <string name="calls">Puhelut</string>
+    <string name="dial_pad">Numeronäppäimistö</string>
+    <string name="call_ended">Puhelu päättyi</string>
+    <string name="key_pad">Näppäimistö</string>
+    <string name="select_custom_ringtone">Valitse mukautettu soittoääni</string>
+    <string name="block_numbers">Estä numerot</string>
+    <string name="call_from">Puhelu soittajalta</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index c2e5c541..418da0fc 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -7,7 +7,7 @@
     <string name="event">Évènement</string>
     <string name="first_name">Prénom</string>
     <string name="last_name">Nom de Famille</string>
-    <string name="author">Auteur·e</string>
+    <string name="author">Auteurs</string>
     <string name="version">Version</string>
     <string name="translation">Traduction</string>
     <string name="app_name">Connect You</string>
@@ -38,7 +38,7 @@
     <string name="irreversible">Êtes vous sûr \? Cela ne peut pas être annulé !</string>
     <string name="create_contact">Créer un contact</string>
     <string name="reset">Réinitialiser</string>
-    <string name="okay">D\'accord</string>
+    <string name="okay">Ok</string>
     <string name="device">Appareil</string>
     <string name="local">Local</string>
     <string name="nothing_here">Rien ici.</string>
@@ -62,7 +62,7 @@
     <string name="filter">Filtre</string>
     <string name="more">Plus</string>
     <string name="show_more_fields">Afficher plus de champs</string>
-    <string name="show_less">Montrer moins</string>
+    <string name="show_less">Afficher moins</string>
     <string name="website">Site web</string>
     <string name="nick_name">Surnom</string>
     <string name="organization">Organisation</string>
@@ -71,13 +71,13 @@
     <string name="blog">Blog</string>
     <string name="new_group">Nouveau</string>
     <string name="selected">%1$s sélectionné</string>
-    <string name="backup_interval">Intervalle de Sauvegarde</string>
+    <string name="backup_interval">Intervalle de sauvegarde</string>
     <string name="max_backup_amount">Nombre maximal de sauvegardes</string>
     <string name="message">Message</string>
     <string name="new_contact">Nouveau contact</string>
     <string name="create_shortcut">Créer un raccourci</string>
     <string name="dial">Numérotation</string>
-    <string name="group_already_exists">Le groupe existe déjà</string>
+    <string name="group_already_exists">Ce groupe existe déjà</string>
     <string name="groups">Groupes</string>
     <string name="manage_groups">Gérer les groupes</string>
     <string name="delete_group">Supprimer le groupe pour tout le monde</string>
@@ -98,17 +98,17 @@
     <string name="delete_message">Effacer le message</string>
     <string name="appearance">Apparence</string>
     <string name="encrypt_backups">Chiffrer les sauvegardes sous format zip</string>
-    <string name="message_too_long">Le message est trop long !</string>
+    <string name="message_too_long">Le message est trop long !</string>
     <string name="contacts">Contacts</string>
     <string name="send">Send message</string>
     <string name="backup">Sauvegarde</string>
-    <string name="private_sms_database_desc">Les SMS ne seront stockés que dans l\'application et ne seront pas accessibles dans d\'autres applications.</string>
-    <string name="pick_contact">Choisir le contact</string>
+    <string name="private_sms_database_desc">Les SMS ne seront stockés que dans l\'application et ne seront pas accessible par les autres applications.</string>
+    <string name="pick_contact">Choisissez un contact</string>
     <string name="messages">Messages</string>
     <string name="phone_number">N° de téléphone</string>
     <string name="backup_password">Mot de passe</string>
     <string name="connection_error">Impossible de se connecter. Veuillez vous assurer que le mode avion est désactivé.</string>
-    <string name="send_message_as_multiple">Souhaitez-vous envoyer le message sous la forme de plusieurs petits messages ?</string>
+    <string name="send_message_as_multiple">Souhaitez-vous envoyer le message sous la forme de plusieurs petits messages ?</string>
     <string name="import_confirm">Voulez-vous importer le fichier VCF sélectionné ?</string>
     <string name="add_website">Ajouter un site Web</string>
     <string name="add_event">Ajouter un évènement</string>
@@ -117,4 +117,36 @@
     <string name="add_e_mail">Ajouter une adresse mail</string>
     <string name="add_address">Ajouter une adresse</string>
     <string name="add_note">Ajouter une note</string>
+    <string name="block_numbers">Bloquer des numéros</string>
+    <string name="number_blocked">Numéro bloqué</string>
+    <string name="blocking_number_is_not_supported">Le blocage de numéros n\'est pas supporté, Connect You n\'est pas l\'appli de SMS/Téléphone par défaut</string>
+    <string name="block_number">Bloquer le numéro</string>
+    <string name="unblock_number">Débloquer le numéro</string>
+    <string name="start_a_new_conversation">Démarrer une nouvelle conversation</string>
+    <string name="search_contacts">Rechercher des contacts</string>
+    <string name="amoled">Noir pur</string>
+    <string name="biometric_authentication_summary">Exiger une authentification biométrique (par ex. empreinte digitale) pour accéder à l\'application.</string>
+    <string name="favorite">Favori</string>
+    <string name="favorites_only">Seulement les favoris</string>
+    <string name="ringing">Sonne…</string>
+    <string name="disconnecting">Déconnexion…</string>
+    <string name="connecting">Connexion…</string>
+    <string name="in_progress">En cours</string>
+    <string name="confirm_start_call">Voulez-vous appeler %1$s ?</string>
+    <string name="mute">Silencieux</string>
+    <string name="speakers">Hautparleurs</string>
+    <string name="security">Sécurité</string>
+    <string name="biometric_authentication">Authentification biométrique</string>
+    <string name="calls">Appels</string>
+    <string name="decline">Refuser</string>
+    <string name="accept">Accepter</string>
+    <string name="dial_pad">Pavé de numérotation</string>
+    <string name="select_custom_ringtone">Sélectionner une sonnerie personnalisée</string>
+    <string name="change_ringtone">Changer la sonnerie</string>
+    <string name="recent_calls">Appels récents</string>
+    <string name="unknown_number">Numéro inconnu</string>
+    <string name="call_ended">Appel terminé</string>
+    <string name="dialing">Numérotation…</string>
+    <string name="call_from">Appel de</string>
+    <string name="key_pad">Clavier numérique</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 099d7f66..ee35b389 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -116,4 +116,41 @@
     <string name="add_event">Engadir evento</string>
     <string name="date">Data</string>
     <string name="import_confirm">Queres importar o ficheiro VCF seleccionado?</string>
+    <string name="amoled">AMOLED</string>
+    <string name="security">Seguridade</string>
+    <string name="biometric_authentication">Autenticación biométrica</string>
+    <string name="biometric_authentication_summary">Requerir autenticación biométrica (ex. impresión dactilar) para poder acceder á app.</string>
+    <string name="in_progress">En proceso</string>
+    <string name="ringing">A chamar…</string>
+    <string name="speakers">Altofalantes</string>
+    <string name="dial_pad">Teclado</string>
+    <string name="decline">Rexeitar</string>
+    <string name="connecting">A conectar…</string>
+    <string name="disconnecting">A desconectar…</string>
+    <string name="confirm_start_call">Queres chamar a %1$s?</string>
+    <string name="mute">Acalar</string>
+    <string name="calls">Chamadas</string>
+    <string name="accept">Aceptar</string>
+    <string name="unknown_number">Número Descoñecido</string>
+    <string name="call_ended">Rematou a chamada</string>
+    <string name="dialing">Marcando...</string>
+    <string name="call_from">Chamada de</string>
+    <string name="key_pad">Teclado</string>
+    <string name="change_ringtone">Cambiar ton</string>
+    <string name="recent_calls">Chamadas recentes</string>
+    <string name="block_numbers">Bloquear números</string>
+    <string name="select_custom_ringtone">Elixe ton persoal</string>
+    <string name="blocking_number_is_not_supported">Non podemos bloquear números, Connect You non é a app de SMS/Teléfono por defecto</string>
+    <string name="number_blocked">Número bloqueado</string>
+    <string name="block_number">Bloquear número</string>
+    <string name="unblock_number">Desbloquear número</string>
+    <string name="search_contacts">Buscar contactos</string>
+    <string name="start_a_new_conversation">Comezar nova conversa</string>
+    <string name="favorite">Favorito</string>
+    <string name="favorites_only">Só favoritos</string>
+    <string name="backup_naming_scheme">Formato do nome da copia</string>
+    <string name="backup_naming_scheme_hint">%d: data, %t: hora, %s: orixe (local, dispositivo), a orixe é requerida mais a data ou a hora</string>
+    <string name="cant_respond">Non pode responder</string>
+    <string name="export_sms">Exportar SMS</string>
+    <string name="import_sms">Importar SMS</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 5b96fa21..2abcae88 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -9,14 +9,14 @@
     <string name="phone">फोन</string>
     <string name="address">पता</string>
     <string name="organization">संगठन</string>
-    <string name="home">घर</string>
+    <string name="home">गृह</string>
     <string name="anniversary">वर्षगांठ</string>
     <string name="note">टिप्पणी</string>
     <string name="blog">ब्लॉग</string>
     <string name="ftp">FTP</string>
     <string name="homepage">मुखपृष्ठ</string>
     <string name="manage_groups">समूह प्रबंधित करें</string>
-    <string name="delete_group">सभी के लिए समूह हटाएं</string>
+    <string name="delete_group">सभी के लिए समूह मिटाएं</string>
     <string name="group_already_exists">समूह पहले से मौजूद है</string>
     <string name="send_message_as_multiple">क्या आप संदेश को अनेक छोटे-छोटे रूपों में भेजना चाहते हैं?</string>
     <string name="start_tab">प्रारंभ टैब</string>
@@ -25,13 +25,13 @@
     <string name="colorful_contact_icons">रंगीन संपर्क चिह्न</string>
     <string name="translation">अनुवाद</string>
     <string name="import_vcf">vCard आयात करें</string>
-    <string name="import_confirm">क्या आप चयनित VCF फ़ाइल आयात करना चाहते हैं?</string>
+    <string name="import_confirm">क्या आप चयनित VCF फाइल आयात करना चाहते हैं?</string>
     <string name="copied">क्लिपबोर्ड पर कॉपी किया गया</string>
-    <string name="delete_contact">संपर्क हटाएँ</string>
+    <string name="delete_contact">संपर्क मिटाएं</string>
     <string name="okay">ठीक है</string>
     <string name="reset">रीसेट</string>
-    <string name="retry">पुन: प्रयास</string>
-    <string name="share">शेयर</string>
+    <string name="retry">पुन: प्रयास करें</string>
+    <string name="share">साझा करें</string>
     <string name="add_to_contact">संपर्क में जोडें</string>
     <string name="create_shortcut">शॉर्टकट बनाएं</string>
     <string name="contact">संपर्क</string>
@@ -39,21 +39,21 @@
     <string name="edit">संपादित करें</string>
     <string name="filter">फिल्टर</string>
     <string name="more">अधिक</string>
-    <string name="show_more_fields">और फ़ील्ड दिखाएं</string>
+    <string name="show_more_fields">अधिक क्षेत्र दिखाएं</string>
     <string name="show_less">कम दिखाएं</string>
     <string name="pick_contact">संपर्क चुनें</string>
     <string name="save">सहेजें</string>
     <string name="empty_name">नाम खाली नहीं हो सकता!</string>
     <string name="import_success">आयातित।</string>
-    <string name="export_success">निर्यात किया गया।</string>
-    <string name="nothing_here">यहाँ कुछ नहीं।</string>
+    <string name="export_success">निर्यातित।</string>
+    <string name="nothing_here">यहां कुछ नहीं।</string>
     <string name="email">ई-मेल</string>
     <string name="event">आयोजन</string>
     <string name="website">वेबसाइट</string>
-    <string name="photo">तस्वीर</string>
+    <string name="photo">फोटो</string>
     <string name="phone_number">फोन नंबर</string>
-    <string name="sort_order">क्रमबद्ध करें</string>
-    <string name="account_type">खाते का प्रकार</string>
+    <string name="sort_order">छंटाई क्रम</string>
+    <string name="account_type">खाता प्रकार</string>
     <string name="name">नाम</string>
     <string name="first_name">पहला नाम</string>
     <string name="nick_name">उपनाम</string>
@@ -62,10 +62,10 @@
     <string name="work">कार्य</string>
     <string name="mobile">मोबाइल</string>
     <string name="other">अन्य</string>
-    <string name="custom">कस्टम</string>
+    <string name="custom">तदनुकूल</string>
     <string name="car">कार</string>
-    <string name="fax_home">घर फैक्स</string>
-    <string name="fax_work">फैक्स कार्य</string>
+    <string name="fax_home">गृह फैक्स</string>
+    <string name="fax_work">कार्य फैक्स</string>
     <string name="assistant">सहायक</string>
     <string name="birthday">जन्मदिन</string>
     <string name="title">शीर्षक</string>
@@ -74,24 +74,24 @@
     <string name="device">डिवाइस</string>
     <string name="local">स्थानीय</string>
     <string name="copy">कॉपी</string>
-    <string name="move">स्थान परिवर्तन</string>
-    <string name="delete">हटाएं</string>
+    <string name="move">स्थानान्तर</string>
+    <string name="delete">मिटाएं</string>
     <string name="selected">%1$s चयनित</string>
     <string name="messages">संदेश</string>
     <string name="send">संदेश भेजें</string>
     <string name="reply">उत्तर</string>
-    <string name="connection_error">कनेक्ट नहीं हो सका। कृपया सुनिश्चित करें कि हवाई जहाज़ मोड बंद है।</string>
+    <string name="connection_error">जुड़ नहीं सका। कृपया सुनिश्चित करें कि हवाई जहाज़ मोड बंद है।</string>
     <string name="message_too_long">संदेश बहुत लंबा है!</string>
     <string name="private_sms_database">निजी SMS डेटाबेस</string>
     <string name="delete_thread">थ्रेड मिटाएं</string>
-    <string name="delete_message">संदेश हटाएं</string>
-    <string name="settings">सेटिंग्स</string>
+    <string name="delete_message">संदेश मिटाएं</string>
+    <string name="settings">सेटिंग</string>
     <string name="theme">थीम</string>
     <string name="system">सिस्टम</string>
     <string name="light">हल्की</string>
     <string name="dark">गहरी</string>
     <string name="backup_interval">बैकअप अंतराल</string>
-    <string name="choose_dir">डॉयरेक्टरी</string>
+    <string name="choose_dir">निर्देशिका</string>
     <string name="both">दोनों</string>
     <string name="none">कोई नहीं</string>
     <string name="misc">विविध</string>
@@ -100,12 +100,12 @@
     <string name="appearance">दिखावट</string>
     <string name="backup">बैकअप</string>
     <string name="backup_password">पासवर्ड</string>
-    <string name="about">बारे में</string>
+    <string name="about">ऐप के बारे में</string>
     <string name="license">लाइसेंस</string>
     <string name="author">लेखक</string>
     <string name="version">संस्करण</string>
     <string name="add_website">वेबसाइट जोड़ें</string>
-    <string name="add_phone_number">फोन नंबर डालें</string>
+    <string name="add_phone_number">फोन नंबर जोड़ें</string>
     <string name="private_sms_database_desc">SMS केवल ऐप के भीतर संग्रहीत किया जाएगा और अन्य ऐप्स में पहुंच योग्य नहीं होगा।</string>
     <string name="export_vcf">vCard निर्यात करें</string>
     <string name="import_sim">SIM से आयात करें</string>
@@ -116,4 +116,36 @@
     <string name="add_event">कार्यक्रम जोड़ें</string>
     <string name="date">तारीख</string>
     <string name="search" tools:ignore="PrivateResource">खोजें</string>
+    <string name="amoled">एमोलेड</string>
+    <string name="security">सुरक्षा</string>
+    <string name="biometric_authentication">बॉयोमीट्रिक प्रमाणीकरण</string>
+    <string name="biometric_authentication_summary">ऐप तक पहुंचने से पहले बायोमेट्रिक प्रमाणीकरण (जैसे फिंगरप्रिंट) की आवश्यकता है।</string>
+    <string name="in_progress">प्रगति पर है</string>
+    <string name="ringing">बज रहा है…</string>
+    <string name="disconnecting">डिस्कनेक्ट हो रहा है…</string>
+    <string name="confirm_start_call">क्या आप %1$s को कॉल करना चाहते हैं?</string>
+    <string name="mute">मूक</string>
+    <string name="speakers">स्पीकर</string>
+    <string name="calls">कॉल</string>
+    <string name="decline">अस्वीकारें</string>
+    <string name="accept">स्वीकारें</string>
+    <string name="unknown_number">अज्ञात नंबर</string>
+    <string name="dial_pad">डायलपैड</string>
+    <string name="connecting">जुड़ रहा है…</string>
+    <string name="call_ended">कॉल समाप्त</string>
+    <string name="dialing">डायल किया जा रहा है…</string>
+    <string name="call_from">इनसे कॉल</string>
+    <string name="key_pad">कीपैड</string>
+    <string name="select_custom_ringtone">तदनुकूल रिंगटोन चुनें</string>
+    <string name="recent_calls">हालिया कॉल</string>
+    <string name="block_numbers">नंबरों को ब्लॉक करें</string>
+    <string name="blocking_number_is_not_supported">नंबर ब्लॉक करना समर्थित नहीं है, Connect You तयशुदा SMS/फोन ऐप नहीं है</string>
+    <string name="number_blocked">नंबर ब्लॉक किया गया</string>
+    <string name="block_number">नंबर ब्लॉक करें</string>
+    <string name="unblock_number">नंबर अनब्लॉक करें</string>
+    <string name="change_ringtone">रिंगटोन बदलें</string>
+    <string name="search_contacts">संपर्क खोजें</string>
+    <string name="start_a_new_conversation">एक नई बातचीत शुरू करें</string>
+    <string name="favorite">पसंदीदा</string>
+    <string name="favorites_only">केवल पसंदीदा</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ia/strings.xml b/app/src/main/res/values-ia/strings.xml
index 812874d7..0988d8be 100644
--- a/app/src/main/res/values-ia/strings.xml
+++ b/app/src/main/res/values-ia/strings.xml
@@ -116,4 +116,5 @@
     <string name="date">Data</string>
     <string name="add_event">Adder evento</string>
     <string name="import_confirm">Desira tu importar le file VCF seligite?</string>
+    <string name="amoled">Amoled</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index e8fa4002..9b641e25 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -116,4 +116,41 @@
     <string name="max_backup_amount">Jumlah maksimal data cadangan yang diizinkan</string>
     <string name="choose_dir">Direktori</string>
     <string name="none">Tidak ada</string>
+    <string name="amoled">AMOLED</string>
+    <string name="security">Keamanan</string>
+    <string name="biometric_authentication">Autentikasi Biometrik</string>
+    <string name="biometric_authentication_summary">Meminta autentikasi biometrik (seperti sidik jari) sebelum aplikasi dapat diakses.</string>
+    <string name="in_progress">Sedang berlangsung</string>
+    <string name="ringing">Berdering…</string>
+    <string name="disconnecting">Memutuskan hubungan…</string>
+    <string name="connecting">Menghubungkan…</string>
+    <string name="confirm_start_call">Apakah Anda ingin memanggil %1$s?</string>
+    <string name="speakers">Speaker</string>
+    <string name="mute">Bisukan</string>
+    <string name="unknown_number">Nomor Tidak Dikenal</string>
+    <string name="calls">Panggilan</string>
+    <string name="decline">Tolak</string>
+    <string name="accept">Terima</string>
+    <string name="dial_pad">Tombol Angka</string>
+    <string name="call_ended">Panggilan Berakhir</string>
+    <string name="dialing">Memanggil...</string>
+    <string name="call_from">Panggilan Dari</string>
+    <string name="key_pad">Papan tombol</string>
+    <string name="select_custom_ringtone">Pilih nada dering khusus</string>
+    <string name="change_ringtone">Ubah nada dering</string>
+    <string name="recent_calls">Panggilan terkini</string>
+    <string name="block_numbers">Blokir nomor</string>
+    <string name="blocking_number_is_not_supported">Pemblokiran nomor tidak didukung, Connect You bukan aplikasi SMS/Telepon bawaan</string>
+    <string name="number_blocked">Nomor diblokir</string>
+    <string name="block_number">Blokir nomor</string>
+    <string name="unblock_number">Buka blokir nomor</string>
+    <string name="search_contacts">Cari kontak</string>
+    <string name="start_a_new_conversation">Mulai percakapan baru</string>
+    <string name="favorite">Favorit</string>
+    <string name="favorites_only">Hanya favorit</string>
+    <string name="import_sms">Impor SMS</string>
+    <string name="export_sms">Ekspor SMS</string>
+    <string name="backup_naming_scheme">Skema nama cadangan</string>
+    <string name="backup_naming_scheme_hint">%d: tanggal, %t: waktu, %s: sumber (lokal, perangkat), sumber diperlukan untuk tanggal atau waktu</string>
+    <string name="cant_respond">Tidak dapat membalas</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index af09ab3d..c581962c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -116,4 +116,8 @@
     <string name="private_sms_database_desc">Gli SMS saranno memorizzati solo all\'interno di quest\'app e non saranno accessibili in altre app.</string>
     <string name="delete_thread">Elimina thread</string>
     <string name="import_confirm">Vuoi importare il file VCF selezionato?</string>
+    <string name="amoled">Amoled</string>
+    <string name="security">Sicurezza</string>
+    <string name="biometric_authentication">Autenticazione biometrica</string>
+    <string name="biometric_authentication_summary">Richiedi l\'autenticazione biometrica (ad esempio l\'impronta digitale) prima di poter accedere all\'app.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 9f9a4b2a..66523a63 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -107,4 +107,14 @@
     <string name="delete_message">מחיקת הודעה</string>
     <string name="private_sms_database_desc">המסרונים יאוחסנו ביישומון בלבד וליישומונים אחרים לא תהיה גישה אליהם.</string>
     <string name="phone_number">מספר טלפון</string>
+    <string name="add_phone_number">הוספת מספר טלפון</string>
+    <string name="add_e_mail">הוספת דוא״ל</string>
+    <string name="add_note">הוספת הערה</string>
+    <string name="add_event">הוספת אירוע</string>
+    <string name="import_confirm">לייבא את קובץ ה־VCF הנבחר?</string>
+    <string name="add_address">הוספת כתובת</string>
+    <string name="add_website">הוספת אתר</string>
+    <string name="date">תאריך</string>
+    <string name="amoled">אמולד</string>
+    <string name="send_message_as_multiple">לשלוח את ההודעה מחולקת לכמה הודעות קטנות?</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 9a3df7ce..4574924f 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -3,7 +3,7 @@
     <string name="search" tools:ignore="PrivateResource">Meklēt</string>
     <string name="copied">Ievietots starpliktuvē</string>
     <string name="delete_contact">Izdzēst kontaktu</string>
-    <string name="irreversible">Vai tiešām\? Tas būs neatgriezeniski.</string>
+    <string name="irreversible">Vai tiešām? Tas būs neatgriezeniski.</string>
     <string name="cancel">Atcelt</string>
     <string name="okay">Labi</string>
     <string name="retry">Atkārtot</string>
@@ -71,7 +71,7 @@
     <string name="auto_backup">Automātiskas rezerves kopijas</string>
     <string name="backup_interval">Laika posms starp rezerves kopijām</string>
     <string name="max_backup_amount">Lielākais rezerves kopiju skaits</string>
-    <string name="choose_dir">Izvēlēties mapi</string>
+    <string name="choose_dir">Mape</string>
     <string name="both">Abi</string>
     <string name="none">Neviens</string>
     <string name="misc">Dažādi</string>
@@ -80,7 +80,7 @@
     <string name="behavior">Uzvedība</string>
     <string name="backup">Rezerves kopija</string>
     <string name="encrypt_backups">Šifrēt rezerves kopijas kā zip</string>
-    <string name="backup_password">Rezerves kopiju parole</string>
+    <string name="backup_password">Parole</string>
     <string name="about">Par</string>
     <string name="license">Licence</string>
     <string name="author">Autors</string>
@@ -95,4 +95,62 @@
     <string name="account_type">Konta veids</string>
     <string name="appearance">Izskats</string>
     <string name="version">Versija</string>
+    <string name="message_too_long">Ziņojums ir pārāk garš.</string>
+    <string name="select_custom_ringtone">Atlasīt pielāgotu zvanīšanas skaņu</string>
+    <string name="reply">Atbilde</string>
+    <string name="private_sms_database">Privāta īsziņu datubāze</string>
+    <string name="speakers">Skaļruņi</string>
+    <string name="import_sms">Ievietot īsziņas</string>
+    <string name="export_sms">Izgūt īsziņas</string>
+    <string name="backup_naming_scheme">Rezerves kopiju nosaukuma veidošana</string>
+    <string name="add_website">Pievienot tīmekļvietni</string>
+    <string name="add_phone_number">Pievienot tālruņa numuru</string>
+    <string name="key_pad">Tastatūra</string>
+    <string name="change_ringtone">Mainīt zvanīšanas skaņu</string>
+    <string name="recent_calls">Nesenie zvani</string>
+    <string name="block_numbers">Liegt numurus</string>
+    <string name="blocking_number_is_not_supported">Numuru liegšana netiek atbalstīta, Connect You nav noklusējuma īsziņu/tālruņa lietotne</string>
+    <string name="number_blocked">Numurs liegts</string>
+    <string name="block_number">Liegt numuru</string>
+    <string name="unblock_number">Atcelt numura liegumu</string>
+    <string name="search_contacts">Meklēt kontaktpersonas</string>
+    <string name="start_a_new_conversation">Uzsākt jaunu sarunu</string>
+    <string name="cant_respond">Nevar atbildēt</string>
+    <string name="backup_naming_scheme_hint">%d: datums, %t: laiks, %s: avots (vietējs, ierīce), ir nepieciešams avots un vai nu datums, vai laiks</string>
+    <string name="security">Drošība</string>
+    <string name="biometric_authentication">Autentificēšanās ar biometriju</string>
+    <string name="biometric_authentication_summary">Pieprasīt autentificēšanos ar biometriju (piemēram, pirkstu nospiedumu), pirms lietotnei var piekļūt.</string>
+    <string name="contacts">Kontaktpersonas</string>
+    <string name="import_confirm">Vai ievietot atlasīto VCF datni?</string>
+    <string name="connection_error">Nevarēja savienoties. Lūgums nodrošināt, ka lidmašīnas režīms ir izslēgts.</string>
+    <string name="send_message_as_multiple">Vai nosūtīt ziņojumu kā vairākus mazākus?</string>
+    <string name="private_sms_database_desc">Īsziņa tiks glabāta tikai lietotnē un nebūs pieejama citās lietotnēs.</string>
+    <string name="delete_thread">Izdzēst pavedienu</string>
+    <string name="delete_message">Izdzēst ziņojumu</string>
+    <string name="save">Saglabāt</string>
+    <string name="phone_number">Tālruņa numurs</string>
+    <string name="messages">Ziņojumi</string>
+    <string name="send">Nosūtīt ziņojumu</string>
+    <string name="favorite">Izlasē</string>
+    <string name="connecting">Savienojas…</string>
+    <string name="favorites_only">Tikai izlasē esošie</string>
+    <string name="in_progress">Notiek</string>
+    <string name="ringing">Zvana…</string>
+    <string name="disconnecting">Pārtrauc savienojumu…</string>
+    <string name="confirm_start_call">Vai zvanīt %1$s?</string>
+    <string name="mute">Apklusināt</string>
+    <string name="decline">Noraidīt</string>
+    <string name="accept">Pieņemt</string>
+    <string name="unknown_number">Nezināms numurs</string>
+    <string name="dial_pad">Ciparnīca</string>
+    <string name="call_ended">Zvans ir beidzies</string>
+    <string name="dialing">Zvana...</string>
+    <string name="call_from">Zvans no</string>
+    <string name="add_e_mail">Pievienot e-pasta adresi</string>
+    <string name="add_address">Pievienot adresi</string>
+    <string name="add_note">Pievienot piezīmi</string>
+    <string name="add_event">Pievienot notikumu</string>
+    <string name="date">Datums</string>
+    <string name="amoled">AMOLED</string>
+    <string name="calls">Zvani</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 4148c55b..56387a2f 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -107,4 +107,13 @@
     <string name="contacts">Contactos</string>
     <string name="private_sms_database_desc">A SMS será gravada apenas nesta aplicação e não no dispositivo.</string>
     <string name="phone_number">Número de telefone</string>
+    <string name="import_confirm">Deseja importar o ficheiro VCF selecionado?</string>
+    <string name="add_note">Adicionar nota</string>
+    <string name="add_event">Adicionar evento</string>
+    <string name="date">Data</string>
+    <string name="add_address">Adicionar endereço</string>
+    <string name="add_website">Adicionar site</string>
+    <string name="add_phone_number">Adicionar número de telefone</string>
+    <string name="add_e_mail">Adicionar E-mail</string>
+    <string name="send_message_as_multiple">Quer enviar a mensagem como múltiplas mensagens pequenas?</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 586eb363..1f519816 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -116,4 +116,41 @@
     <string name="add_address">Добавить адрес</string>
     <string name="date">Дата</string>
     <string name="import_confirm">Импортировать выбранный VCF файл?</string>
+    <string name="amoled">Чёрная</string>
+    <string name="security">Безопасность</string>
+    <string name="biometric_authentication">Вход по биометрии</string>
+    <string name="biometric_authentication_summary">Требовать биометрическую аутентификацию для открытия приложения. Например по отпечатку пальца.</string>
+    <string name="ringing">Вызов…</string>
+    <string name="mute">Откл. звук</string>
+    <string name="speakers">Динамики</string>
+    <string name="dial_pad">Клавиатура набора</string>
+    <string name="in_progress">В процессе</string>
+    <string name="disconnecting">Отключение…</string>
+    <string name="calls">Вызовы</string>
+    <string name="connecting">Подключение…</string>
+    <string name="decline">Отклонить</string>
+    <string name="confirm_start_call">Хотите набрать %1$s?</string>
+    <string name="accept">Принять</string>
+    <string name="unknown_number">Неизвестный номер</string>
+    <string name="call_ended">Вызов завершён</string>
+    <string name="dialing">Вызов...</string>
+    <string name="call_from">Позвонить из</string>
+    <string name="key_pad">Клавиатура набора</string>
+    <string name="change_ringtone">Изменить мелодию</string>
+    <string name="number_blocked">Номер заблокирован</string>
+    <string name="recent_calls">Недавние вызовы</string>
+    <string name="blocking_number_is_not_supported">Блокировка номеров недоступна. Установите Connect You в качестве приложения для SMS и вызовов</string>
+    <string name="select_custom_ringtone">Выбрать свою мелодию</string>
+    <string name="block_numbers">Заблокировать номера</string>
+    <string name="block_number">Заблокировать номер</string>
+    <string name="unblock_number">Разблокировать номер</string>
+    <string name="search_contacts">Поиск контактов</string>
+    <string name="start_a_new_conversation">Начать беседу</string>
+    <string name="favorite">Избранное</string>
+    <string name="favorites_only">Только избранные</string>
+    <string name="cant_respond">Невозможно ответить</string>
+    <string name="import_sms">Импорт SMS</string>
+    <string name="export_sms">Экспорт SMS</string>
+    <string name="backup_naming_scheme">Шаблон наименований рез. копий</string>
+    <string name="backup_naming_scheme_hint">%d: дата, %t: время, %s: база (приложения или общая). Требуется база и хотя бы дата или время</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 79bcfaae..70eddcda 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -89,7 +89,7 @@
     <string name="both">Оба</string>
     <string name="none">Ниједно</string>
     <string name="misc">Остало</string>
-    <string name="collapse_bottom_bar">Скупи доњу траку при скроловању</string>
+    <string name="collapse_bottom_bar">Скупи доњу траку при превлачењу</string>
     <string name="colorful_contact_icons">Шарене иконице контаката</string>
     <!-- About -->
     <string name="about">О апликацији</string>
@@ -127,4 +127,41 @@
     <string name="add_website">Додај веб-сајт</string>
     <string name="add_note">Додај белешку</string>
     <string name="import_confirm">Желите ли да увезете изабрани VCF фајл?</string>
+    <string name="amoled">Amoled</string>
+    <string name="biometric_authentication">Биометријска аутентификација</string>
+    <string name="security">Безбедност</string>
+    <string name="biometric_authentication_summary">Захтевајте биометријску аутентификацију (нпр. отисак прста) пре него што се апликацији може приступити.</string>
+    <string name="ringing">Звони…</string>
+    <string name="mute">Утишај</string>
+    <string name="speakers">Звучници</string>
+    <string name="accept">Прихвати</string>
+    <string name="unknown_number">Непознати број</string>
+    <string name="dial_pad">Бирач бројева</string>
+    <string name="in_progress">У току</string>
+    <string name="disconnecting">Прекидање везе…</string>
+    <string name="connecting">Повезивање…</string>
+    <string name="confirm_start_call">Желите ли да зовете %1$s?</string>
+    <string name="decline">Одбиј</string>
+    <string name="calls">Позиви</string>
+    <string name="call_ended">Позив је завршен</string>
+    <string name="dialing">Бирање...</string>
+    <string name="call_from">Позив од</string>
+    <string name="key_pad">Тастатура</string>
+    <string name="recent_calls">Недавни позиви</string>
+    <string name="number_blocked">Број је блокиран</string>
+    <string name="block_number">Блокирај број</string>
+    <string name="select_custom_ringtone">Изабери прилагођену мелодију звона</string>
+    <string name="change_ringtone">Промени мелодију звона</string>
+    <string name="unblock_number">Деблокирај број</string>
+    <string name="block_numbers">Блокирај бројеве</string>
+    <string name="blocking_number_is_not_supported">Блокирање бројева није подржано, Connect You није подразумевана апликација за SMS/телефон</string>
+    <string name="search_contacts">Претрага контаката</string>
+    <string name="start_a_new_conversation">Започни нови разговор</string>
+    <string name="favorite">Омиљено</string>
+    <string name="favorites_only">Само омиљени</string>
+    <string name="cant_respond">Није могуће одговорити</string>
+    <string name="import_sms">Увоз SMS-а</string>
+    <string name="export_sms">Извоз SMS-а</string>
+    <string name="backup_naming_scheme">Шема именовања резервне копије</string>
+    <string name="backup_naming_scheme_hint">%d: датум, %t: време, %s: извор (локални, уређај), извор је обавезан и датум или време</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
new file mode 100644
index 00000000..9d3f653b
--- /dev/null
+++ b/app/src/main/res/values-ta/strings.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="backup_password">கடவுச்சொல்</string>
+    <string name="blocking_number_is_not_supported">தடுப்பு எண் ஆதரிக்கப்படவில்லை, உங்களை இயல்புநிலை எச்எம்எச்/தொலைபேசி பயன்பாடு அல்ல</string>
+    <string name="number_blocked">எண் தடுக்கப்பட்டது</string>
+    <string name="search" tools:ignore="PrivateResource">தேடல்</string>
+    <string name="copied">கிளிப்போர்டுக்கு நகலெடுக்கப்பட்டது</string>
+    <string name="delete_contact">தொடர்பை நீக்கு</string>
+    <string name="irreversible">நீ சொல்வது உறுதியா? இதை செயல்தவிர்க்க முடியாது!</string>
+    <string name="cancel">ரத்துசெய்</string>
+    <string name="okay">சரி</string>
+    <string name="reset">மீட்டமை</string>
+    <string name="create_contact">தொடர்பை உருவாக்கவும்</string>
+    <string name="retry">மீண்டும் முயற்சிக்கவும்</string>
+    <string name="share">பங்கு</string>
+    <string name="add_to_contact">தொடர்புக்குச் சேர்க்கவும்</string>
+    <string name="new_contact">புதிய தொடர்பு</string>
+    <string name="create_shortcut">குறுக்குவழியை உருவாக்க</string>
+    <string name="dial">டயல்</string>
+    <string name="message">செய்தி</string>
+    <string name="contact">தொடர்பு</string>
+    <string name="contacts">தொடர்புகள்</string>
+    <string name="edit">தொகு</string>
+    <string name="filter">வடிப்பி</string>
+    <string name="more">மேலும்</string>
+    <string name="show_more_fields">மேலும் புலங்களைக் காட்டு</string>
+    <string name="show_less">குறைவாகக் காட்டு</string>
+    <string name="pick_contact">தொடர்பைத் தேர்ந்தெடுங்கள்</string>
+    <string name="save">சேமி</string>
+    <string name="empty_name">பெயர் காலியாக இருக்க முடியாது!</string>
+    <string name="import_success">இறக்குமதி செய்யப்பட்டது.</string>
+    <string name="export_success">ஏற்றுமதி.</string>
+    <string name="nothing_here">இங்கு எதுவுமில்லை.</string>
+    <string name="phone">தொலைபேசி</string>
+    <string name="email">மின்னஞ்சல்</string>
+    <string name="address">முகவரி</string>
+    <string name="event">நிகழ்வு</string>
+    <string name="website">இணையதளம்</string>
+    <string name="photo">புகைப்படம்</string>
+    <string name="phone_number">தொலைபேசி எண்</string>
+    <string name="sort_order">வரிசைப்படுத்தும் முறை</string>
+    <string name="account_type">கணக்கு வகை</string>
+    <string name="name">பெயர்</string>
+    <string name="first_name">முதல் பெயர்</string>
+    <string name="last_name">கடைசி பெயர்</string>
+    <string name="nick_name">புனைப்பெயர்</string>
+    <string name="organization">அமைப்பு</string>
+    <string name="type">வகை</string>
+    <string name="home">வீடு</string>
+    <string name="work">வேலை</string>
+    <string name="mobile">கைபேசி</string>
+    <string name="other">மற்றொன்று</string>
+    <string name="custom">தனிப்பயன்</string>
+    <string name="car">கார்</string>
+    <string name="fax_home">தொலைநகல் வீடு</string>
+    <string name="fax_work">தொலைநகல் வேலை</string>
+    <string name="assistant">உதவியாளர்</string>
+    <string name="birthday">பிறந்த நாள்</string>
+    <string name="anniversary">ஆண்டு</string>
+    <string name="note">குறிப்பு</string>
+    <string name="homepage">முகப்புப்பக்கம்</string>
+    <string name="ftp">Ftp</string>
+    <string name="blog">வலைப்பதிவு</string>
+    <string name="manage_groups">குழுக்களை நிர்வகிக்கவும்</string>
+    <string name="delete_group">அனைவருக்கும் குழுவை நீக்கு</string>
+    <string name="title">தலைப்பு</string>
+    <string name="new_group">புதிய</string>
+    <string name="group_already_exists">குழு ஏற்கனவே உள்ளது</string>
+    <string name="groups">குழுக்கள்</string>
+    <string name="device">சாதனம்</string>
+    <string name="local">உள்ளக</string>
+    <string name="copy">நகலெடு</string>
+    <string name="move">நகர்வு</string>
+    <string name="delete">அழி</string>
+    <string name="selected">%1 $ கள் தேர்ந்தெடுக்கப்பட்டன</string>
+    <string name="messages">செய்திகள்</string>
+    <string name="send">செய்தி அனுப்ப</string>
+    <string name="reply">பதில்</string>
+    <string name="connection_error">இணைக்க முடியவில்லை. விமானப் பயன்முறை முடக்கப்பட்டுள்ளதா என்பதை உறுதிப்படுத்தவும்.</string>
+    <string name="message_too_long">செய்தி மிக நீளமானது!</string>
+    <string name="send_message_as_multiple">செய்தியை பல சிறியதாக அனுப்ப விரும்புகிறீர்களா?</string>
+    <string name="private_sms_database">தனியார் எச்எம்எச் தரவுத்தளம்</string>
+    <string name="private_sms_database_desc">எச்எம்எச் பயன்பாட்டிற்குள் மட்டுமே சேமிக்கப்படும் மற்றும் பிற பயன்பாடுகளில் அணுக முடியாது.</string>
+    <string name="delete_thread">நூலை நீக்கு</string>
+    <string name="delete_message">செய்தியை நீக்கு</string>
+    <string name="in_progress">முன்னேற்றத்தில் உள்ளது</string>
+    <string name="ringing">ரிங்கிங்…</string>
+    <string name="disconnecting">துண்டித்தல்…</string>
+    <string name="connecting">இணைத்தல்…</string>
+    <string name="confirm_start_call">நீங்கள் %1 $ s ஐ அழைக்க விரும்புகிறீர்களா?</string>
+    <string name="mute">முடக்கு</string>
+    <string name="speakers">பேச்சாளர்கள்</string>
+    <string name="import_vcf">VCARD ஐ இறக்குமதி செய்யுங்கள்</string>
+    <string name="export_vcf">ஏற்றுமதி vcard</string>
+    <string name="import_sim">சிம்மில் இருந்து இறக்குமதி</string>
+    <string name="import_confirm">தேர்ந்தெடுக்கப்பட்ட வி.சி.எஃப் கோப்பை இறக்குமதி செய்ய விரும்புகிறீர்களா?</string>
+    <string name="settings">அமைப்புகள்</string>
+    <string name="start_tab">தொடக்க தாவல்</string>
+    <string name="theme">கருப்பொருள்</string>
+    <string name="system">மண்டலம்</string>
+    <string name="light">ஒளி</string>
+    <string name="dark">இருள்</string>
+    <string name="auto_backup">தானியங்கி காப்புப்பிரதி</string>
+    <string name="backup_interval">காப்பு இடைவெளி</string>
+    <string name="max_backup_amount">காப்புப்பிரதிகளின் அதிகபட்ச அளவு</string>
+    <string name="choose_dir">அடைவு</string>
+    <string name="both">இரண்டும்</string>
+    <string name="none">எதுவுமில்லை</string>
+    <string name="misc">இதர</string>
+    <string name="collapse_bottom_bar">சுருளில் கீழ் பட்டியை உடைக்கவும்</string>
+    <string name="colorful_contact_icons">வண்ணமயமான தொடர்பு சின்னங்கள்</string>
+    <string name="behavior">நடத்தை</string>
+    <string name="appearance">தோற்றம்</string>
+    <string name="backup">காப்புப்பிரதி</string>
+    <string name="encrypt_backups">காப்புப்பிரதிகளை சிப் என குறியாக்கவும்</string>
+    <string name="security">பாதுகாப்பு</string>
+    <string name="biometric_authentication">பயோமெட்ரிக் ஏற்பு</string>
+    <string name="biometric_authentication_summary">பயன்பாட்டை அணுகுவதற்கு முன் பயோமெட்ரிக் ஏற்பு (எ.கா. கைரேகை) தேவை.</string>
+    <string name="about">பற்றி</string>
+    <string name="license">உரிமம்</string>
+    <string name="author">நூலாசிரியர்</string>
+    <string name="version">பதிப்பு</string>
+    <string name="translation">மொழிபெயர்ப்பு</string>
+    <string name="add_website">வலைத்தளத்தைச் சேர்க்கவும்</string>
+    <string name="add_phone_number">தொலைபேசி எண்ணைச் சேர்க்கவும்</string>
+    <string name="add_e_mail">மின்னஞ்சல் சேர்க்கவும்</string>
+    <string name="add_address">முகவரியைச் சேர்க்கவும்</string>
+    <string name="add_note">குறிப்பு சேர்க்க</string>
+    <string name="add_event">நிகழ்வைச் சேர்க்கவும்</string>
+    <string name="date">திகதி</string>
+    <string name="amoled">அமோல்ட்</string>
+    <string name="calls">அழைப்புகள்</string>
+    <string name="decline">வீழ்ச்சி</string>
+    <string name="accept">ஏற்றுக்கொள்</string>
+    <string name="unknown_number">தெரியாத எண்</string>
+    <string name="dial_pad">டயல்பேடு</string>
+    <string name="call_ended">அழைப்பு முடிந்தது</string>
+    <string name="dialing">டயலிங் ...</string>
+    <string name="call_from">இருந்து அழைக்கவும்</string>
+    <string name="key_pad">கீபேட்</string>
+    <string name="select_custom_ringtone">தனிப்பயன் ரிங்டோனைத் தேர்ந்தெடுக்கவும்</string>
+    <string name="change_ringtone">ரிங்டோனை மாற்றவும்</string>
+    <string name="recent_calls">அண்மைக் கால அழைப்புகள்</string>
+    <string name="block_numbers">தொகுதி எண்கள்</string>
+    <string name="block_number">தொகுதி எண்</string>
+    <string name="unblock_number">தடைசெய்யப்பட்ட எண்ணைத் தடைசெய்க</string>
+    <string name="search_contacts">தொடர்புகளைத் தேடுங்கள்</string>
+    <string name="start_a_new_conversation">புதிய உரையாடலைத் தொடங்கவும்</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 54154197..e9c13f46 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -117,4 +117,36 @@
     <string name="add_event">Etkinlik Ekle</string>
     <string name="date">Tarih</string>
     <string name="import_confirm">Seçilen vCard\'ı içe aktarmak istiyor musunuz?</string>
+    <string name="amoled">Amoled</string>
+    <string name="security">Güvenlik</string>
+    <string name="biometric_authentication">Biyometrik Kimlik Doğrulaması</string>
+    <string name="biometric_authentication_summary">Uygulamaya erişilmeden önce biyometrik kimlik doğrulaması (örn. parmak izi) gerektir.</string>
+    <string name="disconnecting">Bağlantı kesiliyor…</string>
+    <string name="connecting">Bağlanıyor…</string>
+    <string name="confirm_start_call">%1$s aramak istiyor musunuz?</string>
+    <string name="mute">Sesini kapat</string>
+    <string name="speakers">Hoparlör</string>
+    <string name="accept">Kabul et</string>
+    <string name="dial_pad">Tuş takımı</string>
+    <string name="calls">Aramalar</string>
+    <string name="decline">Reddet</string>
+    <string name="in_progress">Devam ediyor</string>
+    <string name="unknown_number">Bilinmeyen Numara</string>
+    <string name="ringing">Çalıyor…</string>
+    <string name="call_ended">Arama Sona Erdi</string>
+    <string name="dialing">Aranıyor...</string>
+    <string name="call_from">Arayan</string>
+    <string name="key_pad">Tuş takımı</string>
+    <string name="change_ringtone">Zil sesini değiştir</string>
+    <string name="recent_calls">Son aramalar</string>
+    <string name="number_blocked">Numara engellendi</string>
+    <string name="block_number">Numarayı engelle</string>
+    <string name="unblock_number">Numaranın engelini kaldır</string>
+    <string name="block_numbers">Numaraları engelle</string>
+    <string name="select_custom_ringtone">Özel zil sesi seç</string>
+    <string name="blocking_number_is_not_supported">Numara engelleme desteklenmiyor, Connect You öntanımlı SMS/Telefon uygulaması değil</string>
+    <string name="search_contacts">Kişileri ara</string>
+    <string name="start_a_new_conversation">Yeni görüşme başlat</string>
+    <string name="favorites_only">Yalnızca sık kullanılanlar</string>
+    <string name="favorite">Sık Kullanılan</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 02d2f982..bd8deb97 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -8,7 +8,7 @@
     <string name="copied">Скопійовано в буфер обміну</string>
     <string name="empty_name">Ім’я не може бути порожнім!</string>
     <string name="fax_home">Факс дому</string>
-    <string name="irreversible">Ви впевнені? Це не можна відмінити!</string>
+    <string name="irreversible">Ви впевнені? Це не можна скасувати!</string>
     <string name="create_contact">Створити контакт</string>
     <string name="share">Поділитися</string>
     <string name="retry">Спробувати знову</string>
@@ -37,7 +37,7 @@
     <string name="birthday">День народження</string>
     <string name="anniversary">Річниця</string>
     <string name="email">Ел. пошта</string>
-    <string name="okay">Добре</string>
+    <string name="okay">Прийняти</string>
     <string name="reset">Скидання</string>
     <string name="nothing_here">Порожньо.</string>
     <string name="device">Пристрій</string>
@@ -82,7 +82,7 @@
     <string name="website">Вебсайт</string>
     <string name="homepage">Домашня сторінка</string>
     <string name="ftp">FTP</string>
-    <string name="nick_name">Нікнейм</string>
+    <string name="nick_name">Псевдонім</string>
     <string name="show_more_fields">Показувати більше полів</string>
     <string name="blog">Блоґ</string>
     <string name="more">Більше</string>
@@ -117,4 +117,41 @@
     <string name="add_note">Додати примітку</string>
     <string name="add_event">Додати подію</string>
     <string name="import_confirm">Ви хочете імпортувати вибраний VCF-файл?</string>
+    <string name="biometric_authentication">Біометрична перевірка</string>
+    <string name="biometric_authentication_summary">Вимагати біометричну перевірку (наприклад, відбиток пальця) перед тим, як отримати доступ до застосунку.</string>
+    <string name="security">Безпека</string>
+    <string name="amoled">Чорний</string>
+    <string name="connecting">З\'єднання…</string>
+    <string name="dial_pad">Панель набору</string>
+    <string name="in_progress">У процесі</string>
+    <string name="ringing">Виклик…</string>
+    <string name="disconnecting">Від\'єднання…</string>
+    <string name="confirm_start_call">Бажаєте зателефонувати %1$s?</string>
+    <string name="mute">Вимк. звук</string>
+    <string name="speakers">Динаміки</string>
+    <string name="calls">Виклики</string>
+    <string name="decline">Відхилити</string>
+    <string name="accept">Прийняти</string>
+    <string name="unknown_number">Невідомий номер</string>
+    <string name="call_ended">Виклик завершено</string>
+    <string name="dialing">Набір номера...</string>
+    <string name="call_from">Виклик з</string>
+    <string name="key_pad">Клавіатура</string>
+    <string name="select_custom_ringtone">Виберіть власний рингтон</string>
+    <string name="change_ringtone">Змінити рингтон</string>
+    <string name="block_number">Заблокувати номер</string>
+    <string name="recent_calls">Нещодавні виклики</string>
+    <string name="block_numbers">Заблокувати номери</string>
+    <string name="blocking_number_is_not_supported">Блокування номерів не підтримується. Connect You не типовий застосунок для SMS та викликів</string>
+    <string name="number_blocked">Номер заблоковано</string>
+    <string name="unblock_number">Розблокувати номер</string>
+    <string name="start_a_new_conversation">Почати нову розмову</string>
+    <string name="search_contacts">Пошук контактів</string>
+    <string name="favorites_only">Тільки улюблене</string>
+    <string name="favorite">Улюблене</string>
+    <string name="cant_respond">Не можу відповісти</string>
+    <string name="import_sms">Імпортувати SMS</string>
+    <string name="backup_naming_scheme">Схема іменування резервних копій</string>
+    <string name="export_sms">Експортувати SMS</string>
+    <string name="backup_naming_scheme_hint">%d: дата, %t: час, %s: джерело (локально, пристрій), потрібно вказати джерело та дату або час</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index f900c536..f51a2a78 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="work">Nơi làm việc</string>
     <string name="mobile">Di động</string>
     <string name="other">Khác</string>
     <string name="custom">Tùy chỉnh</string>
-    <string name="car">Xe</string>
+    <string name="car">Xe hơi</string>
     <string name="assistant">Trợ lí</string>
     <string name="birthday">Sinh nhật</string>
     <string name="anniversary">Kỉ niệm</string>
     <string name="note">Ghi chú</string>
     <string name="homepage">Trang chủ</string>
     <string name="manage_groups">Quản lí các nhóm</string>
-    <string name="delete_group">Xóa nhóm cho tất cả mọi người</string>
+    <string name="delete_group">Xóa nhóm cho mọi người</string>
     <string name="title">Tiêu đề</string>
     <string name="new_group">Mới</string>
     <string name="group_already_exists">Nhóm đã tồn tại</string>
-    <string name="groups">Nhóm</string>
+    <string name="groups">Các nhóm</string>
     <string name="device">Thiết bị</string>
     <string name="copy">Sao chép</string>
     <string name="move">Di chuyển</string>
@@ -24,20 +24,20 @@
     <string name="import_vcf">Nhập vào vCard</string>
     <string name="export_vcf">Xuất ra vCard</string>
     <string name="settings">Cài đặt</string>
-    <string name="start_tab">Bắt đầu tab</string>
+    <string name="start_tab">Tab bắt đầu</string>
     <string name="theme">Chủ đề</string>
     <string name="system">Hệ thống</string>
     <string name="light">Sáng</string>
     <string name="dark">Tối</string>
     <string name="auto_backup">Tự động sao lưu</string>
-    <string name="backup_interval">Tần số sao lưu</string>
+    <string name="backup_interval">Thời gian sao lưu</string>
     <string name="max_backup_amount">Số bản sao lưu tối đa</string>
     <string name="choose_dir">Chọn thư mục</string>
     <string name="both">Cả hai</string>
     <string name="none">Không</string>
     <string name="misc">Khác</string>
-    <string name="collapse_bottom_bar">"Thu  lại thanh dưới khi cuộn"</string>
-    <string name="colorful_contact_icons">Biểu tượng danh bạ nhiều màu</string>
+    <string name="collapse_bottom_bar">Thu gọn thanh dưới cùng khi cuộn</string>
+    <string name="colorful_contact_icons">Biểu tượng liên hệ đầy màu sắc</string>
     <string name="license">Giấy phép</string>
     <string name="author">Tác giả</string>
     <string name="version">Phiên bản</string>
@@ -46,7 +46,98 @@
     <string name="nick_name">Biệt danh</string>
     <string name="type">Loại</string>
     <string name="first_name">Họ</string>
-    <string name="last_name">Tên</string>
+    <string name="last_name">Họ</string>
     <string name="organization">Tổ chức</string>
     <string name="home">Nhà riêng</string>
+    <string name="search" tools:ignore="PrivateResource">Tìm kiếm</string>
+    <string name="message_too_long">Tin nhắn quá dài!</string>
+    <string name="behavior">Hành vi</string>
+    <string name="appearance">Diện mạo</string>
+    <string name="encrypt_backups">Mã hóa các bản sao lưu dưới dạng zip</string>
+    <string name="backup_password">Mật khẩu</string>
+    <string name="photo">Hình chụp</string>
+    <string name="name">Tên</string>
+    <string name="select_custom_ringtone">Chọn nhạc chuông tùy chỉnh</string>
+    <string name="block_numbers">Chặn số</string>
+    <string name="blocking_number_is_not_supported">Chặn số không được hỗ trợ, Connect You không phải là ứng dụng SMS/Điện thoại mặc định</string>
+    <string name="number_blocked">Số bị chặn</string>
+    <string name="block_number">Chặn số</string>
+    <string name="unblock_number">Bỏ chặn số</string>
+    <string name="change_ringtone">Thay đổi nhạc chuông</string>
+    <string name="recent_calls">Cuộc gọi gần đây</string>
+    <string name="address">Địa chỉ</string>
+    <string name="sort_order">Thứ tự sắp xếp</string>
+    <string name="event">Sự kiện</string>
+    <string name="search_contacts">Tìm danh bạ</string>
+    <string name="start_a_new_conversation">Bắt đầu cuộc trò chuyện mới</string>
+    <string name="copied">Chép vào clipboard</string>
+    <string name="delete_contact">Xóa liên hệ</string>
+    <string name="irreversible">Bạn có chắc không? Hạ thủ là bất quờn!</string>
+    <string name="cancel">Hủy</string>
+    <string name="okay">Ừa</string>
+    <string name="reset">Đặt lại</string>
+    <string name="retry">Thử lại</string>
+    <string name="create_contact">Tạo liên hệ</string>
+    <string name="add_to_contact">Thêm vào danh bạ</string>
+    <string name="share">Chia sẻ</string>
+    <string name="new_contact">Liên hệ mới</string>
+    <string name="create_shortcut">Tạo lối tắt</string>
+    <string name="contact">Liên hệ</string>
+    <string name="message">Tin nhắn</string>
+    <string name="edit">Chỉnh sửa</string>
+    <string name="filter">Lọc</string>
+    <string name="show_less">Hiện ít hơn</string>
+    <string name="dial">Quay số</string>
+    <string name="more">Nhiều hơn</string>
+    <string name="show_more_fields">Hiện nhiều trường hơn</string>
+    <string name="messages">Tin nhắn</string>
+    <string name="about">Giới thiệu</string>
+    <string name="backup">Sao lưu</string>
+    <string name="pick_contact">Chọn liên hệ</string>
+    <string name="local">Địa phương</string>
+    <string name="contacts">Danh bạ</string>
+    <string name="empty_name">Tên không thể trống!</string>
+    <string name="import_success">Đã nhập.</string>
+    <string name="export_success">Đã xuất.</string>
+    <string name="nothing_here">Không có gì ở đây.</string>
+    <string name="phone">Điện thoại</string>
+    <string name="email">E-mail</string>
+    <string name="fax_home">Fax tại gia</string>
+    <string name="fax_work">Fax công việc</string>
+    <string name="import_confirm">Bạn có muốn nhập tệp VCF đã chọn không?</string>
+    <string name="ringing">Đổ chuông…</string>
+    <string name="disconnecting">Ngắt kết nối…</string>
+    <string name="connecting">Đang kết nối…</string>
+    <string name="confirm_start_call">Bạn có muốn gọi %1$s không?</string>
+    <string name="mute">Tắt tiếng</string>
+    <string name="speakers">Loa ngoài</string>
+    <string name="import_sim">Nhập từ SIM</string>
+    <string name="calls">Cuộc gọi</string>
+    <string name="accept">Chấp nhận</string>
+    <string name="unknown_number">Số không xác định</string>
+    <string name="dial_pad">Bàn quay số</string>
+    <string name="decline">Từ chối</string>
+    <string name="add_event">Thêm sự kiện</string>
+    <string name="send_message_as_multiple">Bạn có muốn gửi tin nhắn dưới dạng nhiều tin nhắn nhỏ hơn không?</string>
+    <string name="private_sms_database">Cơ sở dữ liệu SMS riêng tư</string>
+    <string name="private_sms_database_desc">SMS sẽ chỉ được lưu trữ trong ứng dụng và không thể truy cập được trong các ứng dụng khác.</string>
+    <string name="delete_thread">Xóa chủ đề</string>
+    <string name="delete_message">Xóa tin nhắn</string>
+    <string name="save">Lưu</string>
+    <string name="phone_number">Số điện thoại</string>
+    <string name="send">Gửi tin nhắn</string>
+    <string name="connection_error">Không thể kết nối. Hãy bảo đảm chế độ trên máy bay đã tắt.</string>
+    <string name="reply">Hồi đáp</string>
+    <string name="biometric_authentication_summary">Yêu cầu xác thực sinh trắc học (ví dụ: dấu vân tay) trước khi có thể truy cập ứng dụng.</string>
+    <string name="security">Bảo vệ</string>
+    <string name="biometric_authentication">Xác thực sinh trắc học</string>
+    <string name="add_phone_number">Thêm số điện thoại</string>
+    <string name="add_address">Thêm địa chỉ</string>
+    <string name="add_note">Thêm ghi chú</string>
+    <string name="date">Ngày tháng</string>
+    <string name="add_e_mail">Thêm E-mail</string>
+    <string name="call_ended">Cuộc gọi kết thúc</string>
+    <string name="dialing">Đang quay số...</string>
+    <string name="call_from">Gọi từ</string>
+    <string name="key_pad">Bàn phím</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 4e6c197d..50446edd 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -116,4 +116,41 @@
     <string name="add_address">添加地址</string>
     <string name="add_event">添加事件</string>
     <string name="import_confirm">您是否要导入选定的 VCF 文件？</string>
+    <string name="amoled">Amoled</string>
+    <string name="security">安全</string>
+    <string name="biometric_authentication">生物识别认证</string>
+    <string name="biometric_authentication_summary">访问应用前要求生物识别认证（如指纹）。</string>
+    <string name="in_progress">进行中</string>
+    <string name="ringing">正在响铃…</string>
+    <string name="disconnecting">正在断开连接…</string>
+    <string name="connecting">正在连接…</string>
+    <string name="confirm_start_call">你要呼叫 %1$s 吗？</string>
+    <string name="mute">静音</string>
+    <string name="speakers">扬声器</string>
+    <string name="calls">通话</string>
+    <string name="decline">拒绝</string>
+    <string name="accept">接受</string>
+    <string name="unknown_number">未知号码</string>
+    <string name="dial_pad">拨号盘</string>
+    <string name="call_from">来电方</string>
+    <string name="call_ended">通话结束了</string>
+    <string name="dialing">拨号中…</string>
+    <string name="key_pad">键盘</string>
+    <string name="change_ringtone">更改铃声</string>
+    <string name="recent_calls">最近通话</string>
+    <string name="unblock_number">取消封禁号码</string>
+    <string name="block_numbers">封禁号码</string>
+    <string name="select_custom_ringtone">选择自定义铃声</string>
+    <string name="number_blocked">已封禁号码</string>
+    <string name="blocking_number_is_not_supported">不支持封禁号码。 Connect You 不是默认的短信/通话应用</string>
+    <string name="block_number">封禁号码</string>
+    <string name="search_contacts">搜索联系人</string>
+    <string name="start_a_new_conversation">开始新对话</string>
+    <string name="favorite">收藏</string>
+    <string name="favorites_only">仅收藏</string>
+    <string name="cant_respond">无法响应</string>
+    <string name="import_sms">导入短信</string>
+    <string name="export_sms">导出短信</string>
+    <string name="backup_naming_scheme">备份命名方案</string>
+    <string name="backup_naming_scheme_hint">%d: 日期, %t: 时间, %s: 源 （本地、设备）, 来源以及日期或时间是必需的</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 7b7fa396..8d7e62b5 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -29,7 +29,7 @@
     <string name="event">事件</string>
     <string name="photo">圖片</string>
     <string name="show_more_fields">顯示更多欄位</string>
-    <string name="empty_name">名稱不能是空的</string>
+    <string name="empty_name">名稱不能為空白！</string>
     <string name="address">地址</string>
     <string name="pick_contact">選擇聯絡人</string>
     <string name="phone_number">電話號碼</string>
@@ -42,4 +42,40 @@
     <string name="organization">組織</string>
     <string name="type">類型</string>
     <string name="other">其他</string>
+    <string name="sort_order">排序次序</string>
+    <string name="nick_name">暱稱</string>
+    <string name="custom">自訂</string>
+    <string name="car">汽車</string>
+    <string name="fax_home">家庭傳真</string>
+    <string name="anniversary">週年紀念</string>
+    <string name="note">筆記</string>
+    <string name="homepage">主頁</string>
+    <string name="ftp">FTP</string>
+    <string name="blog">部落格</string>
+    <string name="manage_groups">管理群組</string>
+    <string name="delete_group">為所有人刪除群組</string>
+    <string name="title">標題</string>
+    <string name="new_group">新</string>
+    <string name="group_already_exists">群組已經存在</string>
+    <string name="groups">群組</string>
+    <string name="device">裝置</string>
+    <string name="local">本地</string>
+    <string name="copy">複製</string>
+    <string name="move">移動</string>
+    <string name="delete">刪除</string>
+    <string name="selected">%1$s 已選取</string>
+    <string name="messages">訊息</string>
+    <string name="send">傳送訊息</string>
+    <string name="reply">回覆</string>
+    <string name="private_sms_database">私人簡訊資料庫</string>
+    <string name="delete_message">刪除訊息</string>
+    <string name="in_progress">進行中</string>
+    <string name="ringing">正在響鈴…</string>
+    <string name="home">家庭</string>
+    <string name="birthday">生日</string>
+    <string name="mobile">流動</string>
+    <string name="fax_work">工作傳真</string>
+    <string name="assistant">助理</string>
+    <string name="work">工作</string>
+    <string name="favorite">最愛</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2db7a5f6..50e9a8f7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -39,6 +39,7 @@
     <string name="website">Website</string>
     <string name="photo">Photo</string>
     <string name="phone_number">Phone number</string>
+    <string name="favorite">Favorite</string>
     <!-- Sorting and filter -->
     <string name="sort_order">Sort order</string>
     <string name="account_type">Account type</string>
@@ -47,6 +48,7 @@
     <string name="last_name">Last name</string>
     <string name="nick_name">Nickname</string>
     <string name="organization">Organization</string>
+    <string name="favorites_only">Favorites only</string>
     <!-- Types -->
     <string name="type">Type</string>
     <string name="home">Home</string>
@@ -81,6 +83,7 @@
     <!-- Sms -->
     <string name="messages">Messages</string>
     <string name="send">Send message</string>
+    <string name="cant_respond">Can\'t respond</string>
     <string name="reply">Reply</string>
     <string name="connection_error">Could not connect. Please ensure airplane mode is off.</string>
     <string name="message_too_long">Message is too long!</string>
@@ -89,9 +92,19 @@
     <string name="private_sms_database_desc">The SMS will only be stored within the app and not be accessible in other apps.</string>
     <string name="delete_thread">Delete thread</string>
     <string name="delete_message">Delete message</string>
+    <!-- Dialer -->
+    <string name="in_progress">In progress</string>
+    <string name="ringing">Ringing…</string>
+    <string name="disconnecting">Disconnecting…</string>
+    <string name="connecting">Connecting…</string>
+    <string name="confirm_start_call">Do you want to call %1$s?</string>
+    <string name="mute">Mute</string>
+    <string name="speakers">Speakers</string>
     <!-- Import & Export -->
     <string name="import_vcf">Import vCard</string>
     <string name="export_vcf">Export vCard</string>
+    <string name="import_sms">Import SMS</string>
+    <string name="export_sms">Export SMS</string>
     <string name="import_sim">Import from SIM</string>
     <string name="import_confirm">Do you want to import the selected VCF file?</string>
     <!-- Settings -->
@@ -103,6 +116,8 @@
     <string name="dark">Dark</string>
     <string name="auto_backup">Automatic backup</string>
     <string name="backup_interval">Backup interval</string>
+    <string name="backup_naming_scheme">Backup naming scheme</string>
+    <string name="backup_naming_scheme_hint">%d: date, %t: time, %s: source (local, device), source is required and either date or time</string>
     <string name="max_backup_amount">Max amount of backups</string>
     <string name="choose_dir">Directory</string>
     <string name="both">Both</string>
@@ -115,6 +130,9 @@
     <string name="backup">Backup</string>
     <string name="encrypt_backups">Encrypt backups as zip</string>
     <string name="backup_password">Password</string>
+    <string name="security">Security</string>
+    <string name="biometric_authentication">Biometric Authentication</string>
+    <string name="biometric_authentication_summary">Require biometric authentication (e.g. fingerprint) before the app can be accessed.</string>
     <!-- About -->
     <string name="about">About</string>
     <string name="license">License</string>
@@ -129,4 +147,23 @@
     <string name="add_event">Add Event</string>
     <string name="date">Date</string>
     <string name="amoled">Amoled</string>
+    <string name="calls">Calls</string>
+    <string name="decline">Decline</string>
+    <string name="accept">Accept</string>
+    <string name="unknown_number">Unknown Number</string>
+    <string name="dial_pad">Dialpad</string>
+    <string name="call_ended">Call Ended</string>
+    <string name="dialing">Dialing...</string>
+    <string name="call_from">Call From</string>
+    <string name="key_pad">Keypad</string>
+    <string name="select_custom_ringtone">Select custom ringtone</string>
+    <string name="change_ringtone">Change ringtone</string>
+    <string name="recent_calls">Recent calls</string>
+    <string name="block_numbers">Block numbers</string>
+    <string name="blocking_number_is_not_supported">Blocking number is not supported, Connect You is not the default SMS/Phone app</string>
+    <string name="number_blocked">Number blocked</string>
+    <string name="block_number">Block number</string>
+    <string name="unblock_number">Unblock number</string>
+    <string name="search_contacts">Search contacts</string>
+    <string name="start_a_new_conversation">Start a new conversation</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/test/java/com/bnyro/contacts/ExampleUnitTest.kt b/app/src/test/java/com/bnyro/contacts/ExampleUnitTest.kt
index a4c616e1..972ff932 100644
--- a/app/src/test/java/com/bnyro/contacts/ExampleUnitTest.kt
+++ b/app/src/test/java/com/bnyro/contacts/ExampleUnitTest.kt
@@ -1,8 +1,8 @@
 package com.bnyro.contacts
 
-import com.bnyro.contacts.receivers.SmsReceiver
 import com.bnyro.contacts.util.CalendarUtils
 import com.bnyro.contacts.util.SmsUtil
+import com.bnyro.contacts.util.receivers.SmsReceiver
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
diff --git a/build.gradle.kts b/build.gradle.kts
index f4e65b8b..d4d074b0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,8 +1,6 @@
-buildscript {
-    val compose_version by extra("1.5.0-beta01")
-} // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "7.4.2" apply false
-    id("com.android.library") version "7.4.2" apply false
-    id("org.jetbrains.kotlin.android") version "1.8.10" apply false
+    id("com.android.application") version "8.4.0" apply false
+    id("com.android.library") version "8.4.0" apply false
+    id("org.jetbrains.kotlin.android") version "1.9.23" apply false
+    id("com.google.devtools.ksp") version "1.9.23-1.0.20" apply false
 }
diff --git a/gradle.properties b/gradle.properties
index 3c5031eb..a2e90d87 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,6 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c4308c8e..8bdc9ba2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jan 24 15:00:58 CET 2023
+#Tue May 14 20:23:41 IST 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists