diff --git a/.gitignore b/.gitignore
index 9e28947a..6f45ca55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -91,3 +91,4 @@ lint/tmp/
 /app/google-services.json
 
 /tools
+/dirty
diff --git a/README.md b/README.md
index f1c69866..4ad6519f 100644
--- a/README.md
+++ b/README.md
@@ -10,25 +10,44 @@
 </p>
 
 ## 📲 Download
-<a href="https://play.google.com/store/apps/details?id=com.sadellie.unitto"><img alt="Google Play" src="./content/googlePlay.png" width="32%"/></a>
-<a href="https://f-droid.org/packages/com.sadellie.unitto"><img alt="F-Droid" src="./content/fDroid.png" width="27%"/></a>
+<a href="https://play.google.com/store/apps/details?id=com.sadellie.unitto"><img alt="Google Play" src="./content/gplay.svg" height="80"/></a>
+<a href="https://f-droid.org/packages/com.sadellie.unitto"><img alt="F-Droid" src="./content/fdroid.svg" height="80"/></a>
+<a href="https://github.com/sadellie/unitto/releases/latest"><img alt="GitHub" src="./content/github.svg" height="80"/></a>
 
 ## 😎 Features
 - **Instant** expression evaluation
 - Expressions **history**
 - **Copy**, **paste** and **cut** expression
 - **Material You** Theme even for **old devices**
-- **569** units and currencies
+- **583** units and currencies
 - **Smart** units search
 - **Adaptive** units sorting algorithm
 - **Small** app size
 - **Bulk convert** units
 - **Favorite** units
 - Ability to **disable unit groups**
+- Built-in **Date calculator**
 - Customizable number **formatter**
 - **SI Standard**
 
-**Currency converter** needs Internet connection, stop asking stupid questions.
+## ⚠ Security
+
+### `com.sadellie.unitto.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION`
+Read (boring): https://developer.android.com/about/versions/14/behavior-changes-14#runtime-receivers-exported
+
+### `android.permission.INTERNET`
+Used in **Unit Converter** to update currency rates. Requests are made *only* when you select a currency unit. See: [CurrencyApiService.kt](https://github.com/sadellie/unitto/blob/2405a2656ac8de3877a647f19813b4498f24c7a8/data/units/src/main/java/com/sadellie/unitto/data/units/remote/CurrencyApiService.kt) and [UnitsRepository.kt](https://github.com/sadellie/unitto/blob/49f1520d88843ed3cc7ebc02307e877950c9899b/data/units/src/main/java/com/sadellie/unitto/data/units/UnitsRepository.kt)
+
+### `android.permission.ACCESS_NETWORK_STATE`
+Used in **Unit Converter** as a callback. Retries to update currency rates if there was an error (no network, for example) and the Internet connection is back. See: [NetworkUtils.kt](https://github.com/sadellie/unitto/blob/d7db2780c83cdda33335c5278cafe4148c5e7778/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/NetworkUtils.kt) and [ConverterScreen.kt](https://github.com/sadellie/unitto/blob/6fcf340abac7d34d2de9b142bf8208b55a09079f/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/ConverterScreen.kt)
+
+### Non-free network service
+*Non-free* doesn't mean that you need to pay, put your credit card away. In this context it means that you can't host it on your machine (why the fuck would anyone want to host a currency API service?).
+
+The app uses [Free Currency Rates API](https://github.com/fawazahmed0/currency-api) by [fawazahmed0](https://github.com/fawazahmed0).
+Requests are send to `cdn.jsdelivr.net`.
+
+<sup>TL;DR: the app is legit</sup>
 
 ## 👅 [Translate](https://poeditor.com/join/project/T4zjmoq8dx)
 Join on **POEditor** to help.
@@ -40,9 +59,8 @@ Report bugs or request improvements. I may close your issue as not planned and r
 If you think that your question will not fit in "Issues", start a discussion.
 
 ## 👩‍💻 ~~Contribute code~~
-Code contributions are **not** welcomed. If you really want to, **ask me** first.
-
-Hard forks and alterations of Unitto are **not** welcomed. Use a "Fork" button so that commits' author is not lost.
+1. At the moment I do not need any help in code.
+2. Hard forks and alterations of Unitto are **not** welcomed. Use a "Fork" button so that commits' author is not lost.
 
 ## 🔎 Additional
 Terms and Conditions: https://sadellie.github.io/unitto/terms
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9d3bcad9..8e01d9c6 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -16,8 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-@file:Suppress("UnstableApiUsage")
-
 plugins {
     // Basic stuff
     id("com.android.application")
@@ -34,8 +32,21 @@ android {
         applicationId = "com.sadellie.unitto"
         minSdk = 21
         targetSdk = 34
-        versionCode = 24
-        versionName = "Mikado Yellow"
+        versionCode = 26
+        versionName = "Nadeshiko Pink"
+        resourceConfigurations += setOf(
+            "en",
+            "en-rGB",
+            "de",
+            "es",
+            "fr",
+            "hu",
+            "in",
+            "it",
+            "nl",
+            "ru",
+            "tr",
+        )
     }
 
     buildTypes {
@@ -91,9 +102,6 @@ android {
 
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_11.toString()
-        freeCompilerArgs = freeCompilerArgs + listOf(
-            "-opt-in=androidx.lifecycle.compose.ExperimentalLifecycleComposeApi"
-        )
     }
 
     composeOptions {
@@ -108,24 +116,24 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach
 }
 
 dependencies {
-    implementation(libs.androidx.core)
-    coreLibraryDesugaring(libs.android.desugarJdkLibs)
+    implementation(libs.androidx.core.core.ktx)
+    coreLibraryDesugaring(libs.com.android.tools.desugar.jdk.libs)
 
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.material.icons.extended)
-    implementation(libs.androidx.lifecycle.runtime.compose)
+    implementation(libs.androidx.lifecycle.lifecycle.runtime.compose)
     implementation(libs.com.github.sadellie.themmo)
-    implementation(libs.com.google.accompanist.systemuicontroller)
-    implementation(libs.androidx.datastore)
+    implementation(libs.com.google.accompanist.accompanist.systemuicontroller)
+    implementation(libs.androidx.datastore.datastore.preferences)
+    implementation(libs.androidx.appcompat.appcompat)
 
-    implementation(project(mapOf("path" to ":feature:converter")))
-    implementation(project(mapOf("path" to ":feature:calculator")))
-    implementation(project(mapOf("path" to ":feature:settings")))
-    implementation(project(mapOf("path" to ":feature:unitslist")))
-    implementation(project(mapOf("path" to ":feature:datecalculator")))
-    implementation(project(mapOf("path" to ":feature:timezone")))
-    implementation(project(mapOf("path" to ":data:model")))
-    implementation(project(mapOf("path" to ":data:userprefs")))
-    implementation(project(mapOf("path" to ":core:ui")))
-    implementation(project(mapOf("path" to ":core:base")))
+    implementation(project(":feature:converter"))
+    implementation(project(":feature:calculator"))
+    implementation(project(":feature:settings"))
+    implementation(project(":feature:datecalculator"))
+    implementation(project(":feature:timezone"))
+    implementation(project(":data:model"))
+    implementation(project(":data:userprefs"))
+    implementation(project(":core:ui"))
+    implementation(project(":core:base"))
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4d47d3f2..ba0a4a1f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,8 +7,8 @@
         android:name=".UnittoApplication"
         android:icon="@mipmap/ic_launcher_icon"
         android:label="@string/calculator"
-
         android:supportsRtl="false"
+        android:localeConfig="@xml/locales_config"
         android:theme="@style/Theme.Unitto">
         <activity
             android:windowSoftInputMode="adjustPan"
@@ -36,6 +36,15 @@
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
         </service>
+
+        <service
+            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
+            android:enabled="false"
+            android:exported="false">
+            <meta-data
+                android:name="autoStoreLocales"
+                android:value="true" />
+        </service>
 </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/sadellie/unitto/MainActivity.kt b/app/src/main/java/com/sadellie/unitto/MainActivity.kt
index b68879ed..f7935a0d 100644
--- a/app/src/main/java/com/sadellie/unitto/MainActivity.kt
+++ b/app/src/main/java/com/sadellie/unitto/MainActivity.kt
@@ -23,8 +23,8 @@ import android.content.Context
 import android.os.Bundle
 import android.util.AttributeSet
 import android.view.View
-import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.WindowCompat
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.sadellie.unitto.data.userprefs.UserPreferencesRepository
@@ -32,7 +32,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
 @AndroidEntryPoint
-internal class MainActivity : ComponentActivity() {
+internal class MainActivity : AppCompatActivity() {
 
     @Inject
     lateinit var userPrefsRepository: UserPreferencesRepository
@@ -41,10 +41,10 @@ internal class MainActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
 
         setContent {
-            val uiPrefs = userPrefsRepository.uiPreferencesFlow
+            val prefs = userPrefsRepository.appPrefs
                 .collectAsStateWithLifecycle(null).value
 
-            if (uiPrefs != null) UnittoApp(uiPrefs)
+            if (prefs != null) UnittoApp(prefs)
         }
     }
 
diff --git a/app/src/main/java/com/sadellie/unitto/UnittoApp.kt b/app/src/main/java/com/sadellie/unitto/UnittoApp.kt
index 48797e95..93d72b12 100644
--- a/app/src/main/java/com/sadellie/unitto/UnittoApp.kt
+++ b/app/src/main/java/com/sadellie/unitto/UnittoApp.kt
@@ -46,27 +46,29 @@ import com.sadellie.unitto.core.ui.common.isOpen
 import com.sadellie.unitto.core.ui.common.open
 import com.sadellie.unitto.core.ui.common.rememberUnittoDrawerState
 import com.sadellie.unitto.core.ui.model.DrawerItems
-import com.sadellie.unitto.core.ui.theme.AppTypography
+import com.sadellie.unitto.core.ui.pushDynamicShortcut
+import com.sadellie.unitto.core.ui.theme.TypographySystem
+import com.sadellie.unitto.core.ui.theme.TypographyUnitto
 import com.sadellie.unitto.core.ui.theme.DarkThemeColors
 import com.sadellie.unitto.core.ui.theme.LightThemeColors
-import com.sadellie.unitto.data.userprefs.UIPreferences
+import com.sadellie.unitto.data.userprefs.AppPreferences
 import io.github.sadellie.themmo.Themmo
 import io.github.sadellie.themmo.rememberThemmoController
 import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
-internal fun UnittoApp(uiPrefs: UIPreferences) {
+internal fun UnittoApp(prefs: AppPreferences) {
 
     val mContext = LocalContext.current
     val themmoController = rememberThemmoController(
         lightColorScheme = LightThemeColors,
         darkColorScheme = DarkThemeColors,
-        themingMode = uiPrefs.themingMode,
-        dynamicThemeEnabled = uiPrefs.enableDynamicTheme,
-        amoledThemeEnabled = uiPrefs.enableAmoledTheme,
-        customColor = uiPrefs.customColor,
-        monetMode = uiPrefs.monetMode
+        themingMode = prefs.themingMode,
+        dynamicThemeEnabled = prefs.enableDynamicTheme,
+        amoledThemeEnabled = prefs.enableAmoledTheme,
+        customColor = prefs.customColor,
+        monetMode = prefs.monetMode
     )
     val navController = rememberNavController()
     val sysUiController = rememberSystemUiController()
@@ -77,9 +79,9 @@ internal fun UnittoApp(uiPrefs: UIPreferences) {
 
     val shortcutsScope = rememberCoroutineScope()
 
-    val tabs by remember(uiPrefs.enableToolsExperiment) {
+    val tabs by remember(prefs.enableToolsExperiment) {
         derivedStateOf {
-            if (uiPrefs.enableToolsExperiment) {
+            if (prefs.enableToolsExperiment) {
                 listOf(
                     DrawerItems.Calculator,
                     DrawerItems.Converter,
@@ -105,7 +107,7 @@ internal fun UnittoApp(uiPrefs: UIPreferences) {
 
     Themmo(
         themmoController = themmoController,
-        typography = AppTypography,
+        typography = if (prefs.systemFont) TypographySystem else TypographyUnitto,
         animationSpec = tween(250)
     ) {
         val backgroundColor = MaterialTheme.colorScheme.background
@@ -150,7 +152,7 @@ internal fun UnittoApp(uiPrefs: UIPreferences) {
                 UnittoNavigation(
                     navController = navController,
                     themmoController = it,
-                    startDestination = uiPrefs.startingScreen,
+                    startDestination = prefs.startingScreen,
                     openDrawer = { drawerScope.launch { drawerState.open() } }
                 )
             }
diff --git a/app/src/main/java/com/sadellie/unitto/UnittoNavigation.kt b/app/src/main/java/com/sadellie/unitto/UnittoNavigation.kt
index 69ab8f48..1b205fa3 100644
--- a/app/src/main/java/com/sadellie/unitto/UnittoNavigation.kt
+++ b/app/src/main/java/com/sadellie/unitto/UnittoNavigation.kt
@@ -18,25 +18,20 @@
 
 package com.sadellie.unitto
 
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.background
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import com.sadellie.unitto.feature.calculator.navigation.calculatorGraph
-import com.sadellie.unitto.feature.converter.ConverterViewModel
 import com.sadellie.unitto.feature.converter.navigation.converterGraph
 import com.sadellie.unitto.feature.datecalculator.navigation.dateCalculatorGraph
 import com.sadellie.unitto.feature.settings.navigation.navigateToSettings
 import com.sadellie.unitto.feature.settings.navigation.navigateToUnitGroups
 import com.sadellie.unitto.feature.settings.navigation.settingGraph
-import com.sadellie.unitto.feature.unitslist.UnitsListViewModel
-import com.sadellie.unitto.feature.unitslist.navigation.leftScreen
-import com.sadellie.unitto.feature.unitslist.navigation.navigateToLeftSide
-import com.sadellie.unitto.feature.unitslist.navigation.navigateToRightSide
-import com.sadellie.unitto.feature.unitslist.navigation.rightScreen
 import com.sadellie.unitto.timezone.navigation.timeZoneGraph
 import io.github.sadellie.themmo.ThemmoController
 
@@ -47,34 +42,18 @@ internal fun UnittoNavigation(
     startDestination: String,
     openDrawer: () -> Unit
 ) {
-    val converterViewModel: ConverterViewModel = hiltViewModel()
-    val unitsListViewModel: UnitsListViewModel = hiltViewModel()
-
     NavHost(
         navController = navController,
         startDestination = startDestination,
-        modifier = Modifier.background(MaterialTheme.colorScheme.background)
+        modifier = Modifier.background(MaterialTheme.colorScheme.background),
+        enterTransition = { fadeIn() },
+        exitTransition = { fadeOut() }
     ) {
         converterGraph(
-            navigateToLeftScreen = navController::navigateToLeftSide,
-            navigateToRightScreen = navController::navigateToRightSide,
+            openDrawer = openDrawer,
+            navController = navController,
             navigateToSettings = navController::navigateToSettings,
-            navigateToMenu = openDrawer,
-            viewModel = converterViewModel
-        )
-
-        leftScreen(
-            viewModel = unitsListViewModel,
-            navigateUp = navController::navigateUp,
-            navigateToUnitGroups = navController::navigateToUnitGroups,
-            onSelect = converterViewModel::updateUnitFrom
-        )
-
-        rightScreen(
-            viewModel = unitsListViewModel,
-            navigateUp = navController::navigateUp,
-            navigateToUnitGroups = navController::navigateToUnitGroups,
-            onSelect = converterViewModel::updateUnitTo
+            navigateToUnitGroups = navController::navigateToUnitGroups
         )
 
         settingGraph(
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 4f6a9a46..ecaeb63c 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,5 +1,5 @@
 <resources>
-    <style name="Theme.Unitto" parent="@android:style/Theme.Material.NoActionBar">
+    <style name="Theme.Unitto" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="android:windowBackground">@color/window_background</item>
         <item name="android:statusBarColor">@color/window_background</item>
         <item name="android:navigationBarColor">@color/window_background</item>
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
index b3014624..d66799f7 100644
--- a/build-logic/convention/build.gradle.kts
+++ b/build-logic/convention/build.gradle.kts
@@ -23,19 +23,20 @@ plugins {
 group = "com.sadellie.unitto.buildlogic"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 }
 
 dependencies {
     compileOnly(libs.android.gradlePlugin)
     compileOnly(libs.kotlin.gradlePlugin)
+    compileOnly(libs.ksp.gradlePlugin)
 }
 
 gradlePlugin {
@@ -59,5 +60,10 @@ gradlePlugin {
             id = "unitto.library.compose"
             implementationClass = "UnittoLibraryComposePlugin"
         }
+
+        register("unittoRoomPlugin") {
+            id = "unitto.room"
+            implementationClass = "UnittoRoomPlugin"
+        }
     }
 }
diff --git a/build-logic/convention/src/main/java/UnittoHiltPlugin.kt b/build-logic/convention/src/main/java/UnittoHiltPlugin.kt
index be0545f1..3ff33948 100644
--- a/build-logic/convention/src/main/java/UnittoHiltPlugin.kt
+++ b/build-logic/convention/src/main/java/UnittoHiltPlugin.kt
@@ -32,10 +32,10 @@ class UnittoHiltPlugin : Plugin<Project> {
             }
             val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
             dependencies {
-                "implementation"(libs.findLibrary("androidx.hilt").get())
-                "implementation"(libs.findLibrary("com.google.dagger.android").get())
-                "kapt"(libs.findLibrary("com.google.dagger.processor").get())
-                "kapt"(libs.findLibrary("com.google.dagger.compiler").get())
+                "implementation"(libs.findLibrary("androidx.hilt.hilt.navigation.compose").get())
+                "implementation"(libs.findLibrary("com.google.dagger.android.hilt.android").get())
+                "kapt"(libs.findLibrary("com.google.dagger.dagger.android.processor").get())
+                "kapt"(libs.findLibrary("com.google.dagger.hilt.compiler").get())
             }
         }
     }
diff --git a/build-logic/convention/src/main/java/UnittoLibraryComposePlugin.kt b/build-logic/convention/src/main/java/UnittoLibraryComposePlugin.kt
index d7670ac2..26953b4f 100644
--- a/build-logic/convention/src/main/java/UnittoLibraryComposePlugin.kt
+++ b/build-logic/convention/src/main/java/UnittoLibraryComposePlugin.kt
@@ -36,7 +36,7 @@ class UnittoLibraryComposePlugin : Plugin<Project> {
             val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
             dependencies {
                 "implementation"(libs.findLibrary("androidx.compose.material3").get())
-                "implementation"(libs.findLibrary("androidx.lifecycle.runtime.compose").get())
+                "implementation"(libs.findLibrary("androidx.lifecycle.lifecycle.runtime.compose").get())
                 "implementation"(libs.findLibrary("androidx.compose.material.icons.extended").get())
                 "implementation"(libs.findLibrary("androidx.compose.ui.tooling").get())
                 "implementation"(libs.findLibrary("androidx.compose.ui.tooling.preview").get())
diff --git a/build-logic/convention/src/main/java/UnittoLibraryFeaturePlugin.kt b/build-logic/convention/src/main/java/UnittoLibraryFeaturePlugin.kt
index 26c031fb..dec1f270 100644
--- a/build-logic/convention/src/main/java/UnittoLibraryFeaturePlugin.kt
+++ b/build-logic/convention/src/main/java/UnittoLibraryFeaturePlugin.kt
@@ -28,10 +28,10 @@ class UnittoLibraryFeaturePlugin : Plugin<Project> {
         with(target) {
             val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
             dependencies {
-                "implementation"(libs.findLibrary("androidx.navigation").get())
+                "implementation"(libs.findLibrary("androidx.navigation.navigation.compose").get())
 
-                "implementation"(project(mapOf("path" to ":core:base")))
-                "implementation"(project(mapOf("path" to ":core:ui")))
+                "implementation"(project(":core:base"))
+                "implementation"(project(":core:ui"))
             }
         }
     }
diff --git a/build-logic/convention/src/main/java/UnittoLibraryPlugin.kt b/build-logic/convention/src/main/java/UnittoLibraryPlugin.kt
index b0189e6c..f06714f3 100644
--- a/build-logic/convention/src/main/java/UnittoLibraryPlugin.kt
+++ b/build-logic/convention/src/main/java/UnittoLibraryPlugin.kt
@@ -43,7 +43,7 @@ class UnittoLibraryPlugin : Plugin<Project> {
 
             val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
             dependencies {
-                "implementation"(libs.findLibrary("androidx.core").get())
+                "implementation"(libs.findLibrary("androidx.core.core.ktx").get())
             }
         }
     }
diff --git a/build-logic/convention/src/main/java/UnittoRoomPlugin.kt b/build-logic/convention/src/main/java/UnittoRoomPlugin.kt
new file mode 100644
index 00000000..f2167796
--- /dev/null
+++ b/build-logic/convention/src/main/java/UnittoRoomPlugin.kt
@@ -0,0 +1,42 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.getByType
+
+@Suppress("UNUSED")
+class UnittoRoomPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
+            with(pluginManager) {
+                apply("com.google.devtools.ksp")
+                apply("androidx.room")
+            }
+
+            dependencies {
+                "implementation"(libs.findLibrary("androidx.room.runtime").get())
+                "implementation"(libs.findLibrary("androidx.room.ktx").get())
+                "ksp"(libs.findLibrary("androidx.room.compiler").get())
+            }
+        }
+    }
+}
diff --git a/build-logic/convention/src/main/java/com/sadellie/unitto/ConfigureCompose.kt b/build-logic/convention/src/main/java/com/sadellie/unitto/ConfigureCompose.kt
index a97e347d..bfeff145 100644
--- a/build-logic/convention/src/main/java/com/sadellie/unitto/ConfigureCompose.kt
+++ b/build-logic/convention/src/main/java/com/sadellie/unitto/ConfigureCompose.kt
@@ -23,9 +23,8 @@ import org.gradle.api.Project
 import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.kotlin.dsl.getByType
 
-@Suppress("UnstableApiUsage")
 internal fun Project.configureCompose(
-    commonExtension: CommonExtension<*, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *>,
 ) {
     commonExtension.apply {
         buildFeatures {
diff --git a/build-logic/convention/src/main/java/com/sadellie/unitto/ConfigureKotlinAndroid.kt b/build-logic/convention/src/main/java/com/sadellie/unitto/ConfigureKotlinAndroid.kt
index 99c0f09b..a417f4c3 100644
--- a/build-logic/convention/src/main/java/com/sadellie/unitto/ConfigureKotlinAndroid.kt
+++ b/build-logic/convention/src/main/java/com/sadellie/unitto/ConfigureKotlinAndroid.kt
@@ -29,9 +29,8 @@ import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-@Suppress("UnstableApiUsage")
 internal fun Project.configureKotlinAndroid(
-    commonExtension: CommonExtension<*, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *>,
 ) {
     commonExtension.apply {
         compileSdk = 34
@@ -74,7 +73,7 @@ internal fun Project.configureKotlinAndroid(
                 "-opt-in=androidx.compose.animation.ExperimentalAnimationApi",
                 "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi",
                 "-opt-in=androidx.compose.ui.unit.ExperimentalUnitApi",
-                "-opt-in=androidx.lifecycle.compose.ExperimentalLifecycleComposeApi"
+                "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
             )
             jvmTarget = JavaVersion.VERSION_11.toString()
         }
@@ -90,10 +89,10 @@ internal fun Project.configureKotlinAndroid(
     val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
 
     dependencies {
-        add("coreLibraryDesugaring", libs.findLibrary("android.desugarJdkLibs").get())
+        add("coreLibraryDesugaring", libs.findLibrary("com.android.tools.desugar.jdk.libs").get())
     }
 }
 
-fun CommonExtension<*, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
+fun CommonExtension<*, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
     (this as ExtensionAware).extensions.configure("kotlinOptions", block)
 }
diff --git a/build.gradle.kts b/build.gradle.kts
index b619cd60..13b1c958 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,6 +3,8 @@ plugins {
     alias(libs.plugins.android.gradlePlugin) apply false
     alias(libs.plugins.kotlin.jvm) apply false
     alias(libs.plugins.hilt) apply false
+    alias(libs.plugins.ksp) apply false
+    alias(libs.plugins.room) apply false
 }
 
 tasks.register("clean", Delete::class) {
diff --git a/content/fDroid.png b/content/fDroid.png
deleted file mode 100644
index ab3bb365..00000000
Binary files a/content/fDroid.png and /dev/null differ
diff --git a/content/fdroid.svg b/content/fdroid.svg
new file mode 100644
index 00000000..c922840e
--- /dev/null
+++ b/content/fdroid.svg
@@ -0,0 +1,7 @@
+<svg width="99" height="40" viewBox="0 0 99 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="99" height="40" rx="9" fill="#00531D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.9924 9.17028C15.7654 8.94324 15.3973 8.94324 15.1703 9.17028C14.9432 9.39731 14.9432 9.76541 15.1703 9.99244L17.2073 12.0295C17.1283 12.2155 17.0846 12.4201 17.0846 12.6349V15.7355C17.0846 16.5917 17.7787 17.2857 18.6349 17.2857H33.3626C34.2188 17.2857 34.9128 16.5917 34.9128 15.7355V12.6349C34.9128 12.4208 34.8694 12.2168 34.7909 12.0312L36.8297 9.99244C37.0568 9.76541 37.0568 9.39732 36.8297 9.17028C36.6027 8.94325 36.2346 8.94325 36.0076 9.17028L33.9698 11.2081C33.7833 11.1286 33.5781 11.0846 33.3626 11.0846H18.6349C18.4201 11.0846 18.2155 11.1283 18.0295 11.2073L15.9924 9.17028ZM22.8982 14.1852C22.8982 15.0414 22.2041 15.7355 21.3479 15.7355C20.4917 15.7355 19.7976 15.0414 19.7976 14.1852C19.7976 13.329 20.4917 12.6349 21.3479 12.6349C22.2041 12.6349 22.8982 13.329 22.8982 14.1852ZM32.1999 14.1852C32.1999 15.0414 31.5058 15.7355 30.6496 15.7355C29.7934 15.7355 29.0993 15.0414 29.0993 14.1852C29.0993 13.329 29.7934 12.6349 30.6496 12.6349C31.5058 12.6349 32.1999 13.329 32.1999 14.1852Z" fill="#A3F6AB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.8757 24.262C29.8757 26.4025 28.1405 28.1377 26 28.1377C23.8595 28.1377 22.1243 26.4025 22.1243 24.262C22.1243 22.1215 23.8595 20.3863 26 20.3863C28.1405 20.3863 29.8757 22.1215 29.8757 24.262ZM26 26.975C27.4983 26.975 28.713 25.7603 28.713 24.262C28.713 22.7636 27.4983 21.549 26 21.549C24.771 21.549 23.7329 22.3662 23.3994 23.4869H24.6571C24.9252 23.0235 25.4262 22.7117 26 22.7117C26.8562 22.7117 27.5503 23.4058 27.5503 24.262C27.5503 25.1182 26.8562 25.8123 26 25.8123C25.4262 25.8123 24.9252 25.5005 24.6571 25.0371H23.3994C23.7329 26.1578 24.771 26.975 26 26.975Z" fill="#A3F6AB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.0846 28.9128V19.6112C17.0846 18.755 17.7787 18.0609 18.6349 18.0609H33.3626C34.2188 18.0609 34.9128 18.755 34.9128 19.6112V28.9128C34.9128 29.769 34.2188 30.4631 33.3626 30.4631H18.6349C17.7787 30.4631 17.0846 29.769 17.0846 28.9128ZM30.6508 24.262C30.6508 26.8306 28.5686 28.9128 26 28.9128C23.4314 28.9128 21.3492 26.8306 21.3492 24.262C21.3492 21.6934 23.4314 19.6112 26 19.6112C28.5686 19.6112 30.6508 21.6934 30.6508 24.262Z" fill="#A3F6AB"/>
+<path d="M49.95 20.31H53.56V21.17H49.95V20.31ZM50.05 24H49.05V17H53.99V17.87H50.05V24ZM55.2177 21.67V20.84H57.9077V21.67H55.2177ZM59.8258 24V17H62.7758C63.5224 17 64.1791 17.1467 64.7458 17.44C65.3191 17.7333 65.7624 18.1433 66.0758 18.67C66.3958 19.1967 66.5558 19.8067 66.5558 20.5C66.5558 21.1933 66.3958 21.8033 66.0758 22.33C65.7624 22.8567 65.3191 23.2667 64.7458 23.56C64.1791 23.8533 63.5224 24 62.7758 24H59.8258ZM60.8258 23.13H62.7158C63.2958 23.13 63.7958 23.02 64.2158 22.8C64.6424 22.58 64.9724 22.2733 65.2058 21.88C65.4391 21.48 65.5558 21.02 65.5558 20.5C65.5558 19.9733 65.4391 19.5133 65.2058 19.12C64.9724 18.7267 64.6424 18.42 64.2158 18.2C63.7958 17.98 63.2958 17.87 62.7158 17.87H60.8258V23.13ZM68.2475 24V18.7H69.1675V20.14L69.0775 19.78C69.2242 19.4133 69.4708 19.1333 69.8175 18.94C70.1642 18.7467 70.5908 18.65 71.0975 18.65V19.58C71.0575 19.5733 71.0175 19.57 70.9775 19.57C70.9442 19.57 70.9108 19.57 70.8775 19.57C70.3642 19.57 69.9575 19.7233 69.6575 20.03C69.3575 20.3367 69.2075 20.78 69.2075 21.36V24H68.2475ZM74.8019 24.06C74.2685 24.06 73.7952 23.9433 73.3819 23.71C72.9685 23.4767 72.6419 23.1567 72.4019 22.75C72.1619 22.3367 72.0419 21.87 72.0419 21.35C72.0419 20.8233 72.1619 20.3567 72.4019 19.95C72.6419 19.5433 72.9685 19.2267 73.3819 19C73.7952 18.7667 74.2685 18.65 74.8019 18.65C75.3285 18.65 75.7985 18.7667 76.2119 19C76.6319 19.2267 76.9585 19.5433 77.1919 19.95C77.4319 20.35 77.5519 20.8167 77.5519 21.35C77.5519 21.8767 77.4319 22.3433 77.1919 22.75C76.9585 23.1567 76.6319 23.4767 76.2119 23.71C75.7985 23.9433 75.3285 24.06 74.8019 24.06ZM74.8019 23.22C75.1419 23.22 75.4452 23.1433 75.7119 22.99C75.9852 22.8367 76.1985 22.62 76.3519 22.34C76.5052 22.0533 76.5819 21.7233 76.5819 21.35C76.5819 20.97 76.5052 20.6433 76.3519 20.37C76.1985 20.09 75.9852 19.8733 75.7119 19.72C75.4452 19.5667 75.1419 19.49 74.8019 19.49C74.4619 19.49 74.1585 19.5667 73.8919 19.72C73.6252 19.8733 73.4119 20.09 73.2519 20.37C73.0919 20.6433 73.0119 20.97 73.0119 21.35C73.0119 21.7233 73.0919 22.0533 73.2519 22.34C73.4119 22.62 73.6252 22.8367 73.8919 22.99C74.1585 23.1433 74.4619 23.22 74.8019 23.22ZM79.1795 24V18.7H80.1395V24H79.1795ZM79.6595 17.68C79.4729 17.68 79.3162 17.62 79.1895 17.5C79.0695 17.38 79.0095 17.2333 79.0095 17.06C79.0095 16.88 79.0695 16.73 79.1895 16.61C79.3162 16.49 79.4729 16.43 79.6595 16.43C79.8462 16.43 79.9995 16.49 80.1195 16.61C80.2462 16.7233 80.3095 16.8667 80.3095 17.04C80.3095 17.22 80.2495 17.3733 80.1295 17.5C80.0095 17.62 79.8529 17.68 79.6595 17.68ZM84.4625 24.06C83.9492 24.06 83.4892 23.9467 83.0825 23.72C82.6825 23.4933 82.3658 23.1767 82.1325 22.77C81.8992 22.3633 81.7825 21.89 81.7825 21.35C81.7825 20.81 81.8992 20.34 82.1325 19.94C82.3658 19.5333 82.6825 19.2167 83.0825 18.99C83.4892 18.7633 83.9492 18.65 84.4625 18.65C84.9092 18.65 85.3125 18.75 85.6725 18.95C86.0325 19.15 86.3192 19.45 86.5325 19.85C86.7525 20.25 86.8625 20.75 86.8625 21.35C86.8625 21.95 86.7558 22.45 86.5425 22.85C86.3358 23.25 86.0525 23.5533 85.6925 23.76C85.3325 23.96 84.9225 24.06 84.4625 24.06ZM84.5425 23.22C84.8758 23.22 85.1758 23.1433 85.4425 22.99C85.7158 22.8367 85.9292 22.62 86.0825 22.34C86.2425 22.0533 86.3225 21.7233 86.3225 21.35C86.3225 20.97 86.2425 20.6433 86.0825 20.37C85.9292 20.09 85.7158 19.8733 85.4425 19.72C85.1758 19.5667 84.8758 19.49 84.5425 19.49C84.2025 19.49 83.8992 19.5667 83.6325 19.72C83.3658 19.8733 83.1525 20.09 82.9925 20.37C82.8325 20.6433 82.7525 20.97 82.7525 21.35C82.7525 21.7233 82.8325 22.0533 82.9925 22.34C83.1525 22.62 83.3658 22.8367 83.6325 22.99C83.8992 23.1433 84.2025 23.22 84.5425 23.22ZM86.3525 24V22.57L86.4125 21.34L86.3125 20.11V16.58H87.2725V24H86.3525Z" fill="#A3F6AB"/>
+</svg>
diff --git a/content/github.svg b/content/github.svg
new file mode 100644
index 00000000..d9f254d3
--- /dev/null
+++ b/content/github.svg
@@ -0,0 +1,12 @@
+<svg width="96" height="40" viewBox="0 0 96 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="96" height="40" rx="9" fill="#00531D"/>
+<g clip-path="url(#clip0_502_2254)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.9672 9C19.9026 9 15 14.0417 15 20.2789C15 25.2646 18.1413 29.485 22.4991 30.9787C23.0439 31.091 23.2435 30.736 23.2435 30.4374C23.2435 30.1759 23.2255 29.2796 23.2255 28.3458C20.1747 29.0182 19.5394 27.0013 19.5394 27.0013C19.0491 25.6941 18.3227 25.3581 18.3227 25.3581C17.3241 24.6672 18.3954 24.6672 18.3954 24.6672C19.503 24.7419 20.0842 25.825 20.0842 25.825C21.0646 27.5428 22.6443 27.0574 23.2799 26.7586C23.3706 26.0303 23.6613 25.5261 23.9699 25.2461C21.5367 24.9846 18.9766 24.0136 18.9766 19.6812C18.9766 18.4488 19.4121 17.4404 20.1022 16.6562C19.9933 16.3762 19.6119 15.2182 20.2113 13.6684C20.2113 13.6684 21.1373 13.3695 23.2253 14.8261C24.1192 14.5792 25.0411 14.4536 25.9672 14.4526C26.8932 14.4526 27.8372 14.5834 28.7089 14.8261C30.7971 13.3695 31.7231 13.6684 31.7231 13.6684C32.3225 15.2182 31.9409 16.3762 31.832 16.6562C32.5403 17.4404 32.9578 18.4488 32.9578 19.6812C32.9578 24.0136 30.3978 24.9658 27.9463 25.2461C28.3459 25.6008 28.6907 26.273 28.6907 27.3375C28.6907 28.85 28.6728 30.0639 28.6728 30.4372C28.6728 30.736 28.8726 31.091 29.4172 30.9789C33.775 29.4847 36.9163 25.2646 36.9163 20.2789C36.9342 14.0417 32.0136 9 25.9672 9Z" fill="#A3F6AB"/>
+</g>
+<path d="M52.21 24.08C51.67 24.08 51.1733 23.9933 50.72 23.82C50.2667 23.64 49.8733 23.39 49.54 23.07C49.2067 22.7433 48.9467 22.3633 48.76 21.93C48.5733 21.4967 48.48 21.02 48.48 20.5C48.48 19.98 48.5733 19.5033 48.76 19.07C48.9467 18.6367 49.2067 18.26 49.54 17.94C49.88 17.6133 50.2767 17.3633 50.73 17.19C51.1833 17.01 51.6833 16.92 52.23 16.92C52.7833 16.92 53.29 17.01 53.75 17.19C54.21 17.37 54.6 17.64 54.92 18L54.3 18.62C54.0133 18.34 53.7 18.1367 53.36 18.01C53.0267 17.8767 52.6633 17.81 52.27 17.81C51.87 17.81 51.4967 17.8767 51.15 18.01C50.81 18.1433 50.5133 18.33 50.26 18.57C50.0133 18.81 49.82 19.0967 49.68 19.43C49.5467 19.7567 49.48 20.1133 49.48 20.5C49.48 20.88 49.5467 21.2367 49.68 21.57C49.82 21.8967 50.0133 22.1833 50.26 22.43C50.5133 22.67 50.81 22.8567 51.15 22.99C51.49 23.1233 51.86 23.19 52.26 23.19C52.6333 23.19 52.99 23.1333 53.33 23.02C53.6767 22.9 53.9967 22.7033 54.29 22.43L54.86 23.19C54.5133 23.4833 54.1067 23.7067 53.64 23.86C53.18 24.0067 52.7033 24.08 52.21 24.08ZM53.9 23.06V20.46H54.86V23.19L53.9 23.06ZM56.9346 24V18.7H57.8946V24H56.9346ZM57.4146 17.68C57.2279 17.68 57.0713 17.62 56.9446 17.5C56.8246 17.38 56.7646 17.2333 56.7646 17.06C56.7646 16.88 56.8246 16.73 56.9446 16.61C57.0713 16.49 57.2279 16.43 57.4146 16.43C57.6013 16.43 57.7546 16.49 57.8746 16.61C58.0013 16.7233 58.0646 16.8667 58.0646 17.04C58.0646 17.22 58.0046 17.3733 57.8846 17.5C57.7646 17.62 57.6079 17.68 57.4146 17.68ZM61.8476 24.06C61.3142 24.06 60.9009 23.9167 60.6076 23.63C60.3142 23.3433 60.1676 22.9333 60.1676 22.4V17.54H61.1276V22.36C61.1276 22.6467 61.1976 22.8667 61.3376 23.02C61.4842 23.1733 61.6909 23.25 61.9576 23.25C62.2576 23.25 62.5076 23.1667 62.7076 23L63.0076 23.69C62.8609 23.8167 62.6842 23.91 62.4776 23.97C62.2776 24.03 62.0676 24.06 61.8476 24.06ZM59.2676 19.49V18.7H62.6476V19.49H59.2676ZM69.6282 17H70.6282V24H69.6282V17ZM65.6082 24H64.6082V17H65.6082V24ZM69.7182 20.88H65.5082V20.01H69.7182V20.88ZM75.1134 24.06C74.6601 24.06 74.2601 23.9767 73.9134 23.81C73.5734 23.6433 73.3068 23.39 73.1134 23.05C72.9268 22.7033 72.8334 22.27 72.8334 21.75V18.7H73.7934V21.64C73.7934 22.16 73.9168 22.55 74.1634 22.81C74.4168 23.07 74.7701 23.2 75.2234 23.2C75.5568 23.2 75.8468 23.1333 76.0934 23C76.3401 22.86 76.5301 22.66 76.6634 22.4C76.7968 22.1333 76.8634 21.8133 76.8634 21.44V18.7H77.8234V24H76.9134V22.57L77.0634 22.95C76.8901 23.3033 76.6301 23.5767 76.2834 23.77C75.9368 23.9633 75.5468 24.06 75.1134 24.06ZM82.761 24.06C82.3077 24.06 81.8977 23.96 81.531 23.76C81.171 23.5533 80.8843 23.25 80.671 22.85C80.4643 22.45 80.361 21.95 80.361 21.35C80.361 20.75 80.4677 20.25 80.681 19.85C80.901 19.45 81.191 19.15 81.551 18.95C81.9177 18.75 82.321 18.65 82.761 18.65C83.281 18.65 83.741 18.7633 84.141 18.99C84.541 19.2167 84.8577 19.5333 85.091 19.94C85.3243 20.34 85.441 20.81 85.441 21.35C85.441 21.89 85.3243 22.3633 85.091 22.77C84.8577 23.1767 84.541 23.4933 84.141 23.72C83.741 23.9467 83.281 24.06 82.761 24.06ZM79.951 24V16.58H80.911V20.11L80.811 21.34L80.871 22.57V24H79.951ZM82.681 23.22C83.021 23.22 83.3243 23.1433 83.591 22.99C83.8643 22.8367 84.0777 22.62 84.231 22.34C84.391 22.0533 84.471 21.7233 84.471 21.35C84.471 20.97 84.391 20.6433 84.231 20.37C84.0777 20.09 83.8643 19.8733 83.591 19.72C83.3243 19.5667 83.021 19.49 82.681 19.49C82.3477 19.49 82.0443 19.5667 81.771 19.72C81.5043 19.8733 81.291 20.09 81.131 20.37C80.9777 20.6433 80.901 20.97 80.901 21.35C80.901 21.7233 80.9777 22.0533 81.131 22.34C81.291 22.62 81.5043 22.8367 81.771 22.99C82.0443 23.1433 82.3477 23.22 82.681 23.22Z" fill="#A3F6AB"/>
+<defs>
+<clipPath id="clip0_502_2254">
+<rect width="22" height="22" fill="white" transform="translate(15 9)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/content/googlePlay.png b/content/googlePlay.png
deleted file mode 100644
index 5ece9159..00000000
Binary files a/content/googlePlay.png and /dev/null differ
diff --git a/content/gplay.svg b/content/gplay.svg
new file mode 100644
index 00000000..d94145ca
--- /dev/null
+++ b/content/gplay.svg
@@ -0,0 +1,5 @@
+<svg width="122" height="40" viewBox="0 0 122 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="122" height="40" rx="9" fill="#00531D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.127 9.7786C16.0449 9.99327 16 10.2489 16 10.5414V29.4581C16 29.7512 16.0449 30.0069 16.1272 30.2216L26.3478 19.9994L16.127 9.7786ZM16.8254 30.9376C17.1962 31.0648 17.6651 31.0012 18.1734 30.7129L30.2173 23.8689L27.0549 20.7065L16.8254 30.9376ZM31.1197 23.3571L34.8534 21.2357C36.0483 20.5557 36.0483 19.4446 34.8534 18.7655L31.118 16.6429L27.762 19.9994L31.1197 23.3571ZM30.2162 16.1305L18.1734 9.28746C17.665 8.99857 17.1962 8.93513 16.8253 9.06262L27.0549 19.2923L30.2162 16.1305Z" fill="#A3F6AB"/>
+<path d="M52.21 24.08C51.67 24.08 51.1733 23.9933 50.72 23.82C50.2667 23.64 49.8733 23.39 49.54 23.07C49.2067 22.7433 48.9467 22.3633 48.76 21.93C48.5733 21.4967 48.48 21.02 48.48 20.5C48.48 19.98 48.5733 19.5033 48.76 19.07C48.9467 18.6367 49.2067 18.26 49.54 17.94C49.88 17.6133 50.2767 17.3633 50.73 17.19C51.1833 17.01 51.6833 16.92 52.23 16.92C52.7833 16.92 53.29 17.01 53.75 17.19C54.21 17.37 54.6 17.64 54.92 18L54.3 18.62C54.0133 18.34 53.7 18.1367 53.36 18.01C53.0267 17.8767 52.6633 17.81 52.27 17.81C51.87 17.81 51.4967 17.8767 51.15 18.01C50.81 18.1433 50.5133 18.33 50.26 18.57C50.0133 18.81 49.82 19.0967 49.68 19.43C49.5467 19.7567 49.48 20.1133 49.48 20.5C49.48 20.88 49.5467 21.2367 49.68 21.57C49.82 21.8967 50.0133 22.1833 50.26 22.43C50.5133 22.67 50.81 22.8567 51.15 22.99C51.49 23.1233 51.86 23.19 52.26 23.19C52.6333 23.19 52.99 23.1333 53.33 23.02C53.6767 22.9 53.9967 22.7033 54.29 22.43L54.86 23.19C54.5133 23.4833 54.1067 23.7067 53.64 23.86C53.18 24.0067 52.7033 24.08 52.21 24.08ZM53.9 23.06V20.46H54.86V23.19L53.9 23.06ZM59.2046 24.06C58.6713 24.06 58.1979 23.9433 57.7846 23.71C57.3713 23.4767 57.0446 23.1567 56.8046 22.75C56.5646 22.3367 56.4446 21.87 56.4446 21.35C56.4446 20.8233 56.5646 20.3567 56.8046 19.95C57.0446 19.5433 57.3713 19.2267 57.7846 19C58.1979 18.7667 58.6713 18.65 59.2046 18.65C59.7313 18.65 60.2013 18.7667 60.6146 19C61.0346 19.2267 61.3613 19.5433 61.5946 19.95C61.8346 20.35 61.9546 20.8167 61.9546 21.35C61.9546 21.8767 61.8346 22.3433 61.5946 22.75C61.3613 23.1567 61.0346 23.4767 60.6146 23.71C60.2013 23.9433 59.7313 24.06 59.2046 24.06ZM59.2046 23.22C59.5446 23.22 59.8479 23.1433 60.1146 22.99C60.3879 22.8367 60.6013 22.62 60.7546 22.34C60.9079 22.0533 60.9846 21.7233 60.9846 21.35C60.9846 20.97 60.9079 20.6433 60.7546 20.37C60.6013 20.09 60.3879 19.8733 60.1146 19.72C59.8479 19.5667 59.5446 19.49 59.2046 19.49C58.8646 19.49 58.5613 19.5667 58.2946 19.72C58.0279 19.8733 57.8146 20.09 57.6546 20.37C57.4946 20.6433 57.4146 20.97 57.4146 21.35C57.4146 21.7233 57.4946 22.0533 57.6546 22.34C57.8146 22.62 58.0279 22.8367 58.2946 22.99C58.5613 23.1433 58.8646 23.22 59.2046 23.22ZM65.8523 24.06C65.3189 24.06 64.8456 23.9433 64.4323 23.71C64.0189 23.4767 63.6923 23.1567 63.4523 22.75C63.2123 22.3367 63.0923 21.87 63.0923 21.35C63.0923 20.8233 63.2123 20.3567 63.4523 19.95C63.6923 19.5433 64.0189 19.2267 64.4323 19C64.8456 18.7667 65.3189 18.65 65.8523 18.65C66.3789 18.65 66.8489 18.7667 67.2623 19C67.6823 19.2267 68.0089 19.5433 68.2423 19.95C68.4823 20.35 68.6023 20.8167 68.6023 21.35C68.6023 21.8767 68.4823 22.3433 68.2423 22.75C68.0089 23.1567 67.6823 23.4767 67.2623 23.71C66.8489 23.9433 66.3789 24.06 65.8523 24.06ZM65.8523 23.22C66.1923 23.22 66.4956 23.1433 66.7623 22.99C67.0356 22.8367 67.2489 22.62 67.4023 22.34C67.5556 22.0533 67.6323 21.7233 67.6323 21.35C67.6323 20.97 67.5556 20.6433 67.4023 20.37C67.2489 20.09 67.0356 19.8733 66.7623 19.72C66.4956 19.5667 66.1923 19.49 65.8523 19.49C65.5123 19.49 65.2089 19.5667 64.9423 19.72C64.6756 19.8733 64.4623 20.09 64.3023 20.37C64.1423 20.6433 64.0623 20.97 64.0623 21.35C64.0623 21.7233 64.1423 22.0533 64.3023 22.34C64.4623 22.62 64.6756 22.8367 64.9423 22.99C65.2089 23.1433 65.5123 23.22 65.8523 23.22ZM72.5499 26C72.0633 26 71.5899 25.93 71.1299 25.79C70.6766 25.6567 70.3066 25.4633 70.0199 25.21L70.4799 24.47C70.7266 24.6833 71.0299 24.85 71.3899 24.97C71.7499 25.0967 72.1266 25.16 72.5199 25.16C73.1466 25.16 73.6066 25.0133 73.8999 24.72C74.1933 24.4267 74.3399 23.98 74.3399 23.38V22.26L74.4399 21.21L74.3899 20.15V18.7H75.2999V23.28C75.2999 24.2133 75.0666 24.9 74.5999 25.34C74.1333 25.78 73.4499 26 72.5499 26ZM72.4299 23.78C71.9166 23.78 71.4566 23.6733 71.0499 23.46C70.6499 23.24 70.3299 22.9367 70.0899 22.55C69.8566 22.1633 69.7399 21.7167 69.7399 21.21C69.7399 20.6967 69.8566 20.25 70.0899 19.87C70.3299 19.4833 70.6499 19.1833 71.0499 18.97C71.4566 18.7567 71.9166 18.65 72.4299 18.65C72.8833 18.65 73.2966 18.7433 73.6699 18.93C74.0433 19.11 74.3399 19.39 74.5599 19.77C74.7866 20.15 74.8999 20.63 74.8999 21.21C74.8999 21.7833 74.7866 22.26 74.5599 22.64C74.3399 23.02 74.0433 23.3067 73.6699 23.5C73.2966 23.6867 72.8833 23.78 72.4299 23.78ZM72.5399 22.94C72.8933 22.94 73.2066 22.8667 73.4799 22.72C73.7533 22.5733 73.9666 22.37 74.1199 22.11C74.2799 21.85 74.3599 21.55 74.3599 21.21C74.3599 20.87 74.2799 20.57 74.1199 20.31C73.9666 20.05 73.7533 19.85 73.4799 19.71C73.2066 19.5633 72.8933 19.49 72.5399 19.49C72.1866 19.49 71.8699 19.5633 71.5899 19.71C71.3166 19.85 71.0999 20.05 70.9399 20.31C70.7866 20.57 70.7099 20.87 70.7099 21.21C70.7099 21.55 70.7866 21.85 70.9399 22.11C71.0999 22.37 71.3166 22.5733 71.5899 22.72C71.8699 22.8667 72.1866 22.94 72.5399 22.94ZM77.4342 24V16.58H78.3942V24H77.4342ZM82.8872 24.06C82.3205 24.06 81.8205 23.9433 81.3872 23.71C80.9605 23.4767 80.6272 23.1567 80.3872 22.75C80.1539 22.3433 80.0372 21.8767 80.0372 21.35C80.0372 20.8233 80.1505 20.3567 80.3772 19.95C80.6105 19.5433 80.9272 19.2267 81.3272 19C81.7339 18.7667 82.1905 18.65 82.6972 18.65C83.2105 18.65 83.6639 18.7633 84.0572 18.99C84.4505 19.2167 84.7572 19.5367 84.9772 19.95C85.2039 20.3567 85.3172 20.8333 85.3172 21.38C85.3172 21.42 85.3139 21.4667 85.3072 21.52C85.3072 21.5733 85.3039 21.6233 85.2972 21.67H80.7872V20.98H84.7972L84.4072 21.22C84.4139 20.88 84.3439 20.5767 84.1972 20.31C84.0505 20.0433 83.8472 19.8367 83.5872 19.69C83.3339 19.5367 83.0372 19.46 82.6972 19.46C82.3639 19.46 82.0672 19.5367 81.8072 19.69C81.5472 19.8367 81.3439 20.0467 81.1972 20.32C81.0505 20.5867 80.9772 20.8933 80.9772 21.24V21.4C80.9772 21.7533 81.0572 22.07 81.2172 22.35C81.3839 22.6233 81.6139 22.8367 81.9072 22.99C82.2005 23.1433 82.5372 23.22 82.9172 23.22C83.2305 23.22 83.5139 23.1667 83.7672 23.06C84.0272 22.9533 84.2539 22.7933 84.4472 22.58L84.9772 23.2C84.7372 23.48 84.4372 23.6933 84.0772 23.84C83.7239 23.9867 83.3272 24.06 82.8872 24.06ZM90.0758 24V17H92.8058C93.4191 17 93.9424 17.0967 94.3758 17.29C94.8091 17.4833 95.1424 17.7633 95.3758 18.13C95.6091 18.4967 95.7258 18.9333 95.7258 19.44C95.7258 19.9467 95.6091 20.3833 95.3758 20.75C95.1424 21.11 94.8091 21.39 94.3758 21.59C93.9424 21.7833 93.4191 21.88 92.8058 21.88H90.6258L91.0758 21.41V24H90.0758ZM91.0758 21.51L90.6258 21.01H92.7758C93.4158 21.01 93.8991 20.8733 94.2258 20.6C94.5591 20.3267 94.7258 19.94 94.7258 19.44C94.7258 18.94 94.5591 18.5533 94.2258 18.28C93.8991 18.0067 93.4158 17.87 92.7758 17.87H90.6258L91.0758 17.37V21.51ZM97.4526 24V16.58H98.4126V24H97.4526ZM103.836 24V22.88L103.786 22.67V20.76C103.786 20.3533 103.666 20.04 103.426 19.82C103.192 19.5933 102.839 19.48 102.366 19.48C102.052 19.48 101.746 19.5333 101.446 19.64C101.146 19.74 100.892 19.8767 100.686 20.05L100.286 19.33C100.559 19.11 100.886 18.9433 101.266 18.83C101.652 18.71 102.056 18.65 102.476 18.65C103.202 18.65 103.762 18.8267 104.156 19.18C104.549 19.5333 104.746 20.0733 104.746 20.8V24H103.836ZM102.096 24.06C101.702 24.06 101.356 23.9933 101.056 23.86C100.762 23.7267 100.536 23.5433 100.376 23.31C100.216 23.07 100.136 22.8 100.136 22.5C100.136 22.2133 100.202 21.9533 100.336 21.72C100.476 21.4867 100.699 21.3 101.006 21.16C101.319 21.02 101.739 20.95 102.266 20.95H103.946V21.64H102.306C101.826 21.64 101.502 21.72 101.336 21.88C101.169 22.04 101.086 22.2333 101.086 22.46C101.086 22.72 101.189 22.93 101.396 23.09C101.602 23.2433 101.889 23.32 102.256 23.32C102.616 23.32 102.929 23.24 103.196 23.08C103.469 22.92 103.666 22.6867 103.786 22.38L103.976 23.04C103.849 23.3533 103.626 23.6033 103.306 23.79C102.986 23.97 102.582 24.06 102.096 24.06ZM106.954 26C106.701 26 106.454 25.9567 106.214 25.87C105.974 25.79 105.768 25.67 105.594 25.51L106.004 24.79C106.138 24.9167 106.284 25.0133 106.444 25.08C106.604 25.1467 106.774 25.18 106.954 25.18C107.188 25.18 107.381 25.12 107.534 25C107.688 24.88 107.831 24.6667 107.964 24.36L108.294 23.63L108.394 23.51L110.474 18.7H111.414L108.844 24.53C108.691 24.9033 108.518 25.1967 108.324 25.41C108.138 25.6233 107.931 25.7733 107.704 25.86C107.478 25.9533 107.228 26 106.954 26ZM108.214 24.17L105.794 18.7H106.794L108.854 23.42L108.214 24.17Z" fill="#A3F6AB"/>
+</svg>
diff --git a/core/base/build.gradle.kts b/core/base/build.gradle.kts
index e3c29da2..1ee78dca 100644
--- a/core/base/build.gradle.kts
+++ b/core/base/build.gradle.kts
@@ -16,8 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-@file:Suppress("UnstableApiUsage")
-
 plugins {
     id("unitto.library")
 }
diff --git a/core/base/src/main/java/com/sadellie/unitto/core/base/Token.kt b/core/base/src/main/java/com/sadellie/unitto/core/base/Token.kt
index dd20a0c8..dd392aa4 100644
--- a/core/base/src/main/java/com/sadellie/unitto/core/base/Token.kt
+++ b/core/base/src/main/java/com/sadellie/unitto/core/base/Token.kt
@@ -18,6 +18,7 @@
 
 package com.sadellie.unitto.core.base
 
+@Suppress("ObjectPropertyName")
 object Token {
     object Digit {
         const val _1 = "1"
diff --git a/core/base/src/main/java/com/sadellie/unitto/core/base/TopLevelDestinations.kt b/core/base/src/main/java/com/sadellie/unitto/core/base/TopLevelDestinations.kt
index 30c802c9..36fea191 100644
--- a/core/base/src/main/java/com/sadellie/unitto/core/base/TopLevelDestinations.kt
+++ b/core/base/src/main/java/com/sadellie/unitto/core/base/TopLevelDestinations.kt
@@ -101,11 +101,12 @@ sealed class TopLevelDestinations(
 }
 
 // Shown in settings
-val TOP_LEVEL_GRAPH_ROUTES: Map<String, Int> by lazy {
-    mapOf(
-        TopLevelDestinations.Calculator.graph to R.string.calculator,
-        TopLevelDestinations.Converter.graph to R.string.unit_converter,
-        TopLevelDestinations.DateCalculator.graph to R.string.date_calculator,
+val TOP_LEVEL_DESTINATIONS by lazy {
+    listOf(
+        TopLevelDestinations.Calculator,
+        TopLevelDestinations.Converter,
+        TopLevelDestinations.DateCalculator,
+        // TopLevelDestinations.TimeZone,
     )
 }
 
diff --git a/core/base/src/main/res/values-de/strings.xml b/core/base/src/main/res/values-de/strings.xml
index 8d0a90d6..47b8be2c 100644
--- a/core/base/src/main/res/values-de/strings.xml
+++ b/core/base/src/main/res/values-de/strings.xml
@@ -99,47 +99,47 @@
     <string name="kelvin">Kelvin</string>
 
     <!-- Speed -->
-    <string name="millimeter_per_hour">Millimeter pro Stunde</string>
+    <string name="millimeter_per_hour">Millimeter/Stunde</string>
     <string name="millimeter_per_hour_short">mm/h</string>
-    <string name="millimeter_per_minute">Millimeter pro Minute</string>
+    <string name="millimeter_per_minute">Millimeter/Minute</string>
     <string name="millimeter_per_minute_short">mm/m</string>
-    <string name="millimeter_per_second">Millimeter pro Sekunde</string>
+    <string name="millimeter_per_second">Millimeter/Sekunde</string>
     <string name="millimeter_per_second_short">mm/s</string>
-    <string name="centimeter_per_hour">Zentimeter pro Stunde</string>
+    <string name="centimeter_per_hour">Zentimeter/Stunde</string>
     <string name="centimeter_per_hour_short">cm/h</string>
-    <string name="centimeter_per_minute">Zentimeter pro Minute</string>
+    <string name="centimeter_per_minute">Zentimeter/Minute</string>
     <string name="centimeter_per_minute_short">cm/m</string>
-    <string name="centimeter_per_second">Zentimeter pro Sekunde</string>
+    <string name="centimeter_per_second">Zentimeter/Sekunde</string>
     <string name="centimeter_per_second_short">cm/s</string>
-    <string name="meter_per_hour">Meter pro Stunde</string>
+    <string name="meter_per_hour">Meter/Stunde</string>
     <string name="meter_per_hour_short">m/h</string>
-    <string name="meter_per_minute">Meter pro Minute</string>
+    <string name="meter_per_minute">Meter/Minute</string>
     <string name="meter_per_minute_short">m/m</string>
-    <string name="meter_per_second">Meter pro Sekunde</string>
+    <string name="meter_per_second">Meter/Sekunde</string>
     <string name="meter_per_second_short">m/s</string>
-    <string name="kilometer_per_hour">Kilometer pro Stunde</string>
+    <string name="kilometer_per_hour">Kilometer/Stunde</string>
     <string name="kilometer_per_hour_short">km/h</string>
-    <string name="kilometer_per_minute">Kilometer pro Minute</string>
+    <string name="kilometer_per_minute">Kilometer/Minute</string>
     <string name="kilometer_per_minute_short">km/m</string>
-    <string name="kilometer_per_second">Kilometer pro Sekunde</string>
+    <string name="kilometer_per_second">Kilometer/Sekunde</string>
     <string name="kilometer_per_second_short">km/s</string>
-    <string name="foot_per_hour">Fuß pro Stunde</string>
+    <string name="foot_per_hour">Fuß/Stunde</string>
     <string name="foot_per_hour_short">ft/h</string>
-    <string name="foot_per_minute">Fuß pro Minute</string>
+    <string name="foot_per_minute">Fuß/Minute</string>
     <string name="foot_per_minute_short">ft/m</string>
-    <string name="foot_per_second">Fuß pro Sekunde</string>
+    <string name="foot_per_second">Fuß/Sekunde</string>
     <string name="foot_per_second_short">ft/s</string>
-    <string name="yard_per_hour">Yard pro Stunde</string>
+    <string name="yard_per_hour">Yard/Stunde</string>
     <string name="yard_per_hour_short">yd/h</string>
-    <string name="yard_per_minute">Yard pro Minute</string>
+    <string name="yard_per_minute">Yard/Minute</string>
     <string name="yard_per_minute_short">yd/m</string>
-    <string name="yard_per_second">Yard pro Sekunde</string>
+    <string name="yard_per_second">Yard/Sekunde</string>
     <string name="yard_per_second_short">yd/s</string>
-    <string name="mile_per_hour">Meilen pro Stunde</string>
+    <string name="mile_per_hour">Meilen/Stunde</string>
     <string name="mile_per_hour_short">mi/h</string>
-    <string name="mile_per_minute">Meilen pro Minute</string>
+    <string name="mile_per_minute">Meilen/Minute</string>
     <string name="mile_per_minute_short">mi/m</string>
-    <string name="mile_per_second">Meile pro Sekunde</string>
+    <string name="mile_per_second">Meile/Sekunde</string>
     <string name="mile_per_second_short">mi/s</string>
     <string name="knot">Knoten</string>
     <string name="knot_short">kt</string>
@@ -190,41 +190,41 @@
     <string name="exabyte_short">EB</string>
 
     <!-- Data transfer -->
-    <string name="bit_per_second">Bits pro Sekunde</string>
+    <string name="bit_per_second">Bits/Sekunde</string>
     <string name="bit_per_second_short">b/s</string>
-    <string name="kibibit_per_second">Kibibit pro Sekunde</string>
+    <string name="kibibit_per_second">Kibibit/Sekunde</string>
     <string name="kibibit_per_second_short">Kib/s</string>
-    <string name="kilobit_per_second">Kilobit pro Sekunde</string>
+    <string name="kilobit_per_second">Kilobit/Sekunde</string>
     <string name="kilobit_per_second_short">Kb/s</string>
-    <string name="megabit_per_second">Megabit pro Sekunde</string>
+    <string name="megabit_per_second">Megabit/Sekunde</string>
     <string name="megabit_per_second_short">Mb/s</string>
-    <string name="mebibit_per_second">Mebibit pro Sekunde</string>
+    <string name="mebibit_per_second">Mebibit/Sekunde</string>
     <string name="mebibit_per_second_short">Mib/s</string>
-    <string name="gigabit_per_second">Gigabit pro Sekunde</string>
+    <string name="gigabit_per_second">Gigabit/Sekunde</string>
     <string name="gigabit_per_second_short">Gb/s</string>
-    <string name="terabit_per_second">Terabit pro Sekunde</string>
+    <string name="terabit_per_second">Terabit/Sekunde</string>
     <string name="terabit_per_second_short">Tb/s</string>
-    <string name="petabit_per_second">Petabit pro Sekunde</string>
+    <string name="petabit_per_second">Petabit/Sekunde</string>
     <string name="petabit_per_second_short">Pb/s</string>
-    <string name="exabit_per_second">Exabit pro Sekunde</string>
+    <string name="exabit_per_second">Exabit/Sekunde</string>
     <string name="exabit_per_second_short">Eb/s</string>
-    <string name="byte_per_second">Byte pro Sekunde</string>
+    <string name="byte_per_second">Byte/Sekunde</string>
     <string name="byte_per_second_short">B/s</string>
-    <string name="kibibyte_per_second">Kibbibyte pro Sekunde</string>
+    <string name="kibibyte_per_second">Kibbibyte/Sekunde</string>
     <string name="kibibyte_per_second_short">KiB/s</string>
-    <string name="kilobyte_per_second">Kilobyte pro Sekunde</string>
+    <string name="kilobyte_per_second">Kilobyte/Sekunde</string>
     <string name="kilobyte_per_second_short">KB/s</string>
-    <string name="megabyte_per_second">Megabyte pro Sekunde</string>
+    <string name="megabyte_per_second">Megabyte/Sekunde</string>
     <string name="megabyte_per_second_short">MB/s</string>
-    <string name="mebibyte_per_second">Mebibyte pro Sekunde</string>
+    <string name="mebibyte_per_second">Mebibyte/Sekunde</string>
     <string name="mebibyte_per_second_short">MiB/s</string>
-    <string name="gigabyte_per_second">Gigabyte pro Sekunde</string>
+    <string name="gigabyte_per_second">Gigabyte/Sekunde</string>
     <string name="gigabyte_per_second_short">GB/s</string>
-    <string name="terabyte_per_second">Terabyte pro Sekunde</string>
+    <string name="terabyte_per_second">Terabyte/Sekunde</string>
     <string name="terabyte_per_second_short">TB/s</string>
-    <string name="petabyte_per_second">Petabyte pro Sekunde</string>
+    <string name="petabyte_per_second">Petabyte/Sekunde</string>
     <string name="petabyte_per_second_short">PB/s</string>
-    <string name="exabyte_per_second">Exabyte pro Sekunde</string>
+    <string name="exabyte_per_second">Exabyte/Sekunde</string>
     <string name="exabyte_per_second_short">EB/s</string>
 
     <!-- Volume -->
@@ -400,7 +400,7 @@
     <string name="megapascal">Megapascal</string>
     <string name="megapascal_short">MPa</string>
     <string name="gigapascal">Gigapascal</string>
-    <string name="gigapascal_short">GPA</string>
+    <string name="gigapascal_short">GPa</string>
     <string name="terapascal">Terapascal</string>
     <string name="terapascal_short">TPa</string>
     <string name="petapascal">Petapascal</string>
@@ -409,7 +409,7 @@
     <string name="exapascal_short">EPa</string>
     <string name="psi">Pfund pro Quadratzoll</string>
     <string name="ksi">Kilopfund pro Quadratzoll</string>
-    <string name="standard_atmosphere">Physikalische Atmosphäre </string>
+    <string name="standard_atmosphere">Physikalische Atmosphäre</string>
     <string name="standard_atmosphere_short">atm</string>
     <string name="torr">Torr</string>
     <string name="torr_short">torr</string>
@@ -417,15 +417,15 @@
     <string name="millimeter_of_mercury_short">mm Hg</string>
 
     <!-- Acceleration -->
-    <string name="attometer_per_square_second">Attometer pro Quadratsekunde</string>
+    <string name="attometer_per_square_second">Attometer/Quadratsekunde</string>
     <string name="attometer_per_square_second_short">am/s^2</string>
-    <string name="femtometer_per_square_second">Femtometer pro Quadratsekunde</string>
+    <string name="femtometer_per_square_second">Femtometer/Quadratsekunde</string>
     <string name="femtometer_per_square_second_short">fm/s^2</string>
-    <string name="picometer_per_square_second">Pikometer pro Quadratsekunde</string>
+    <string name="picometer_per_square_second">Pikometer/Quadratsekunde</string>
     <string name="picometer_per_square_second_short">pm/s^2</string>
-    <string name="nanometer_per_square_second">Nanometer pro Quadratsekunde</string>
+    <string name="nanometer_per_square_second">Nanometer/Quadratsekunde</string>
     <string name="nanometer_per_square_second_short">mm/s^2</string>
-    <string name="micrometer_per_square_second">Mikrometer pro Quadratsekunde</string>
+    <string name="micrometer_per_square_second">Mikrometer/Quadratsekunde</string>
     <string name="micrometer_per_square_second_short">µm/s^2</string>
     <string name="millimeter_per_square_second">Millimeter pro Quadratsekunde</string>
     <string name="millimeter_per_square_second_short">mm/s^2</string>
@@ -433,13 +433,13 @@
     <string name="centimeter_per_square_second_short">cm/s^2</string>
     <string name="decimeter_per_square_second">Dezimeter pro Quadratsekunde</string>
     <string name="decimeter_per_square_second_short">dm/s^2</string>
-    <string name="meter_per_square_second">Meter pro Quadratsekunde</string>
+    <string name="meter_per_square_second">Meter/Quadratsekunde</string>
     <string name="meter_per_square_second_short">m/s^2</string>
-    <string name="kilometer_per_square_second">Kilometer pro Quadratsekunde</string>
+    <string name="kilometer_per_square_second">Kilometer/Quadratsekunde</string>
     <string name="kilometer_per_square_second_short">km/s^2</string>
-    <string name="dekameter_per_square_second">Dekameter pro Quadratsekunde</string>
+    <string name="dekameter_per_square_second">Dekameter/Quadratsekunde</string>
     <string name="dekameter_per_square_second_short">dam/s^2</string>
-    <string name="hectometer_per_square_second">Hektometer pro Quadratsekunde</string>
+    <string name="hectometer_per_square_second">Hektometer/Quadratsekunde</string>
     <string name="hectometer_per_square_second_short">hm/s^2</string>
     <string name="gal">Gal</string>
     <string name="gal_short">Gal</string>
@@ -476,7 +476,7 @@
     <string name="currency_bbd">Barbados-Dollar</string>
     <string name="currency_bdt">Bagladeshe Taka</string>
     <string name="currency_bgn">Bulgarische Lev</string>
-    <string name="currency_bhd">Bahrain-Dinar </string>
+    <string name="currency_bhd">Bahrain-Dinar</string>
     <string name="currency_bif">Burundi-Franc</string>
     <string name="currency_bmd">Bermuda-Dollar</string>
     <string name="currency_bnd">Brunei-Dollar</string>
@@ -611,7 +611,7 @@
     <string name="currency_tzs">Tansania-Schilling</string>
     <string name="currency_uah">ukrainische Hrywnja</string>
     <string name="currency_ugx">Uganda-Schilling</string>
-    <string name="currency_uni">Uganda-Schilling</string>
+    <string name="currency_uni">Universe</string>
     <string name="currency_usd">US-Dollar</string>
     <string name="currency_usdc">USD Coin</string>
     <string name="currency_uyu">Uruguayischer Peso</string>
@@ -641,7 +641,7 @@
     <string name="temperature">Temperatur</string>
     <string name="speed">Geschwindigkeit</string>
     <string name="mass">Masse</string>
-    <string name="data">Daten </string>
+    <string name="data">Daten</string>
     <string name="energy">Energie</string>
     <string name="power">Leistung</string>
     <string name="angle">Winkel</string>
@@ -663,12 +663,12 @@
     <!-- Fuzzy -->
     <string name="exponential_notation_setting">Exponentielle Notation</string>
     <string name="unit_groups_setting">Einheitengruppen</string>
-    <string name="currency_rates_note_setting">Falsche Wechselkurse</string>
-    <string name="currency_rates_note_title">Hinweis </string>
-    <string name="currency_rates_note_text">Wechselkurs werden tägliche upgedatet. Es gibt keine Echtzeit Umrechnung in der App </string>
+    <string name="currency_rates_note_setting">Falsche Wechselkurse?</string>
+    <string name="currency_rates_note_title">Hinweis</string>
+    <string name="currency_rates_note_text">Wechselkurs werden tägliche upgedatet. Es gibt keine Echtzeit Umrechnung in der App</string>
     <string name="terms_and_conditions">Nutzungsbedingungen</string>
-    <string name="privacy_policy">Datenschutz-Bestimmungen </string>
-    <string name="third_party_licenses">Richtlinien von Drittanbietern </string>
+    <string name="privacy_policy">Datenschutz-Bestimmungen</string>
+    <string name="third_party_licenses">Richtlinien von Drittanbietern</string>
     <string name="rate_this_app">Diese App bewerten</string>
     <string name="formatting_setting">Formatierung</string>
     <string name="additional_settings_group">Zusätzliches</string>
@@ -1025,11 +1025,11 @@
     <string name="cubic_foot_per_minute_short">ft3/m</string>
     <string name="cubic_foot_per_second">Kubikfuß/Sekunde</string>
     <string name="cubic_foot_per_second_short">ft3/s</string>
-    <string name="gallon_per_hour_us">Gallone/Stunde (U.S.)</string>
+    <string name="gallon_per_hour_us">Gallone/Stunde (US)</string>
     <string name="gallon_per_hour_us_short">gal/h</string>
-    <string name="gallon_per_minute_us">Gallone/Minute(U.S.)</string>
+    <string name="gallon_per_minute_us">Gallone/Minute(US)</string>
     <string name="gallon_per_minute_us_short">gal/m</string>
-    <string name="gallon_per_second_us">Gallone/Sekunde(U.S.)</string>
+    <string name="gallon_per_second_us">Gallone/Sekunde (US)</string>
     <string name="gallon_per_second_us_short">gal/s</string>
     <string name="gallon_per_hour_imperial">Gallone/Stunde (Imperial)</string>
     <string name="gallon_per_hour_imperial_short">gal/h</string>
@@ -1139,4 +1139,5 @@ Maybe this can be labeled better? Let me know. It should be something that can d
 
 Used in this dialog window. Should be short -->
     <string name="next_label">Weiter</string>
+    <string name="formatting_setting_preview_box_label">Vorschau (klicken zum Wechseln)</string>
 </resources>
\ No newline at end of file
diff --git a/core/base/src/main/res/values-en-rGB/strings.xml b/core/base/src/main/res/values-en-rGB/strings.xml
index 2f7c8206..1e457cf9 100644
--- a/core/base/src/main/res/values-en-rGB/strings.xml
+++ b/core/base/src/main/res/values-en-rGB/strings.xml
@@ -99,47 +99,47 @@
     <string name="kelvin">Kelvin</string>
 
     <!-- Speed -->
-    <string name="millimeter_per_hour">Millimetre per hour</string>
+    <string name="millimeter_per_hour">Millimetre/hour</string>
     <string name="millimeter_per_hour_short">mm/h</string>
-    <string name="millimeter_per_minute">Millimetre per minute</string>
+    <string name="millimeter_per_minute">Millimetre/minute</string>
     <string name="millimeter_per_minute_short">mm/m</string>
-    <string name="millimeter_per_second">Millimetre per second</string>
+    <string name="millimeter_per_second">Millimetre/second</string>
     <string name="millimeter_per_second_short">mm/s</string>
-    <string name="centimeter_per_hour">Centimetre per hour</string>
+    <string name="centimeter_per_hour">Centimetre/hour</string>
     <string name="centimeter_per_hour_short">cm/h</string>
-    <string name="centimeter_per_minute">Centimetre per minute</string>
+    <string name="centimeter_per_minute">Centimetre/minute</string>
     <string name="centimeter_per_minute_short">cm/m</string>
-    <string name="centimeter_per_second">Centimetre per second</string>
+    <string name="centimeter_per_second">Centimetre/second</string>
     <string name="centimeter_per_second_short">cm/s</string>
-    <string name="meter_per_hour">Metre per hour</string>
+    <string name="meter_per_hour">Metre/hour</string>
     <string name="meter_per_hour_short">m/h</string>
-    <string name="meter_per_minute">Metre per minute</string>
+    <string name="meter_per_minute">Metre/minute</string>
     <string name="meter_per_minute_short">m/m</string>
-    <string name="meter_per_second">Metre per second</string>
+    <string name="meter_per_second">Metre/second</string>
     <string name="meter_per_second_short">m/s</string>
-    <string name="kilometer_per_hour">Kilometre per hour</string>
+    <string name="kilometer_per_hour">Kilometre/hour</string>
     <string name="kilometer_per_hour_short">km/h</string>
-    <string name="kilometer_per_minute">Kilometre per minute</string>
+    <string name="kilometer_per_minute">Kilometre/minute</string>
     <string name="kilometer_per_minute_short">km/m</string>
-    <string name="kilometer_per_second">Kilometre per second</string>
+    <string name="kilometer_per_second">Kilometre/second</string>
     <string name="kilometer_per_second_short">km/s</string>
-    <string name="foot_per_hour">Foot per hour</string>
+    <string name="foot_per_hour">Foot/hour</string>
     <string name="foot_per_hour_short">ft/h</string>
-    <string name="foot_per_minute">Foot per minute</string>
+    <string name="foot_per_minute">Foot/minute</string>
     <string name="foot_per_minute_short">ft/m</string>
-    <string name="foot_per_second">Foot per second</string>
+    <string name="foot_per_second">Foot/second</string>
     <string name="foot_per_second_short">ft/s</string>
-    <string name="yard_per_hour">Yard per hour</string>
+    <string name="yard_per_hour">Yard/hour</string>
     <string name="yard_per_hour_short">yd/h</string>
-    <string name="yard_per_minute">Yard per minute</string>
+    <string name="yard_per_minute">Yard/minute</string>
     <string name="yard_per_minute_short">yd/m</string>
-    <string name="yard_per_second">Yard per second</string>
+    <string name="yard_per_second">Yard/second</string>
     <string name="yard_per_second_short">yd/s</string>
-    <string name="mile_per_hour">Mile per hour</string>
+    <string name="mile_per_hour">Mile/hour</string>
     <string name="mile_per_hour_short">mi/h</string>
-    <string name="mile_per_minute">Mile per minute</string>
+    <string name="mile_per_minute">Mile/minute</string>
     <string name="mile_per_minute_short">mi/m</string>
-    <string name="mile_per_second">Mile per second</string>
+    <string name="mile_per_second">Mile/second</string>
     <string name="mile_per_second_short">mi/s</string>
     <string name="knot">Knot</string>
     <string name="knot_short">kt</string>
@@ -190,41 +190,41 @@
     <string name="exabyte_short">EB</string>
 
     <!-- Data transfer -->
-    <string name="bit_per_second">Bit per second</string>
+    <string name="bit_per_second">Bit/second</string>
     <string name="bit_per_second_short">b/s</string>
-    <string name="kibibit_per_second">Kibibit per second</string>
+    <string name="kibibit_per_second">Kibibit/second</string>
     <string name="kibibit_per_second_short">Kib/s</string>
     <string name="kilobit_per_second">Kilobit per second</string>
     <string name="kilobit_per_second_short">Kb/s</string>
-    <string name="megabit_per_second">Megabit per second</string>
+    <string name="megabit_per_second">Megabit/second</string>
     <string name="megabit_per_second_short">Mb/s</string>
-    <string name="mebibit_per_second">Mebibit per second</string>
+    <string name="mebibit_per_second">Mebibit/second</string>
     <string name="mebibit_per_second_short">Mib/s</string>
-    <string name="gigabit_per_second">Gigabit per second</string>
+    <string name="gigabit_per_second">Gigabit/second</string>
     <string name="gigabit_per_second_short">Gb/s</string>
-    <string name="terabit_per_second">Terabit per second</string>
+    <string name="terabit_per_second">Terabit/second</string>
     <string name="terabit_per_second_short">Tb/s</string>
-    <string name="petabit_per_second">Petabit per second</string>
+    <string name="petabit_per_second">Petabit/second</string>
     <string name="petabit_per_second_short">Pb/s</string>
-    <string name="exabit_per_second">Exabit per second</string>
+    <string name="exabit_per_second">Exabit/second</string>
     <string name="exabit_per_second_short">Eb/s</string>
-    <string name="byte_per_second">Byte per second</string>
+    <string name="byte_per_second">Byte/second</string>
     <string name="byte_per_second_short">B/s</string>
-    <string name="kibibyte_per_second">Kibibyte per second</string>
+    <string name="kibibyte_per_second">Kibibyte/second</string>
     <string name="kibibyte_per_second_short">KiB/s</string>
-    <string name="kilobyte_per_second">Kilobyte per second</string>
+    <string name="kilobyte_per_second">Kilobyte/second</string>
     <string name="kilobyte_per_second_short">KB/s</string>
-    <string name="megabyte_per_second">Megabyte per second</string>
+    <string name="megabyte_per_second">Megabyte/second</string>
     <string name="megabyte_per_second_short">MB/s</string>
-    <string name="mebibyte_per_second">Mebibyte per second</string>
+    <string name="mebibyte_per_second">Mebibyte/second</string>
     <string name="mebibyte_per_second_short">MiB/s</string>
-    <string name="gigabyte_per_second">Gigabyte per second</string>
+    <string name="gigabyte_per_second">Gigabyte/second</string>
     <string name="gigabyte_per_second_short">GB/s</string>
-    <string name="terabyte_per_second">Terabyte per second</string>
+    <string name="terabyte_per_second">Terabyte/second</string>
     <string name="terabyte_per_second_short">TB/s</string>
-    <string name="petabyte_per_second">Petabyte per second</string>
+    <string name="petabyte_per_second">Petabyte/second</string>
     <string name="petabyte_per_second_short">PB/s</string>
-    <string name="exabyte_per_second">Exabyte per second</string>
+    <string name="exabyte_per_second">Exabyte/second</string>
     <string name="exabyte_per_second_short">EB/s</string>
 
     <!-- Volume -->
@@ -400,7 +400,7 @@
     <string name="megapascal">Megapascal</string>
     <string name="megapascal_short">MPa</string>
     <string name="gigapascal">Gigapascal</string>
-    <string name="gigapascal_short">GPA</string>
+    <string name="gigapascal_short">GPa</string>
     <string name="terapascal">Terapascal</string>
     <string name="terapascal_short">TPa</string>
     <string name="petapascal">Petapascal</string>
@@ -417,15 +417,15 @@
     <string name="millimeter_of_mercury_short">mm Hg</string>
 
     <!-- Acceleration -->
-    <string name="attometer_per_square_second">Attometre per square second</string>
+    <string name="attometer_per_square_second">Attometre/square second</string>
     <string name="attometer_per_square_second_short">am/s^2</string>
-    <string name="femtometer_per_square_second">Femtometre per square second</string>
+    <string name="femtometer_per_square_second">Femtometre/square second</string>
     <string name="femtometer_per_square_second_short">fm/s^2</string>
-    <string name="picometer_per_square_second">Picometre per square second</string>
+    <string name="picometer_per_square_second">Picometre/square second</string>
     <string name="picometer_per_square_second_short">pm/s^2</string>
-    <string name="nanometer_per_square_second">Nanometre per square second</string>
+    <string name="nanometer_per_square_second">Nanometre/square second</string>
     <string name="nanometer_per_square_second_short">nm/s^2</string>
-    <string name="micrometer_per_square_second">Micrometre per square second</string>
+    <string name="micrometer_per_square_second">Micrometre/square second</string>
     <string name="micrometer_per_square_second_short">µm/s^2</string>
     <string name="millimeter_per_square_second">Millimetre per square second</string>
     <string name="millimeter_per_square_second_short">mm/s^2</string>
@@ -433,13 +433,13 @@
     <string name="centimeter_per_square_second_short">cm/s^2</string>
     <string name="decimeter_per_square_second">Decimetre per square second</string>
     <string name="decimeter_per_square_second_short">dm/s^2</string>
-    <string name="meter_per_square_second">Metre per square second</string>
+    <string name="meter_per_square_second">Metre/square second</string>
     <string name="meter_per_square_second_short">m/s^2</string>
-    <string name="kilometer_per_square_second">Kilometre per square second</string>
+    <string name="kilometer_per_square_second">Kilometre/square second</string>
     <string name="kilometer_per_square_second_short">km/s^2</string>
-    <string name="dekameter_per_square_second">Dekametre per square second</string>
+    <string name="dekameter_per_square_second">Dekametre/square second</string>
     <string name="dekameter_per_square_second_short">dam/s^2</string>
-    <string name="hectometer_per_square_second">Hectometre per square second</string>
+    <string name="hectometer_per_square_second">Hectometre/square second</string>
     <string name="hectometer_per_square_second_short">hm/s^2</string>
     <string name="gal">Gal</string>
     <string name="gal_short">Gal</string>
@@ -991,11 +991,11 @@
     <string name="cubic_foot_per_minute_short">ft3/m</string>
     <string name="cubic_foot_per_second">Cubic Foot/second</string>
     <string name="cubic_foot_per_second_short">ft3/s</string>
-    <string name="gallon_per_hour_us">Gallon/hour (U.S.)</string>
+    <string name="gallon_per_hour_us">Gallon/hour (US)</string>
     <string name="gallon_per_hour_us_short">gal/h</string>
-    <string name="gallon_per_minute_us">Gallon/minute (U.S.)</string>
+    <string name="gallon_per_minute_us">Gallon/minute (US)</string>
     <string name="gallon_per_minute_us_short">gal/m</string>
-    <string name="gallon_per_second_us">Gallon/second (U.S.)</string>
+    <string name="gallon_per_second_us">Gallon/second (US)</string>
     <string name="gallon_per_second_us_short">gal/s</string>
     <string name="gallon_per_hour_imperial">Gallon/hour (Imperial)</string>
     <string name="gallon_per_hour_imperial_short">gal/h</string>
diff --git a/core/base/src/main/res/values-es/strings.xml b/core/base/src/main/res/values-es/strings.xml
new file mode 100644
index 00000000..b267302b
--- /dev/null
+++ b/core/base/src/main/res/values-es/strings.xml
@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Length -->
+    <string name="attometer">Attómetro</string>
+    <string name="attometer_short">am</string>
+    <string name="nanometer">Nanómetro</string>
+    <string name="nanometer_short">nm</string>
+    <string name="micrometer">Micrómetro</string>
+    <string name="micrometer_short">µm</string>
+    <string name="millimeter">Milímetro</string>
+    <string name="millimeter_short">mm</string>
+    <string name="centimeter">Centímetro</string>
+    <string name="centimeter_short">cm</string>
+    <string name="decimeter">Decímetro</string>
+    <string name="decimeter_short">dm</string>
+    <string name="meter">Metro</string>
+    <string name="meter_short">m</string>
+    <string name="kilometer">Kilómetro</string>
+    <string name="kilometer_short">km</string>
+    <string name="mile">Milla</string>
+    <string name="mile_short">mi</string>
+    <string name="yard">Yarda</string>
+    <string name="yard_short">yd</string>
+    <string name="foot">Pies</string>
+    <string name="foot_short">ft</string>
+    <string name="inch">Pulgada</string>
+    <string name="inch_short">in</string>
+    <string name="light_year">Años luz</string>
+    <string name="light_year_short">ly</string>
+    <string name="parsec">Pársec</string>
+    <string name="parsec_short">pc</string>
+    <string name="kiloparsec">Kilopársec</string>
+    <string name="kiloparsec_short">kpc</string>
+    <string name="megaparsec">Megapársec</string>
+    <string name="megaparsec_short">Mpc</string>
+    <string name="mercury_equatorial_radius">Radio ecuatorial de Mercurio</string>
+    <string name="mercury_equatorial_radius_short">Mercury R</string>
+    <string name="venus_equatorial_radius">Radio ecuatorial de Venus</string>
+    <string name="venus_equatorial_radius_short">Venus R</string>
+    <string name="earth_equatorial_radius">Radio ecuatorial terrestre</string>
+    <string name="earth_equatorial_radius_short">Earth R</string>
+    <string name="mars_equatorial_radius">Radio ecuatorial de Marte</string>
+    <string name="mars_equatorial_radius_short">Mars R</string>
+    <string name="jupiter_equatorial_radius">Radio ecuatorial de Júpiter</string>
+    <string name="jupiter_equatorial_radius_short">Jupiter R</string>
+    <string name="saturn_equatorial_radius">Radio ecuatorial de Saturno</string>
+    <string name="saturn_equatorial_radius_short">Saturn R</string>
+    <string name="uranus_equatorial_radius">Radio ecuatorial de Urano</string>
+    <string name="uranus_equatorial_radius_short">Uranus R</string>
+    <string name="neptune_equatorial_radius">Radio ecuatorial de Neptuno</string>
+    <string name="neptune_equatorial_radius_short">Neptune R</string>
+    <string name="sun_equatorial_radius">Radio ecuatorial del sol</string>
+    <string name="sun_equatorial_radius_short">Sun R</string>
+
+    <!-- Mass -->
+    <string name="electron_mass_rest">Masa de electrones</string>
+    <string name="electron_mass_rest_short">me</string>
+    <string name="atomic_mass_unit">Dalton</string>
+    <string name="atomic_mass_unit_short">u</string>
+    <string name="milligram">Miligramo</string>
+    <string name="milligram_short">mg</string>
+    <string name="gram">Gramo</string>
+    <string name="gram_short">g</string>
+    <string name="kilogram">Kilogramo</string>
+    <string name="kilogram_short">kg</string>
+    <string name="metric_ton">Tonelada</string>
+    <string name="metric_ton_short">t</string>
+    <string name="imperial_ton">Tonelada imperial</string>
+    <string name="pound">Libra</string>
+    <string name="pound_short">lbs</string>
+    <string name="ounce">Onza</string>
+    <string name="ounce_short">oz</string>
+    <string name="carat">Quilate</string>
+    <string name="carat_short">ct</string>
+    <string name="mercury_mass">Masa de mercurio</string>
+    <string name="mercury_mass_short">M Mercurio</string>
+    <string name="venus_mass">Masa de venus</string>
+    <string name="venus_mass_short">M Venus</string>
+    <string name="earth_mass">Masa terrestre</string>
+    <string name="earth_mass_short">M Tierra</string>
+    <string name="mars_mass">Masa de venus</string>
+    <string name="mars_mass_short">M Marte</string>
+    <string name="jupiter_mass">Masa de Júpiter</string>
+    <string name="jupiter_mass_short">M Júpiter</string>
+    <string name="saturn_mass">Masa de Saturno</string>
+    <string name="saturn_mass_short">M Saturno</string>
+    <string name="uranus_mass">Masa de Urano</string>
+    <string name="uranus_mass_short">M Urano</string>
+    <string name="neptune_mass">Masa de Neptuno</string>
+    <string name="neptune_mass_short">M Neptuno</string>
+    <string name="sun_mass">Masa solar</string>
+    <string name="sun_mass_short">M Solar</string>
+
+    <!-- Temperature -->
+    <string name="celsius">Celsius</string>
+    <string name="fahrenheit">Fahrenheit</string>
+    <string name="kelvin">Kelvin</string>
+
+    <!-- Speed -->
+    <string name="millimeter_per_hour">Milímetro/hora</string>
+    <string name="millimeter_per_hour_short">mm/h</string>
+    <string name="millimeter_per_minute">Milímetro/minuto</string>
+    <string name="millimeter_per_minute_short">mm/m</string>
+    <string name="millimeter_per_second">Milímetro/segundo</string>
+    <string name="millimeter_per_second_short">mm/s</string>
+    <string name="centimeter_per_hour">Centímetro/hora</string>
+    <string name="centimeter_per_hour_short">cm/h</string>
+    <string name="centimeter_per_minute">Centímetro/minuto</string>
+    <string name="centimeter_per_minute_short">cm/m</string>
+    <string name="centimeter_per_second">Centímetro/segundo</string>
+    <string name="centimeter_per_second_short">cm/s</string>
+    <string name="meter_per_hour">Metro/hora</string>
+    <string name="meter_per_hour_short">m/h</string>
+    <string name="meter_per_minute">Metro/minuto</string>
+    <string name="meter_per_minute_short">m/m</string>
+    <string name="meter_per_second">Metro/segundo</string>
+    <string name="meter_per_second_short">m/s</string>
+    <string name="kilometer_per_hour">Kilómetro/hora</string>
+    <string name="kilometer_per_hour_short">km/h</string>
+    <string name="kilometer_per_minute">Kilómetro/minuto</string>
+    <string name="kilometer_per_minute_short">km/m</string>
+    <string name="kilometer_per_second">Kilómetro/segundo</string>
+    <string name="kilometer_per_second_short">km/s</string>
+    <string name="foot_per_hour">Pie/hora</string>
+    <string name="foot_per_hour_short">ft/h</string>
+    <string name="foot_per_minute">Pie/minuto</string>
+    <string name="foot_per_minute_short">ft/m</string>
+    <string name="foot_per_second">Pie/segundo</string>
+    <string name="foot_per_second_short">ft/s</string>
+    <string name="yard_per_hour">Yarda/hora</string>
+    <string name="yard_per_hour_short">yd/h</string>
+    <string name="yard_per_minute">Yarda/minuto</string>
+    <string name="yard_per_minute_short">yd/m</string>
+    <string name="yard_per_second">Yarda/segundo</string>
+    <string name="yard_per_second_short">yd/s</string>
+    <string name="mile_per_hour">Milla/hora</string>
+    <string name="mile_per_hour_short">mi/h</string>
+    <string name="mile_per_minute">Milla/minuto</string>
+    <string name="mile_per_minute_short">mi/m</string>
+    <string name="mile_per_second">Milla/segundo</string>
+    <string name="mile_per_second_short">mi/s</string>
+    <string name="knot">Nudo</string>
+    <string name="knot_short">kt</string>
+    <string name="velocity_of_light_in_vacuum">Velocidad de la luz en el vacío</string>
+    <string name="cosmic_velocity_first">Primera Velocidad Cósmica</string>
+    <string name="cosmic_velocity_second">Segunda Velocidad Cósmica</string>
+    <string name="cosmic_velocity_third">Tercera Velocidad Cósmica</string>
+    <string name="earths_orbital_speed">Velocidad orbital de la Tierra</string>
+    <string name="mach">Mach</string>
+    <string name="mach_si_standard">Mach (SI)</string>
+
+    <!-- File size -->
+    <string name="bit">Bit</string>
+    <string name="bit_short">b</string>
+    <string name="kibibit">Kibibit</string>
+    <string name="kibibit_short">Kib</string>
+    <string name="kilobit">Kilobit</string>
+    <string name="kilobit_short">Kb</string>
+    <string name="megabit">Megabit</string>
+    <string name="megabit_short">Mb</string>
+    <string name="mebibit">Mebibit</string>
+    <string name="mebibit_short">Mib</string>
+    <string name="gigabit">Gigabit</string>
+    <string name="gigabit_short">Gb</string>
+    <string name="terabit">Terabit</string>
+    <string name="terabit_short">Tb</string>
+    <string name="petabit">Petabit</string>
+    <string name="petabit_short">Pb</string>
+    <string name="exabit">Exabit</string>
+    <string name="exabit_short">Eb</string>
+    <string name="byte_">Byte</string>
+    <string name="byte_short">B</string>
+    <string name="kibibyte">Kibibyte</string>
+    <string name="kibibyte_short">KiB</string>
+    <string name="kilobyte">Kilobyte</string>
+    <string name="kilobyte_short">KB</string>
+    <string name="megabyte">Megabyte</string>
+    <string name="megabyte_short">MB</string>
+    <string name="mebibyte">Mebibyte</string>
+    <string name="mebibyte_short">MiB</string>
+    <string name="gigabyte">Gigabyte</string>
+    <string name="gigabyte_short">GB</string>
+    <string name="terabyte">Terabyte</string>
+    <string name="terabyte_short">TB</string>
+    <string name="petabyte">Petabyte</string>
+    <string name="petabyte_short">PB</string>
+    <string name="exabyte">Exabyte</string>
+    <string name="exabyte_short">EB</string>
+
+    <!-- Data transfer -->
+    <string name="bit_per_second">Bit/segundo</string>
+    <string name="bit_per_second_short">b/s</string>
+    <string name="kibibit_per_second">Kibibit/segundo</string>
+    <string name="kibibit_per_second_short">Kib/s</string>
+    <string name="kilobit_per_second">Kilobit/segundo</string>
+    <string name="kilobit_per_second_short">Kb/s</string>
+    <string name="megabit_per_second">Megabit/segundo</string>
+    <string name="megabit_per_second_short">Mb/s</string>
+    <string name="mebibit_per_second">Mebibit/segundo</string>
+    <string name="mebibit_per_second_short">Mib/s</string>
+    <string name="gigabit_per_second">Gigabit/segundo</string>
+    <string name="gigabit_per_second_short">Gb/s</string>
+    <string name="terabit_per_second">Terabit/segundo</string>
+    <string name="terabit_per_second_short">Tb/s</string>
+    <string name="petabit_per_second">Petabit/segundo</string>
+    <string name="petabit_per_second_short">Pb/s</string>
+    <string name="exabit_per_second">Exabit/segundo</string>
+    <string name="exabit_per_second_short">Eb/s</string>
+    <string name="byte_per_second">Byte/segundo</string>
+    <string name="byte_per_second_short">B/s</string>
+    <string name="kibibyte_per_second">Kibibyte/segundo</string>
+    <string name="kibibyte_per_second_short">KiB/s</string>
+    <string name="kilobyte_per_second">Kilobyte/segundo</string>
+    <string name="kilobyte_per_second_short">KB/s</string>
+    <string name="megabyte_per_second">Megabyte/segundo</string>
+    <string name="megabyte_per_second_short">MB/s</string>
+    <string name="mebibyte_per_second">Mebibyte/segundo</string>
+    <string name="mebibyte_per_second_short">MiB/s</string>
+    <string name="gigabyte_per_second">Gigabyte/segundo</string>
+    <string name="gigabyte_per_second_short">GB/s</string>
+    <string name="terabyte_per_second">Terabyte/segundo</string>
+    <string name="terabyte_per_second_short">TB/s</string>
+    <string name="petabyte_per_second">Petabyte/segundo</string>
+    <string name="petabyte_per_second_short">PB/s</string>
+    <string name="exabyte_per_second">Exabyte/segundo</string>
+    <string name="exabyte_per_second_short">EB/s</string>
+
+    <!-- Volume -->
+    <string name="attoliter">Attolitro</string>
+    <string name="attoliter_short">aL</string>
+    <string name="milliliter">Mililitro</string>
+    <string name="milliliter_short">mL</string>
+    <string name="liter">Litro</string>
+    <string name="liter_short">L</string>
+    <string name="us_liquid_gallon">Galón Líquido US</string>
+    <string name="us_liquid_gallon_short">gal (US)</string>
+    <string name="us_liquid_quart">Cuarto Líquido US</string>
+    <string name="us_liquid_quart_short">qt (US)</string>
+    <string name="us_liquid_pint">Pinta Líquida US</string>
+    <string name="us_liquid_pint_short">pt (US)</string>
+    <string name="us_legal_cup">Copa Legal US</string>
+    <string name="us_legal_cup_short">cup (US)</string>
+    <string name="us_fluid_ounce">Onza de Fluido US</string>
+
+    <!-- Time -->
+    <string name="attosecond">Attosegundo</string>
+    <string name="attosecond_short">as</string>
+    <string name="nanosecond">Nanosegundo</string>
+    <string name="nanosecond_short">ns</string>
+    <string name="microsecond">Microsegundo</string>
+    <string name="microsecond_short">µs</string>
+    <string name="millisecond">Milisegundo</string>
+    <string name="millisecond_short">ms</string>
+    <string name="jiffy">Jiffy</string>
+    <string name="jiffy_short">j</string>
+    <string name="second">Segundo</string>
+    <string name="second_short">s</string>
+    <string name="minute">Minuto</string>
+    <string name="minute_short">m</string>
+    <string name="hour">Hora</string>
+    <string name="hour_short">h</string>
+    <string name="day">Día</string>
+    <string name="day_short">d</string>
+    <string name="week">Semana</string>
+    <string name="week_short">w</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/Gj9ZCNPXIfKddDQgccvboVFz.jpg 
+https://s3.eu-west-1.amazonaws.com/po-pub/i/prtM85P6x1fMuLg1I0zbkceo.png 
+
+Maybe this can be labeled better? Let me know. It should be something that can describe content of the Formatting screen. -->
+    <string name="formatting_setting_support">Precisión y apariencia de números</string>
+    <string name="divide_by_zero_error">No se puede dividir por 0</string>
+    <string name="date_difference">Diferencia de fechas</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/uWOHJmIq9riqsq7PO82ZQp3a.png -->
+    <string name="select_time">Elegir hora</string>
+    <string name="date_difference_start">Inicio</string>
+    <string name="date_difference_end">Fin</string>
+    <string name="date_difference_result">Diferencia</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
+    <string name="date_difference_years">Años</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
+    <string name="date_difference_months">Meses</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
+    <string name="date_difference_days">Días</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
+    <string name="date_difference_hours">Horas</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
+    <string name="date_difference_minutes">Minutos</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/9lSfdkfKShwyQFEF4nvbVaIb.jpg 
+
+Used in this dialog window. Should be short -->
+    <string name="next_label">Siguiente</string>
+</resources>
\ No newline at end of file
diff --git a/core/base/src/main/res/values-fr/strings.xml b/core/base/src/main/res/values-fr/strings.xml
index c7009573..3f38570a 100644
--- a/core/base/src/main/res/values-fr/strings.xml
+++ b/core/base/src/main/res/values-fr/strings.xml
@@ -99,47 +99,47 @@
     <string name="kelvin">Kelvin</string>
 
     <!-- Speed -->
-    <string name="millimeter_per_hour">Millimètre par heure</string>
+    <string name="millimeter_per_hour">Millimètre/heure</string>
     <string name="millimeter_per_hour_short">mm/h</string>
-    <string name="millimeter_per_minute">Millimètre par minute</string>
+    <string name="millimeter_per_minute">Millimètre/minute</string>
     <string name="millimeter_per_minute_short">mm/m</string>
-    <string name="millimeter_per_second">Millimètre par seconde</string>
+    <string name="millimeter_per_second">Millimètre/seconde</string>
     <string name="millimeter_per_second_short">mm/s</string>
-    <string name="centimeter_per_hour">Centimètre par heure</string>
+    <string name="centimeter_per_hour">Centimètre/heure</string>
     <string name="centimeter_per_hour_short">cm/h</string>
-    <string name="centimeter_per_minute">Centimètre par minute</string>
+    <string name="centimeter_per_minute">Centimètre/minute</string>
     <string name="centimeter_per_minute_short">cm/m</string>
-    <string name="centimeter_per_second">Centimètre par seconde</string>
+    <string name="centimeter_per_second">Centimètre/seconde</string>
     <string name="centimeter_per_second_short">cm/s</string>
-    <string name="meter_per_hour">Mètre par heure</string>
+    <string name="meter_per_hour">Mètre/heure</string>
     <string name="meter_per_hour_short">m/h</string>
-    <string name="meter_per_minute">Mètre par minute</string>
+    <string name="meter_per_minute">Mètre/minute</string>
     <string name="meter_per_minute_short">m/m</string>
-    <string name="meter_per_second">Mètre par seconde</string>
+    <string name="meter_per_second">Mètre/seconde</string>
     <string name="meter_per_second_short">m/s</string>
-    <string name="kilometer_per_hour">Kilomètre par heure</string>
+    <string name="kilometer_per_hour">Kilomètre/heure</string>
     <string name="kilometer_per_hour_short">km/h</string>
-    <string name="kilometer_per_minute">Kilomètre par minute</string>
+    <string name="kilometer_per_minute">Kilomètre/minute</string>
     <string name="kilometer_per_minute_short">km/m</string>
-    <string name="kilometer_per_second">Kilomètre par seconde</string>
+    <string name="kilometer_per_second">Kilomètre/seconde</string>
     <string name="kilometer_per_second_short">km/s</string>
-    <string name="foot_per_hour">Pied par heure</string>
+    <string name="foot_per_hour">Pied/heure</string>
     <string name="foot_per_hour_short">ft/h</string>
-    <string name="foot_per_minute">Pied par minute</string>
+    <string name="foot_per_minute">Pied/minute</string>
     <string name="foot_per_minute_short">ft/m</string>
-    <string name="foot_per_second">Pied par seconde</string>
+    <string name="foot_per_second">Pied/seconde</string>
     <string name="foot_per_second_short">ft/s</string>
-    <string name="yard_per_hour">Yard par heure</string>
+    <string name="yard_per_hour">Yard/heure</string>
     <string name="yard_per_hour_short">yd/h</string>
-    <string name="yard_per_minute">Yard par minute</string>
+    <string name="yard_per_minute">Yard/minute</string>
     <string name="yard_per_minute_short">yd/m</string>
-    <string name="yard_per_second">Yard par seconde</string>
+    <string name="yard_per_second">Yard/seconde</string>
     <string name="yard_per_second_short">yd/s</string>
-    <string name="mile_per_hour">Mile par heure</string>
+    <string name="mile_per_hour">Mile/heure</string>
     <string name="mile_per_hour_short">mi/h</string>
-    <string name="mile_per_minute">Mile par minute</string>
+    <string name="mile_per_minute">Mile/minute</string>
     <string name="mile_per_minute_short">mi/m</string>
-    <string name="mile_per_second">Mile par seconde</string>
+    <string name="mile_per_second">Mile/seconde</string>
     <string name="mile_per_second_short">mi/s</string>
     <string name="knot">Nœud</string>
     <string name="knot_short">nd</string>
@@ -190,41 +190,41 @@
     <string name="exabyte_short">EB</string>
 
     <!-- Data transfer -->
-    <string name="bit_per_second">Bit per second</string>
+    <string name="bit_per_second">Bit/second</string>
     <string name="bit_per_second_short">b/s</string>
-    <string name="kibibit_per_second">Kibibit per second</string>
+    <string name="kibibit_per_second">Kibibit/second</string>
     <string name="kibibit_per_second_short">Kib/s</string>
-    <string name="kilobit_per_second">Kilobit per second</string>
+    <string name="kilobit_per_second">Kilobit/second</string>
     <string name="kilobit_per_second_short">Kb/s</string>
-    <string name="megabit_per_second">Megabit per second</string>
+    <string name="megabit_per_second">Megabit/second</string>
     <string name="megabit_per_second_short">Mb/s</string>
-    <string name="mebibit_per_second">Mebibit per second</string>
+    <string name="mebibit_per_second">Mebibit/second</string>
     <string name="mebibit_per_second_short">Mib/s</string>
-    <string name="gigabit_per_second">Gigabit per second</string>
+    <string name="gigabit_per_second">Gigabit/second</string>
     <string name="gigabit_per_second_short">Gb/s</string>
-    <string name="terabit_per_second">Térabit par seconde</string>
+    <string name="terabit_per_second">Térabit/seconde</string>
     <string name="terabit_per_second_short">Tb/s</string>
-    <string name="petabit_per_second">Pétabit par seconde</string>
+    <string name="petabit_per_second">Pétabit/seconde</string>
     <string name="petabit_per_second_short">Pb/s</string>
-    <string name="exabit_per_second">Exabit par seconde</string>
+    <string name="exabit_per_second">Exabit/seconde</string>
     <string name="exabit_per_second_short">Eb/s</string>
-    <string name="byte_per_second">Byte par seconde</string>
+    <string name="byte_per_second">Byte/seconde</string>
     <string name="byte_per_second_short">B/s</string>
-    <string name="kibibyte_per_second">Kibibyte par seconde</string>
+    <string name="kibibyte_per_second">Kibibyte/seconde</string>
     <string name="kibibyte_per_second_short">KiB/s</string>
-    <string name="kilobyte_per_second">Kilobyte par seconde</string>
+    <string name="kilobyte_per_second">Kilobyte/seconde</string>
     <string name="kilobyte_per_second_short">KB/s</string>
-    <string name="megabyte_per_second">Mégabyte par seconde</string>
+    <string name="megabyte_per_second">Mégabyte/seconde</string>
     <string name="megabyte_per_second_short">MB/s</string>
-    <string name="mebibyte_per_second">Mébibyte par seconde</string>
+    <string name="mebibyte_per_second">Mébibyte/seconde</string>
     <string name="mebibyte_per_second_short">MiB/s</string>
-    <string name="gigabyte_per_second">Gigabyte par seconde</string>
+    <string name="gigabyte_per_second">Gigabyte/seconde</string>
     <string name="gigabyte_per_second_short">GB/s</string>
-    <string name="terabyte_per_second">Térabyte par seconde</string>
+    <string name="terabyte_per_second">Térabyte/seconde</string>
     <string name="terabyte_per_second_short">TB/s</string>
-    <string name="petabyte_per_second">Petabyte par seconde</string>
+    <string name="petabyte_per_second">Petabyte/seconde</string>
     <string name="petabyte_per_second_short">PB/s</string>
-    <string name="exabyte_per_second">Exabyte par seconde</string>
+    <string name="exabyte_per_second">Exabyte/seconde</string>
     <string name="exabyte_per_second_short">EB/s</string>
 
     <!-- Volume -->
@@ -400,7 +400,7 @@
     <string name="megapascal">Mégapascal</string>
     <string name="megapascal_short">MPa</string>
     <string name="gigapascal">Gigapascal</string>
-    <string name="gigapascal_short">GPA</string>
+    <string name="gigapascal_short">GPa</string>
     <string name="terapascal">Térapascal</string>
     <string name="terapascal_short">TPa</string>
     <string name="petapascal">Pétapascal</string>
@@ -417,15 +417,15 @@
     <string name="millimeter_of_mercury_short">mm Hg</string>
 
     <!-- Acceleration -->
-    <string name="attometer_per_square_second">Attomètre par seconde carrée</string>
+    <string name="attometer_per_square_second">Attomètre/seconde carrée</string>
     <string name="attometer_per_square_second_short">am/s^2</string>
-    <string name="femtometer_per_square_second">Femtomètre par seconde carrée</string>
+    <string name="femtometer_per_square_second">Femtomètre/seconde carrée</string>
     <string name="femtometer_per_square_second_short">fm/s^2</string>
-    <string name="picometer_per_square_second">Picomètre par seconde carrée</string>
+    <string name="picometer_per_square_second">Picomètre/seconde carrée</string>
     <string name="picometer_per_square_second_short">pm/s^2</string>
-    <string name="nanometer_per_square_second">Nanomètre par seconde carrée</string>
+    <string name="nanometer_per_square_second">Nanomètre/seconde carrée</string>
     <string name="nanometer_per_square_second_short">nm/s^2</string>
-    <string name="micrometer_per_square_second">Micromètre par seconde carrée</string>
+    <string name="micrometer_per_square_second">Micromètre/seconde carrée</string>
     <string name="micrometer_per_square_second_short">µm/s^2</string>
     <string name="millimeter_per_square_second">Millimètre par seconde carrée</string>
     <string name="millimeter_per_square_second_short">mm/s^2</string>
@@ -433,13 +433,13 @@
     <string name="centimeter_per_square_second_short">cm/s^2</string>
     <string name="decimeter_per_square_second">Décimètre par seconde carrée</string>
     <string name="decimeter_per_square_second_short">dm/s^2</string>
-    <string name="meter_per_square_second">Mètre par seconde carrée</string>
+    <string name="meter_per_square_second">Mètre/seconde carrée</string>
     <string name="meter_per_square_second_short">m/s^2</string>
-    <string name="kilometer_per_square_second">Kilomètre par seconde carrée</string>
+    <string name="kilometer_per_square_second">Kilomètre/seconde carrée</string>
     <string name="kilometer_per_square_second_short">km/s^2</string>
-    <string name="dekameter_per_square_second">Décamètre par seconde carrée</string>
+    <string name="dekameter_per_square_second">Décamètre/seconde carrée</string>
     <string name="dekameter_per_square_second_short">dam/s^2</string>
-    <string name="hectometer_per_square_second">Hectomètre par seconde carrée</string>
+    <string name="hectometer_per_square_second">Hectomètre/seconde carrée</string>
     <string name="hectometer_per_square_second_short">hm/s^2</string>
     <string name="gal">Gal</string>
     <string name="gal_short">Gal</string>
@@ -663,6 +663,7 @@
     <!-- Fuzzy -->
     <string name="exponential_notation_setting">Notation exponentielle</string>
     <string name="unit_groups_setting">Groupes d\'unités</string>
+    <string name="currency_rates_note_setting">Taux de conversion faux ?</string>
     <string name="currency_rates_note_title">Note</string>
     <string name="currency_rates_note_text">Les taux de change sont mis à jour quotidiennement. L\'application ne permet pas de suivre le marché en temps réel.</string>
     <string name="terms_and_conditions">Termes et conditions</string>
@@ -684,9 +685,16 @@
 
     <!-- Fuzzy -->
     <string name="space">Espaces</string>
+
+    <!-- Output format -->
+    <string name="exponential_notation_setting_support">Remplacer une partie du nombre par E</string>
+
+    <!-- Theme -->
+    <string name="theme_setting_support">Look and Feel de l\'App</string>
     <string name="auto_label">Auto</string>
     <string name="force_light_mode">Clair</string>
     <string name="force_dark_mode">Sombre</string>
+    <string name="color_theme">Thème couleur</string>
     <string name="force_amoled_mode">AMOLED Noir</string>
     <string name="force_amoled_mode_support">Utiliser un fond noir pour les thèmes sombres</string>
     <string name="enable_dynamic_colors">Couleurs dynamiques</string>
@@ -695,6 +703,7 @@
     <!-- MISC. -->
     <string name="loading_label">Chargement…</string>
     <string name="error_label">Erreur</string>
+    <string name="copied">%1$s! copié</string>
     <string name="cancel_label">Annuler</string>
     <string name="search_bar_placeholder">Rechercher des unités</string>
     <string name="search_placeholder">Aucun résultat trouvé</string>
@@ -721,4 +730,378 @@
     <string name="about_unitto">À propos d\'Unitto</string>
     <string name="about_unitto_support">En savoir plus sur l\'application</string>
     <string name="unit_groups_support">Désactiver et réorganiser les unités</string>
+    <string name="cent">cent</string>
+    <string name="cent_short">cent</string>
+
+    <!-- Flux -->
+    <string name="maxwell">Maxwell</string>
+    <string name="maxwell_short">Mx</string>
+    <string name="weber">Weber</string>
+    <string name="weber_short">Wb</string>
+    <string name="milliweber">Milliweber</string>
+    <string name="milliweber_short">mWb</string>
+    <string name="microweber">Microweber</string>
+    <string name="microweber_short">μWb</string>
+    <string name="kiloweber">Kiloweber</string>
+    <string name="kiloweber_short">kWb</string>
+    <string name="megaweber">Megaweber</string>
+    <string name="megaweber_short">MWb</string>
+    <string name="gigaweber">Gigaweber</string>
+    <string name="gigaweber_short">GWb</string>
+    <string name="flux">Flux</string>
+    <string name="open_source">Voir le code source</string>
+    <string name="translate_app">Traduire cette app</string>
+    <string name="translate_app_support">Rejoignez le projet POEditor pour aider</string>
+
+    <!-- Number base -->
+    <string name="binary">Binaire</string>
+    <string name="binary_short">base2</string>
+    <string name="ternary">Ternaire</string>
+    <string name="ternary_short">base3</string>
+    <string name="quaternary">Quaternaire</string>
+    <string name="quaternary_short">base4</string>
+    <string name="quinary">Quinaire</string>
+    <string name="quinary_short">base5</string>
+    <string name="senary">Senaire</string>
+    <string name="senary_short">base6</string>
+    <string name="septenary">Septenaire</string>
+    <string name="septenary_short">base7</string>
+    <string name="octal">Octal</string>
+    <string name="octal_short">base8</string>
+    <string name="nonary">Nonaire</string>
+    <string name="nonary_short">base9</string>
+    <string name="decimal">Décimal</string>
+    <string name="decimal_short">base10</string>
+    <string name="undecimal">Non-décimal</string>
+    <string name="undecimal_short">base11</string>
+    <string name="duodecimal">Duodécimal</string>
+    <string name="duodecimal_short">base12</string>
+    <string name="tridecimal">Tridécimal</string>
+    <string name="tridecimal_short">base13</string>
+    <string name="tetradecimal">Tétradécimal</string>
+    <string name="tetradecimal_short">base14</string>
+    <string name="pentadecimal">Pentadécimal</string>
+    <string name="pentadecimal_short">base15</string>
+    <string name="hexadecimal">Hexadécimal</string>
+    <string name="hexadecimal_short">base16</string>
+    <string name="number_base">Base</string>
+    <string name="enable_vibrations">Vibrations</string>
+    <string name="enable_vibrations_support">Retour haptique lors du click sur les boutons du clavier</string>
+    <string name="millibar">Millibar</string>
+    <string name="millibar_short">mbar</string>
+    <string name="kilopascal">Kilopascal</string>
+
+    <!-- Fuzzy -->
+    <string name="kilopascal_short">kPa</string>
+    <string name="micron_of_mercury">Micron de mercure</string>
+    <string name="micron_of_mercury_short">μmHg</string>
+
+    <!-- Tools -->
+    <string name="epoch_converter">Convertisseur d\'Epoch</string>
+
+    <!-- Calculator -->
+    <string name="calculator">Calculatrice</string>
+
+    <!-- Epoch -->
+    <string name="year_short">y</string>
+    <string name="month_short">m</string>
+    <string name="nautical_mile">Mile nautique</string>
+    <string name="nautical_mile_short">M</string>
+    <string name="starting_screen_setting">Écran de départ</string>
+    <string name="starting_screen_setting_support">Choisissez quel écran est affiché lors du démarrage de l\'app</string>
+
+    <!-- Tools -->
+    <string name="unit_converter">Convertisseur d\'unités</string>
+    <string name="calculator_clear_history_label">Clear</string>
+    <string name="calculator_clear_history_title">Vider l\'historique</string>
+    <string name="calculator_clear_history_support">Toutes les expressions de l\'historique seront supprimées pour toujours. Cette action ne peux pas être annulée !</string>
+    <string name="calculator_no_history">Pas d\'historique</string>
+    <string name="open_menu_description">Ouvrir le menu</string>
+    <string name="microgram">Microgramme</string>
+    <string name="microgram_short">µg</string>
+
+    <!-- ELECTROSTATIC CAPACITANCE -->
+    <string name="attofarad">Attofarad</string>
+    <string name="attofarad_short">aF</string>
+    <string name="statfarad">Statfarad</string>
+    <string name="statfarad_short">stF</string>
+    <string name="farad">Farad</string>
+    <string name="farad_short">F</string>
+    <string name="exafarad">Exafarad</string>
+    <string name="exafarad_short">EF</string>
+    <string name="picofarad">Picofarad</string>
+    <string name="picofarad_short">pF</string>
+    <string name="nanofarad">Nanofarad</string>
+    <string name="nanofarad_short">nF</string>
+    <string name="microfarad">Microfarad</string>
+    <string name="microfarad_short">µF</string>
+    <string name="millifarad">Millifarad</string>
+    <string name="millifarad_short">mF</string>
+    <string name="kilofarad">Kilofarad</string>
+    <string name="kilofarad_short">kF</string>
+    <string name="megafarad">Megafarad</string>
+    <string name="megafarad_short">MF</string>
+    <string name="gigafarad">Gigafarad</string>
+    <string name="gigafarad_short">GF</string>
+    <string name="petafarad">Petafarad</string>
+    <string name="petafarad_short">PF</string>
+
+    <!-- Prefixes -->
+    <string name="prefix_quetta">Quetta</string>
+    <string name="prefix_quetta_short">Q</string>
+    <string name="prefix_ronna">Ronna</string>
+    <string name="prefix_ronna_short">R</string>
+    <string name="prefix_yotta">Yotta</string>
+    <string name="prefix_yotta_short">Y</string>
+    <string name="prefix_zetta">Zetta</string>
+    <string name="prefix_zetta_short">Z</string>
+    <string name="prefix_exa">Exa</string>
+    <string name="prefix_exa_short">E</string>
+    <string name="prefix_peta">Peta</string>
+    <string name="prefix_peta_short">P</string>
+    <string name="prefix_tera">Tera</string>
+    <string name="prefix_tera_short">T</string>
+    <string name="prefix_giga">Giga</string>
+    <string name="prefix_giga_short">G</string>
+    <string name="prefix_mega">Mega</string>
+    <string name="prefix_mega_short">M</string>
+    <string name="prefix_kilo">Kilo</string>
+    <string name="prefix_kilo_short">k</string>
+    <string name="prefix_hecto">Hecto</string>
+    <string name="prefix_hecto_short">h</string>
+    <string name="prefix_deca">Deca</string>
+    <string name="prefix_deca_short">da</string>
+    <string name="prefix_base">Base</string>
+    <string name="prefix_base_short">Base</string>
+    <string name="prefix_deci">Déci</string>
+    <string name="prefix_deci_short">d</string>
+    <string name="prefix_centi">Centi</string>
+    <string name="prefix_centi_short">c</string>
+    <string name="prefix_milli">Milli</string>
+    <string name="prefix_milli_short">m</string>
+    <string name="prefix_micro">Micro</string>
+    <string name="prefix_micro_short">μ</string>
+    <string name="prefix_nano">Nano</string>
+    <string name="prefix_nano_short">n</string>
+    <string name="prefix_pico">Pico</string>
+    <string name="prefix_pico_short">p</string>
+    <string name="prefix_femto">Femto</string>
+    <string name="prefix_femto_short">f</string>
+    <string name="prefix_atto">Atto</string>
+    <string name="prefix_atto_short">a</string>
+    <string name="prefix_zepto">Zepto</string>
+    <string name="prefix_zepto_short">z</string>
+    <string name="prefix_yocto">Yocto</string>
+    <string name="prefix_yocto_short">y</string>
+    <string name="prefix_ronto">Ronto</string>
+    <string name="prefix_ronto_short">r</string>
+    <string name="prefix_quecto">Quecto</string>
+    <string name="prefix_quecto_short">q</string>
+
+    <!-- Force -->
+    <string name="newton">Newton</string>
+    <string name="newton_short">N</string>
+    <string name="kilonewton">Kilonewton</string>
+    <string name="kilonewton_short">kN</string>
+    <string name="gram_force">Gramme-force</string>
+    <string name="gram_force_short">gf</string>
+    <string name="kilogram_force">Kilogramme-force</string>
+    <string name="kilogram_force_short">kgf</string>
+    <string name="ton_force">Tonne-force</string>
+    <string name="ton_force_short">tf</string>
+    <string name="millinewton">Millinewton</string>
+    <string name="millinewton_short">mN</string>
+    <string name="attonewton">Attonewton</string>
+    <string name="attonewton_short">aN</string>
+    <string name="dyne">Dyne</string>
+    <string name="dyne_short">dyn</string>
+    <string name="joule_per_meter">Joule/Mètre</string>
+    <string name="joule_per_meter_short">J/m</string>
+    <string name="joule_per_centimeter">Joule/centimètre</string>
+    <string name="joule_per_centimeter_short">J/cm</string>
+    <string name="kilopound_force">Kilopound-force</string>
+    <string name="kilopound_force_short">kipf</string>
+    <string name="pound_force">Pound-force</string>
+    <string name="pound_force_short">lbf</string>
+    <string name="ounce_force">Ounce-force</string>
+    <string name="ounce_force_short">ozf</string>
+    <string name="pond">Pond</string>
+    <string name="pond_short">p</string>
+    <string name="kilopond">Kilopond</string>
+    <string name="kilopond_short">kp</string>
+
+    <!-- Torque -->
+    <string name="newton_meter">Newton mètre</string>
+    <string name="newton_meter_short">N*m</string>
+    <string name="newton_centimeter">Newton centimètre</string>
+    <string name="newton_centimeter_short">N*cm</string>
+    <string name="newton_millimeter">Newton millimètre</string>
+    <string name="newton_millimeter_short">N*mm</string>
+    <string name="kilonewton_meter">Kilonewton mètre</string>
+    <string name="kilonewton_meter_short">kN*m</string>
+    <string name="dyne_meter">Dyne mètre</string>
+    <string name="dyne_meter_short">dyn*m</string>
+    <string name="dyne_centimeter">Dyne centimètre</string>
+    <string name="dyne_centimeter_short">dyn*cm</string>
+    <string name="dyne_millimeter">Dyne millimètre</string>
+    <string name="dyne_millimeter_short">dyn*mm</string>
+    <string name="kilogram_force_meter">Kilogramme-force mètre</string>
+    <string name="kilogram_force_meter_short">kgf*m</string>
+    <string name="kilogram_force_centimeter">Kilogramme-force centimètre</string>
+    <string name="kilogram_force_centimeter_short">kgf*cm</string>
+    <string name="kilogram_force_millimeter">Kilogramme-force millimètre</string>
+    <string name="kilogram_force_millimeter_short">kgf*mm</string>
+    <string name="gram_force_meter">Gramme-force mètre</string>
+    <string name="gram_force_meter_short">gf*m</string>
+    <string name="gram_force_centimeter">Gramme-force centimètre</string>
+    <string name="gram_force_centimeter_short">gf*cm</string>
+    <string name="gram_force_millimeter">Gramme-force millimètre</string>
+    <string name="gram_force_millimeter_short">gf*mm</string>
+    <string name="ounce_force_foot">Ounce-force pied</string>
+    <string name="ounce_force_foot_short">ozf*ft</string>
+    <string name="ounce_force_inch">Ounce-force pouce</string>
+    <string name="ounce_force_inch_short">ozf*in</string>
+    <string name="pound_force_foot">Pound-force pied</string>
+    <string name="pound_force_foot_short">lbf*ft</string>
+    <string name="pound_force_inch">Livre-force pouce</string>
+    <string name="pound_force_inch_short">lbf*in</string>
+
+    <!-- Flow rate -->
+    <string name="liter_per_hour">Litre/heure</string>
+    <string name="liter_per_hour_short">L/h</string>
+    <string name="liter_per_minute">Litre/minute</string>
+    <string name="liter_per_minute_short">L/m</string>
+    <string name="liter_per_second">Litre/seconde</string>
+    <string name="liter_per_second_short">L/s</string>
+    <string name="milliliter_per_hour">Millilitre/heure</string>
+    <string name="milliliter_per_hour_short">mL/h</string>
+    <string name="milliliter_per_minute">Millilitre/minute</string>
+    <string name="milliliter_per_minute_short">mL/m</string>
+    <string name="milliliter_per_second">Millilitre/seconde</string>
+    <string name="milliliter_per_second_short">mL/s</string>
+    <string name="cubic_meter_per_hour">Mètre cube</string>
+    <string name="cubic_meter_per_hour_short">m³/h</string>
+    <string name="cubic_meter_per_minute">Mètre cube/minute</string>
+    <string name="cubic_meter_per_minute_short">m³/m</string>
+    <string name="cubic_meter_per_second">Mètre cube/seconde</string>
+    <string name="cubic_meter_per_second_short">m³/s</string>
+    <string name="cubic_millimeter_per_hour">Millimètre cube/heure</string>
+    <string name="cubic_millimeter_per_hour_short">mm³/h</string>
+    <string name="cubic_millimeter_per_minute">Millimètre cube/minute</string>
+    <string name="cubic_millimeter_per_minute_short">mm³/m</string>
+    <string name="cubic_millimeter_per_second">Millimètre cube/seconde</string>
+    <string name="cubic_millimeter_per_second_short">mm³/s</string>
+    <string name="cubic_foot_per_hour">Pied cube/heure</string>
+    <string name="cubic_foot_per_hour_short">ft³/h</string>
+    <string name="cubic_foot_per_minute">Pied cube/minute</string>
+    <string name="cubic_foot_per_minute_short">ft³/m</string>
+    <string name="cubic_foot_per_second">Pied Cube/seconde</string>
+    <string name="cubic_foot_per_second_short">ft³/s</string>
+    <string name="gallon_per_hour_us">Gallon/heure (US)</string>
+    <string name="gallon_per_hour_us_short">gal/h</string>
+    <string name="gallon_per_minute_us">Gallon/minute (US)</string>
+    <string name="gallon_per_minute_us_short">gal/m</string>
+    <string name="gallon_per_second_us">Gallon/seconde (US)</string>
+    <string name="gallon_per_second_us_short">gal/s</string>
+    <string name="gallon_per_hour_imperial">Gallon/heure (Impérial)</string>
+    <string name="gallon_per_hour_imperial_short">gal/h</string>
+    <string name="gallon_per_minute_imperial">Gallon/minute (Impérial)</string>
+    <string name="gallon_per_minute_imperial_short">gal/m</string>
+    <string name="gallon_per_second_imperial">Gallon/seconde (Impérial)</string>
+    <string name="gallon_per_second_imperial_short">gal/s</string>
+
+    <!-- Luminance -->
+    <string name="candela_per_square_meter">Candela/mètre carré</string>
+    <string name="candela_per_square_meter_short">cd/m²</string>
+    <string name="candela_per_square_centimeter">Candela/centimètre carré</string>
+    <string name="candela_per_square_centimeter_short">cd/cm²</string>
+    <string name="candela_per_square_foot">Candela/pied carré</string>
+    <string name="candela_per_square_foot_short">cd/ft²</string>
+    <string name="candela_per_square_inch">Candela/pouce carré</string>
+    <string name="candela_per_square_inch_short">cd/in²</string>
+    <string name="kilocandela_per_square_meter">Kilocandela/mètre carré</string>
+    <string name="kilocandela_per_square_meter_short">kcd/m²</string>
+    <string name="stilb">Stilb</string>
+    <string name="stilb_short">sb</string>
+    <string name="lumen_per_square_meter_per_steradian">Lumen/mètre carré/steradian</string>
+    <string name="lumen_per_square_meter_per_steradian_short">lm/m²/sr</string>
+    <string name="lumen_per_square_centimeter_per_steradian">Lumen/centimètre carré/steradian</string>
+    <string name="lumen_per_square_centimeter_per_steradian_short">lm/cm²/sr</string>
+    <string name="lumen_per_square_foot_per_steradian">Lumen/pied carré/steradian</string>
+    <string name="lumen_per_square_foot_per_steradian_short">lm/ft²/sr</string>
+    <string name="watt_per_square_centimeter_per_steradian">Watt/centimètre carré/steradian</string>
+    <string name="watt_per_square_centimeter_per_steradian_short">W/cm²/sr</string>
+    <string name="nit">Nit</string>
+    <string name="nit_short">nt</string>
+    <string name="millinit">Millinit</string>
+    <string name="millinit_short">mnt</string>
+    <string name="lambert">Lambert</string>
+    <string name="lambert_short">L</string>
+    <string name="millilambert">Millilambert</string>
+    <string name="millilambert_short">mL</string>
+    <string name="foot_lambert">Pied-lambert</string>
+    <string name="foot_lambert_short">fL</string>
+    <string name="apostilb">Apostilb</string>
+    <string name="apostilb_short">asb</string>
+    <string name="blondel">Blondel</string>
+    <string name="blondel_short">blondel</string>
+    <string name="bril">Bril</string>
+    <string name="bril_short">bril</string>
+    <string name="skot">Skot</string>
+    <string name="skot_short">sk</string>
+    <string name="electrostatic_capacitance">Capacité</string>
+    <string name="prefix">Préfixe</string>
+    <string name="force">Force</string>
+    <string name="torque">Couple</string>
+    <string name="flow_rate">Flux</string>
+    <string name="luminance">Luminance</string>
+    <string name="format_time">Formatter l\'heure</string>
+    <string name="format_time_support">Exemple : Afficher 130 minutes comme 2h 10m</string>
+    <string name="units_sorting">Tri de la liste d\'unités</string>
+    <string name="units_sorting_support">Changer l\'ordre des unités</string>
+
+    <!-- Units list sorting -->
+    <string name="sort_by_usage">Utilisation</string>
+    <string name="sort_by_alphabetical">Alphabétique</string>
+    <string name="sort_by_scale_desc">Échelle (Desc.)</string>
+    <string name="sort_by_scale_asc">Échelle (Asc.)</string>
+    <string name="color_theme_support">Choisir un mode de thème</string>
+    <string name="color_scheme">Palette de couleurs</string>
+    <string name="selected_color">Couleur sélectionnée</string>
+    <string name="monet_mode">Style sélectionné</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/Gj9ZCNPXIfKddDQgccvboVFz.jpg 
+https://s3.eu-west-1.amazonaws.com/po-pub/i/prtM85P6x1fMuLg1I0zbkceo.png 
+
+Maybe this can be labeled better? Let me know. It should be something that can describe content of the Formatting screen. -->
+    <string name="formatting_setting_support">Précision et format des nombres</string>
+    <string name="divide_by_zero_error">Impossible de diviser par 0</string>
+    <string name="date_difference">Différence entre deux dates</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/uWOHJmIq9riqsq7PO82ZQp3a.png -->
+    <string name="select_time">Choisir le temps</string>
+    <string name="date_difference_start">Début</string>
+    <string name="date_difference_end">Fin</string>
+    <string name="date_difference_result">Différence</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
+    <string name="date_difference_years">Années</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
+    <string name="date_difference_months">Mois</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
+    <string name="date_difference_days">Jours</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
+    <string name="date_difference_hours">Heures</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
+    <string name="date_difference_minutes">Minutes</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/9lSfdkfKShwyQFEF4nvbVaIb.jpg 
+
+Used in this dialog window. Should be short -->
+    <string name="next_label">Suite</string>
+    <string name="formatting_setting_preview_box_label">Aperçu (cliquez pour changer)</string>
 </resources>
\ No newline at end of file
diff --git a/core/base/src/main/res/values-hu/strings.xml b/core/base/src/main/res/values-hu/strings.xml
new file mode 100644
index 00000000..653dc1dd
--- /dev/null
+++ b/core/base/src/main/res/values-hu/strings.xml
@@ -0,0 +1,574 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Length -->
+    <string name="attometer">Attométer</string>
+    <string name="attometer_short">am</string>
+    <string name="nanometer">Nanométer</string>
+    <string name="nanometer_short">nm</string>
+    <string name="micrometer">Mikrométer</string>
+    <string name="micrometer_short">μm</string>
+    <string name="millimeter">Milliméter</string>
+    <string name="millimeter_short">mm</string>
+    <string name="centimeter">Centiméter</string>
+    <string name="centimeter_short">cm</string>
+    <string name="decimeter">Deciméter</string>
+    <string name="decimeter_short">dm</string>
+    <string name="meter">Méter</string>
+    <string name="meter_short">m</string>
+    <string name="kilometer">Kilóméter</string>
+    <string name="kilometer_short">km</string>
+    <string name="mile">Mérföld</string>
+    <string name="mile_short">Mi</string>
+    <string name="yard">Yard</string>
+    <string name="yard_short">yd</string>
+    <string name="foot">Láb</string>
+    <string name="foot_short">ft</string>
+    <string name="inch">Hüvelyk</string>
+    <string name="inch_short">in</string>
+    <string name="light_year">Fényév</string>
+    <string name="light_year_short">ly</string>
+    <string name="parsec">Parsec</string>
+    <string name="parsec_short">pc</string>
+    <string name="kiloparsec">Kilóparsec</string>
+    <string name="kiloparsec_short">kpc</string>
+    <string name="megaparsec">Megaparsec</string>
+    <string name="megaparsec_short">Mpc</string>
+    <string name="mercury_equatorial_radius">Merkúr egyenlítői sugara</string>
+    <string name="mercury_equatorial_radius_short">Merkúr E</string>
+    <string name="venus_equatorial_radius">Vénusz egyenlítői sugara</string>
+    <string name="venus_equatorial_radius_short">Vénusz E</string>
+    <string name="earth_equatorial_radius">Föld egyenlítői sugara</string>
+    <string name="earth_equatorial_radius_short">Föld E</string>
+    <string name="mars_equatorial_radius">Mars egyenlítői sugara</string>
+    <string name="mars_equatorial_radius_short">Mars E</string>
+    <string name="jupiter_equatorial_radius">Jupiter egyenlítői sugara</string>
+    <string name="jupiter_equatorial_radius_short">Jupiter E</string>
+    <string name="saturn_equatorial_radius">Szaturnusz egyenlítői sugara</string>
+    <string name="saturn_equatorial_radius_short">Szaturnusz E</string>
+    <string name="uranus_equatorial_radius">Uránusz egyenlítői sugara</string>
+    <string name="uranus_equatorial_radius_short">Uránusz E</string>
+    <string name="neptune_equatorial_radius">Neptunusz egyenlítői sugara</string>
+    <string name="neptune_equatorial_radius_short">Neptunusz E</string>
+    <string name="sun_equatorial_radius">Nap egyenlítői sugara</string>
+    <string name="sun_equatorial_radius_short">Nap E</string>
+
+    <!-- Mass -->
+    <string name="electron_mass_rest">Elektrontömeg</string>
+    <string name="electron_mass_rest_short">me</string>
+    <string name="atomic_mass_unit">Dalton</string>
+    <string name="atomic_mass_unit_short">u</string>
+    <string name="milligram">Milligramm</string>
+    <string name="milligram_short">mg</string>
+    <string name="gram">gramm</string>
+    <string name="gram_short">g</string>
+    <string name="kilogram">kilogramm</string>
+    <string name="kilogram_short">kg</string>
+    <string name="metric_ton">Metrikus tonna</string>
+    <string name="metric_ton_short">t</string>
+    <string name="imperial_ton">Birodalmi tonna</string>
+    <string name="imperial_ton_short">t (UK)</string>
+    <string name="pound">Font</string>
+    <string name="pound_short">lbs</string>
+    <string name="ounce">Uncia</string>
+    <string name="ounce_short">oz</string>
+    <string name="carat">Karát</string>
+    <string name="carat_short">ct</string>
+    <string name="mercury_mass">Merkúrtömeg</string>
+    <string name="mercury_mass_short">Merkúr M</string>
+    <string name="venus_mass">Vénusztömeg</string>
+    <string name="venus_mass_short">Vénusz M</string>
+    <string name="earth_mass">Földtömeg</string>
+    <string name="earth_mass_short">Föld M</string>
+    <string name="mars_mass">Marstömeg</string>
+    <string name="mars_mass_short">Mars M</string>
+    <string name="jupiter_mass">Jupitertömeg</string>
+    <string name="jupiter_mass_short">Jupiter M</string>
+    <string name="saturn_mass">Szaturnusztömeg</string>
+    <string name="saturn_mass_short">Szaturnusz M</string>
+    <string name="uranus_mass">Uránusztömeg</string>
+    <string name="uranus_mass_short">Uránusz M</string>
+    <string name="neptune_mass">Neptunusztömeg</string>
+    <string name="neptune_mass_short">Neptunusz M</string>
+    <string name="sun_mass">Naptömeg</string>
+    <string name="sun_mass_short">Nap M</string>
+
+    <!-- Temperature -->
+    <string name="celsius">Celsius</string>
+    <string name="fahrenheit">Fahrenheit</string>
+    <string name="kelvin">Kelvin</string>
+
+    <!-- Speed -->
+    <string name="millimeter_per_hour">Milliméter/óra</string>
+    <string name="millimeter_per_hour_short">mm/h</string>
+    <string name="millimeter_per_minute">Milliméter/perc</string>
+    <string name="millimeter_per_minute_short">mm/m</string>
+    <string name="millimeter_per_second">Milliméter/másodperc</string>
+    <string name="millimeter_per_second_short">mm/s</string>
+    <string name="centimeter_per_hour">Centiméter/óra</string>
+    <string name="centimeter_per_hour_short">cm/h</string>
+    <string name="centimeter_per_minute">Centiméter/perc</string>
+    <string name="centimeter_per_minute_short">cm/m</string>
+    <string name="centimeter_per_second">Centiméter/másodperc</string>
+    <string name="centimeter_per_second_short">cm/s</string>
+    <string name="meter_per_hour">Méter/óra</string>
+    <string name="meter_per_hour_short">m/h</string>
+    <string name="meter_per_minute">Méter/perc</string>
+    <string name="meter_per_minute_short">m/m</string>
+    <string name="meter_per_second">Méter/másodperc</string>
+    <string name="meter_per_second_short">m/s</string>
+    <string name="kilometer_per_hour">Kilóméter/h</string>
+    <string name="kilometer_per_hour_short">km/h</string>
+    <string name="kilometer_per_minute">Kilóméter/perc</string>
+    <string name="kilometer_per_minute_short">km/m</string>
+    <string name="kilometer_per_second">Kilóméter/másodperc</string>
+    <string name="kilometer_per_second_short">km/s</string>
+    <string name="foot_per_hour">Láb/óra</string>
+    <string name="foot_per_hour_short">ft/h</string>
+    <string name="foot_per_minute">Láb/perc</string>
+    <string name="foot_per_minute_short">ft/m</string>
+    <string name="foot_per_second">Láb/másodperc</string>
+    <string name="foot_per_second_short">ft/s</string>
+    <string name="yard_per_hour">Yard/óra</string>
+    <string name="yard_per_hour_short">yd/h</string>
+    <string name="yard_per_minute">Yard/perc</string>
+    <string name="yard_per_minute_short">yd/m</string>
+    <string name="yard_per_second">Yard/másodperc</string>
+    <string name="yard_per_second_short">yd/s</string>
+    <string name="mile_per_hour">Mérföld/óra</string>
+    <string name="mile_per_hour_short">mi/h</string>
+    <string name="mile_per_minute">Mérföld/perc</string>
+    <string name="mile_per_minute_short">mi/m</string>
+    <string name="mile_per_second">Mérföld/másodperc</string>
+    <string name="mile_per_second_short">mi/s</string>
+    <string name="knot">Csomó</string>
+    <string name="knot_short">kt</string>
+    <string name="velocity_of_light_in_vacuum">Fénysebesség vákuumban</string>
+    <string name="cosmic_velocity_first">Első Kozmikus Sebesség</string>
+    <string name="cosmic_velocity_second">Második Kozmikus Sebesség</string>
+    <string name="cosmic_velocity_third">Harmadik Kozmikus Sebesség</string>
+    <string name="earths_orbital_speed">Föld keringési sebessége</string>
+    <string name="mach">Mach</string>
+    <string name="mach_si_standard">Mach (SI)</string>
+
+    <!-- File size -->
+    <string name="bit">Bit</string>
+    <string name="bit_short">b</string>
+    <string name="kibibit">Kibibit</string>
+    <string name="kibibit_short">Kib</string>
+    <string name="kilobit">Kilóbit</string>
+    <string name="kilobit_short">Kb</string>
+    <string name="megabit">Megabit</string>
+    <string name="megabit_short">Mb</string>
+    <string name="mebibit">Mebibit</string>
+    <string name="mebibit_short">Mib</string>
+    <string name="gigabit">Gigabit</string>
+    <string name="gigabit_short">Gb</string>
+    <string name="terabit">Terabit</string>
+    <string name="terabit_short">Tb</string>
+    <string name="petabit">Petabit</string>
+    <string name="petabit_short">Pb</string>
+    <string name="exabit">Exabit</string>
+    <string name="exabit_short">Eb</string>
+    <string name="byte_">Bájt</string>
+    <string name="byte_short">B</string>
+    <string name="kibibyte">Kibibájt</string>
+    <string name="kibibyte_short">KiB</string>
+    <string name="kilobyte">Kilóbájt</string>
+    <string name="kilobyte_short">KB</string>
+    <string name="megabyte">Megabájt</string>
+    <string name="megabyte_short">MB</string>
+    <string name="mebibyte">Mebibájt</string>
+    <string name="mebibyte_short">MiB</string>
+    <string name="gigabyte">Gigabájt</string>
+    <string name="gigabyte_short">GB</string>
+    <string name="terabyte">Terrabájt</string>
+    <string name="terabyte_short">TB</string>
+    <string name="petabyte">Petabájt</string>
+    <string name="petabyte_short">PB</string>
+    <string name="exabyte">Exabájt</string>
+    <string name="exabyte_short">EB</string>
+
+    <!-- Data transfer -->
+    <string name="bit_per_second">Bit/másodperc</string>
+    <string name="bit_per_second_short">b/s</string>
+    <string name="kibibit_per_second">Kibibit/másodperc</string>
+    <string name="kibibit_per_second_short">Kib/s</string>
+    <string name="kilobit_per_second">Kilóbit/másodperc</string>
+    <string name="kilobit_per_second_short">Kb/s</string>
+    <string name="megabit_per_second">Megabit/másodperc</string>
+    <string name="megabit_per_second_short">Mb/s</string>
+    <string name="mebibit_per_second">Mebibit/másodperc</string>
+    <string name="mebibit_per_second_short">Mib/s</string>
+    <string name="gigabit_per_second">Gigabit/másodperc</string>
+    <string name="gigabit_per_second_short">Gb/s</string>
+    <string name="terabit_per_second">Terrabit/másodperc</string>
+    <string name="terabit_per_second_short">Tb/s</string>
+    <string name="petabit_per_second">Petabit/másodperc</string>
+    <string name="petabit_per_second_short">Pb/s</string>
+    <string name="exabit_per_second">Exabit/másodperc</string>
+    <string name="exabit_per_second_short">Eb/s</string>
+    <string name="byte_per_second">Bájt/másodperc</string>
+    <string name="byte_per_second_short">B/s</string>
+    <string name="kibibyte_per_second">Kibibájt/másodperc</string>
+    <string name="kibibyte_per_second_short">KiB/s</string>
+    <string name="kilobyte_per_second">Kilóbájt/másodperc</string>
+    <string name="kilobyte_per_second_short">KB/s</string>
+    <string name="megabyte_per_second">Megabájt/másodperc</string>
+    <string name="megabyte_per_second_short">MB/s</string>
+    <string name="mebibyte_per_second">Mebibájt/másodperc</string>
+    <string name="mebibyte_per_second_short">MiB/s</string>
+    <string name="gigabyte_per_second">Gigabájt/másodperc</string>
+    <string name="gigabyte_per_second_short">GB/s</string>
+    <string name="terabyte_per_second">Terrabájt/másodperc</string>
+    <string name="terabyte_per_second_short">TB/s</string>
+    <string name="petabyte_per_second">Petabájt/másodperc</string>
+    <string name="petabyte_per_second_short">PB/s</string>
+    <string name="exabyte_per_second">Exabájt/másodperc</string>
+    <string name="exabyte_per_second_short">EB/s</string>
+
+    <!-- Volume -->
+    <string name="attoliter">Attoliter</string>
+    <string name="attoliter_short">aL</string>
+    <string name="milliliter">Milliliter</string>
+    <string name="milliliter_short">mL</string>
+    <string name="liter">Liter</string>
+    <string name="liter_short">L</string>
+    <string name="us_liquid_gallon">Amerikai folyékony gallon</string>
+    <string name="us_liquid_gallon_short">gal (USA)</string>
+    <string name="us_liquid_quart">Amerikai folyékony kvart</string>
+    <string name="us_liquid_quart_short">qt (USA)</string>
+    <string name="us_liquid_pint">Amerikai folyékony pint</string>
+    <string name="us_liquid_pint_short">pt (USA)</string>
+    <string name="us_legal_cup">Amerikai törvényi kupa</string>
+    <string name="us_legal_cup_short">kupa (USA)</string>
+    <string name="us_fluid_ounce">Amerikai folyadékuncia</string>
+    <string name="us_fluid_ounce_short">fl oz (USA)</string>
+    <string name="us_tablespoon">Amerikai evőkanál</string>
+    <string name="us_tablespoon_short">Evőkanál (USA)</string>
+    <string name="us_teaspoon">Amerikai teáskanál</string>
+    <string name="us_teaspoon_short">Teáskanál (USA)</string>
+    <string name="imperial_gallon">Birodalmi gallon</string>
+    <string name="imperial_gallon_short">gal (UK)</string>
+    <string name="imperial_quart">Birodalmi kvart</string>
+    <string name="imperial_quart_short">qt (UK)</string>
+    <string name="imperial_pint">Birodalmi pint</string>
+    <string name="imperial_pint_short">pt (UK)</string>
+    <string name="imperial_cup">Birodalmi kupa</string>
+    <string name="imperial_cup_short">Kupa (UK)</string>
+    <string name="imperial_fluid_ounce">Birodalmi folyadékuncia</string>
+    <string name="imperial_fluid_ounce_short">fl oz (UK)</string>
+    <string name="imperial_tablespoon">Birodalmi evőkanál</string>
+    <string name="imperial_tablespoon_short">Evőkanál (UK)</string>
+    <string name="imperial_teaspoon">Birodalmi teáskanál</string>
+    <string name="imperial_teaspoon_short">Teáskanál (UK)</string>
+    <string name="cubic_millimeter">Köbmilliméter</string>
+    <string name="cubic_millimeter_short">mm^3</string>
+    <string name="cubic_centimeter">Köbcentiméter</string>
+    <string name="cubic_centimeter_short">cm^3</string>
+    <string name="cubic_meter">Köbméter</string>
+    <string name="cubic_meter_short">m^3</string>
+    <string name="cubic_kilometer">Köbkilóméter</string>
+    <string name="cubic_kilometer_short">km^3</string>
+
+    <!-- Time -->
+    <string name="attosecond">Attomásodperc</string>
+    <string name="attosecond_short">as</string>
+    <string name="nanosecond">Nanomásodperc</string>
+    <string name="nanosecond_short">ns</string>
+    <string name="microsecond">Mikromásodperc</string>
+    <string name="microsecond_short">µs</string>
+    <string name="millisecond">Millimásodperc</string>
+    <string name="millisecond_short">ms</string>
+    <string name="jiffy">Pillanat</string>
+    <string name="jiffy_short">j</string>
+    <string name="second">Másodperc</string>
+    <string name="second_short">s</string>
+    <string name="minute">Perc</string>
+    <string name="minute_short">m</string>
+    <string name="hour">Óra</string>
+    <string name="hour_short">h</string>
+    <string name="day">Nap</string>
+    <string name="day_short">d</string>
+    <string name="week">Hét</string>
+    <string name="week_short">w</string>
+
+    <!-- Area -->
+    <string name="electron_cross_section">Elektron-keresztmetszet</string>
+    <string name="electron_cross_section_short">ecs</string>
+    <string name="acre">Acre</string>
+    <string name="acre_short">ac</string>
+    <string name="hectare">Hektár</string>
+    <string name="hectare_short">ha</string>
+    <string name="square_foot">Négyzetláb</string>
+    <string name="square_foot_short">ft^2</string>
+    <string name="square_mile">Négyzetmérföld</string>
+    <string name="square_mile_short">mi^2</string>
+    <string name="square_yard">Négyzetyard</string>
+    <string name="square_yard_short">yd^2</string>
+    <string name="square_inch">Négyzethüvelyk</string>
+    <string name="square_inch_short">in^2</string>
+    <string name="square_micrometer">Négyzetmikrométer</string>
+    <string name="square_micrometer_short">µm^2</string>
+    <string name="square_millimeter">Négyzetmilliméter</string>
+    <string name="square_millimeter_short">mm^2</string>
+    <string name="square_centimeter">Négyzetcentiméter</string>
+    <string name="square_centimeter_short">cm^2</string>
+    <string name="square_decimeter">Négyzetdeciméter</string>
+    <string name="square_decimeter_short">dm^2</string>
+    <string name="square_meter">Négyzetméter</string>
+    <string name="square_meter_short">m^2</string>
+    <string name="square_kilometer">Négyzetkilóméter</string>
+    <string name="square_kilometer_short">km^2</string>
+
+    <!-- Energy -->
+    <string name="electron_volt">Elektronvolt</string>
+    <string name="electron_volt_short">eV</string>
+    <string name="attojoule">Attojoule</string>
+    <string name="attojoule_short">aJ</string>
+    <string name="energy_horse_power_metric">Lóerő</string>
+    <string name="energy_horse_power_metric_short">hp</string>
+    <string name="joule">Joule</string>
+    <string name="joule_short">J</string>
+    <string name="kilojoule">Kilojoule</string>
+    <string name="kilojoule_short">kJ</string>
+    <string name="gigajoule">Megajoule</string>
+    <string name="gigajoule_short">MJ</string>
+    <string name="megajoule">Gigajoule</string>
+    <string name="megajoule_short">GJ</string>
+    <string name="energy_ton">1 tonna TNT</string>
+    <string name="energy_ton_short">t</string>
+    <string name="kiloton">1 kilótonna TNT</string>
+    <string name="kiloton_short">kt</string>
+    <string name="megaton">1 megatonna TNT</string>
+    <string name="megaton_short">Mt</string>
+    <string name="gigaton">1 gigatonna TNT</string>
+    <string name="gigaton_short">Gt</string>
+    <string name="calorie_th">Kalória (th)</string>
+    <string name="calorie_th_short">cal</string>
+    <string name="kilocalorie_th">Kilókalória (th)</string>
+    <string name="kilocalorie_th_short">kcal</string>
+
+    <!-- Power -->
+    <string name="attowatt">Attowatt</string>
+    <string name="attowatt_short">aW</string>
+    <string name="watt">Watt</string>
+    <string name="watt_short">W</string>
+    <string name="kilowatt">Kilówatt</string>
+    <string name="kilowatt_short">kW</string>
+    <string name="megawatt">Megawatt</string>
+    <string name="megawatt_short">MG</string>
+    <string name="horse_power_mechanical">Lóerő</string>
+    <string name="horse_power_mechanical_short">hp</string>
+
+    <!-- Angle -->
+    <string name="angle_second">Szögmásodperc</string>
+    <string name="angle_minute">Szögperc</string>
+    <string name="degree">Fok</string>
+    <string name="radian">Radián</string>
+    <string name="radian_short">rad</string>
+    <string name="sextant">Szextáns</string>
+    <string name="sextant_short">sxt</string>
+    <string name="turn">Fordulat</string>
+    <string name="turn_short">tr</string>
+
+    <!-- Pressure -->
+    <string name="attopascal">Attopascal</string>
+    <string name="attopascal_short">aPa</string>
+    <string name="femtopascal">Femtopascal</string>
+    <string name="femtopascal_short">fPa</string>
+    <string name="picopascal">Picopascal</string>
+    <string name="picopascal_short">pPa</string>
+    <string name="nanopascal">Nanopascal</string>
+    <string name="nanopascal_short">nPa</string>
+    <string name="micropascal">Mikropascal</string>
+    <string name="micropascal_short">µPa</string>
+    <string name="millipascal">Millipascal</string>
+    <string name="millipascal_short">mPa</string>
+    <string name="centipascal">Centipascal</string>
+    <string name="centipascal_short">cPa</string>
+    <string name="decipascal">Decipascal</string>
+    <string name="decipascal_short">dPa</string>
+    <string name="pascal">Pascal</string>
+    <string name="pascal_short">Pa</string>
+    <string name="dekapascal">Dekapascal</string>
+    <string name="dekapascal_short">daPa</string>
+    <string name="hectopascal">Hektopascal</string>
+    <string name="hectopascal_short">hPa</string>
+    <string name="bar">Bar</string>
+    <string name="bar_short">bar</string>
+    <string name="megapascal">Megapascal</string>
+    <string name="megapascal_short">MPa</string>
+    <string name="gigapascal">Gigapascal</string>
+    <string name="gigapascal_short">GPa</string>
+    <string name="terapascal">Terrapascal</string>
+    <string name="terapascal_short">TPa</string>
+    <string name="petapascal">Petapascal</string>
+    <string name="petapascal_short">PPa</string>
+    <string name="exapascal">Exapascal</string>
+    <string name="exapascal_short">EPa</string>
+    <string name="psi">Font/négyzethüvelyk</string>
+    <string name="ksi">Kilófont/négyzethüvelyk</string>
+    <string name="standard_atmosphere">Szabványos légkör</string>
+    <string name="standard_atmosphere_short">atm</string>
+    <string name="torr">Torr</string>
+    <string name="torr_short">torr</string>
+    <string name="millimeter_of_mercury">Higanymilliméter</string>
+    <string name="millimeter_of_mercury_short">mm Hg</string>
+
+    <!-- Acceleration -->
+    <string name="attometer_per_square_second">Attométer/négyzetszögmásodperc</string>
+    <string name="attometer_per_square_second_short">am/s^2</string>
+    <string name="femtometer_per_square_second">Femtométer/négyzetszögmásodperc</string>
+    <string name="femtometer_per_square_second_short">fm/s^2</string>
+    <string name="picometer_per_square_second">Pikométer/négyzetszögmásodperc</string>
+    <string name="picometer_per_square_second_short">pm/s^2</string>
+    <string name="nanometer_per_square_second">Nanométer/négyzetszögmásodperc</string>
+    <string name="nanometer_per_square_second_short">nm/s^2</string>
+    <string name="micrometer_per_square_second">Mikrométer/négyzetszögmásodperc</string>
+    <string name="micrometer_per_square_second_short">µm/s^2</string>
+    <string name="millimeter_per_square_second">Milliméter/négyzetszögmásodperc</string>
+    <string name="millimeter_per_square_second_short">mm/s^2</string>
+    <string name="centimeter_per_square_second">Centiméter/négyzetszögmásodperc</string>
+    <string name="centimeter_per_square_second_short">cm/s^2</string>
+    <string name="decimeter_per_square_second">Deciméter/négyzetszögmásodperc</string>
+    <string name="decimeter_per_square_second_short">dm/s^2</string>
+    <string name="meter_per_square_second">Méter/négyzetszögmásodperc</string>
+    <string name="meter_per_square_second_short">m/s^2</string>
+    <string name="kilometer_per_square_second">Kilóméter/négyzetszögmásodperc</string>
+    <string name="kilometer_per_square_second_short">km/s^2</string>
+    <string name="dekameter_per_square_second">Dekaméter/négyzetszögmásodperc</string>
+    <string name="dekameter_per_square_second_short">dam/s^2</string>
+    <string name="hectometer_per_square_second">Hektométer/négyzetszögmásodperc</string>
+    <string name="hectometer_per_square_second_short">hm/s^2</string>
+    <string name="gal">Gal</string>
+    <string name="gal_short">Gal</string>
+    <string name="mercury_surface_gravity">A Merkúr felszíni gravitációja</string>
+    <string name="mercury_surface_gravity_short">Merkúr g</string>
+    <string name="venus_surface_gravity">A Vénusz felszíni gravitációja</string>
+    <string name="venus_surface_gravity_short">Vénusz g</string>
+    <string name="earth_surface_gravity">A Föld felszíni gravitációja</string>
+    <string name="earth_surface_gravity_short">Föld g</string>
+    <string name="mars_surface_gravity">A Mars felszini gravitációja</string>
+    <string name="mars_surface_gravity_short">Mars g</string>
+    <string name="jupiter_surface_gravity">A Jupiter felszíni gravitációja</string>
+    <string name="jupiter_surface_gravity_short">Jupiter g</string>
+    <string name="saturn_surface_gravity">A Szaturnusz felszíni gravitációja</string>
+    <string name="saturn_surface_gravity_short">Szaturnusz g</string>
+    <string name="uranus_surface_gravity">Az Uránusz felszíni gravitációja</string>
+    <string name="uranus_surface_gravity_short">Uránusz g</string>
+    <string name="neptune_surface_gravity">A Neptunusz felszíni gravitációja</string>
+    <string name="neptune_surface_gravity_short">Neptunusz g</string>
+    <string name="sun_surface_gravity">A Nap felszíni gravitációja</string>
+    <string name="sun_surface_gravity_short">Nap g</string>
+    <string name="currency_ada">Cardano</string>
+    <string name="currency_aed">Egyesült Arab Emírségeki Dirham</string>
+    <string name="currency_afn">Afgán afgáni</string>
+    <string name="currency_all">Albán lek</string>
+    <string name="currency_amd">Örmény dram</string>
+    <string name="currency_ang">Holland Antillai Gulden</string>
+    <string name="currency_aoa">Angolai kwanza</string>
+    <string name="currency_ars">Argentin peso</string>
+    <string name="currency_aud">Ausztrál dollár</string>
+    <string name="currency_awg">Arubai florin</string>
+    <string name="currency_azn">Azerbajdzsáni manat</string>
+    <string name="currency_bam">Bosznia-Hercegovinai Konvertibilis Márka</string>
+    <string name="currency_bbd">Bajai dollár</string>
+    <string name="currency_bdt">Bangladesi taka</string>
+    <string name="currency_bgn">Bolgár lev</string>
+    <string name="currency_bhd">Bahreini dínár</string>
+    <string name="currency_bif">Burundiai Frank</string>
+    <string name="currency_bmd">Bermudai dollár</string>
+    <string name="currency_bnd">Brunei dollár</string>
+    <string name="currency_bob">Bolíviai boliviánó</string>
+    <string name="currency_brl">Brazil reál</string>
+    <string name="currency_bsd">Bahamai dollár</string>
+    <string name="currency_btn">Bhutáni pénznem</string>
+    <string name="currency_bwp">Botswanai Pula</string>
+    <string name="currency_byn">Új Belurusz Rubel</string>
+    <string name="currency_byr">Belarusz Rubel</string>
+    <string name="currency_bzd">Belizei dollár</string>
+    <string name="currency_cad">Kanadai dollár</string>
+    <string name="currency_cdf">Kongói frank</string>
+    <string name="currency_chf">Svájci frank</string>
+    <string name="currency_clf">Chilei Elszámolási Egység (UF)</string>
+    <string name="currency_clp">Chilei peso</string>
+    <string name="currency_cny">Kínai yuan</string>
+    <string name="currency_cop">Kolumbiai peso</string>
+    <string name="currency_crc">Costa Rico-i Colón</string>
+    <string name="currency_cuc">Kubai konvertibilis peso</string>
+    <string name="currency_cup">Kubai peso</string>
+    <string name="currency_cve">Cape Verde-i escudo</string>
+    <string name="currency_czk">Cseh korona</string>
+    <string name="currency_dai">Dai</string>
+    <string name="currency_djf">Dzsibuti frank</string>
+    <string name="currency_dkk">Dán korona</string>
+    <string name="currency_dop">Dominikai peso</string>
+    <string name="currency_dzd">Algériai dínár</string>
+    <string name="currency_egp">Egyiptomi font</string>
+    <string name="currency_ern">Eritreai nakfa</string>
+    <string name="currency_etb">Etióp birr</string>
+    <string name="currency_eur">Euró</string>
+    <string name="currency_fjd">Fiji dollár</string>
+    <string name="currency_fkp">Falkland-szigeteki font</string>
+    <string name="currency_gbp">Font sterling</string>
+    <string name="currency_gel">Grúz lari</string>
+    <string name="currency_ghs">Ghánai cedi</string>
+    <string name="currency_gip">Gibraltári font</string>
+    <string name="currency_gmd">Gambiai dalasi</string>
+    <string name="currency_gnf">Gueniai frank</string>
+    <string name="currency_gtq">Guatemalai quetzal</string>
+    <string name="currency_gyd">Guyanai dollár</string>
+    <string name="currency_hkd">Hong Kong-i dollár</string>
+    <string name="currency_hnl">Hondurasi lempira</string>
+    <string name="currency_hrk">Horvát kuna</string>
+    <string name="currency_htg">Haiti gourde</string>
+    <string name="currency_huf">Magyar forint</string>
+    <string name="currency_idr">Indonéz rúpia</string>
+    <string name="currency_ils">Izraeli Új Sékel</string>
+    <string name="currency_inr">Indiai rúpia</string>
+    <string name="currency_iqd">Iraki dínár</string>
+    <string name="currency_irr">Iráni riál</string>
+    <string name="currency_isk">Izlandi korona</string>
+    <string name="currency_jep">Jersey Font</string>
+    <string name="currency_jmd">Jamaikai dollár</string>
+    <string name="currency_jod">Jordániai dínár</string>
+    <string name="currency_jpy">Japán yen</string>
+    <string name="currency_kes">Kenyai shilling</string>
+    <string name="currency_kgs">Kirgiz Som</string>
+    <string name="currency_khr">Kambodzsai riel</string>
+    <string name="currency_kmf">Comorosi frank</string>
+    <string name="currency_kpw">Észak-koreai won</string>
+    <string name="currency_krw">Dél-koreai won</string>
+    <string name="currency_kwd">Kuvaiti dínár</string>
+    <string name="currency_kyd">Kajmán-szigeteki dollár</string>
+    <string name="currency_kzt">Kazasztáni tenge</string>
+    <string name="currency_lak">Laoszi Kip</string>
+    <string name="currency_lbp">Libanoni font</string>
+    <string name="currency_lkr">Srí Lankai rúpia</string>
+    <string name="currency_lrd">Libériai dollár</string>
+    <string name="currency_lsl">Lesothoi loti</string>
+    <string name="currency_ltl">Litván litas</string>
+    <string name="currency_lvl">Litván lats</string>
+    <string name="currency_lyd">Líbiai dínár</string>
+    <string name="currency_mad">Marokkói dirham </string>
+    <string name="currency_mdl">Moldáv lej</string>
+    <string name="currency_mga">Madagaszkári ariary</string>
+    <string name="currency_mkd">Macedón dénár</string>
+    <string name="currency_mmk">Myanmari Kyat</string>
+    <string name="currency_mnt">Mongol tugrik</string>
+    <string name="currency_mop">Makaói pataca</string>
+    <string name="currency_mro">Mauritiuszi ouguiya</string>
+    <string name="currency_mur">Mauritiusi rúpia</string>
+    <string name="currency_mvr">Maldív rufiyaa</string>
+    <string name="currency_mwk">Malawi kwacha</string>
+    <string name="currency_mxn">Mexikói peso</string>
+    <string name="currency_myr">Maláj ringgit</string>
+    <string name="currency_mzn">Mozambiki Metical</string>
+    <string name="currency_nad">Namíbiai dollár</string>
+    <string name="currency_ngn">Nigériai naira</string>
+    <string name="currency_nio">Nicaraguai córdoba</string>
+    <string name="currency_nok">Norvég korona</string>
+    <string name="currency_npr">Nepáli rúpia</string>
+    <string name="currency_nzd">Új-zélandi dollár</string>
+</resources>
\ No newline at end of file
diff --git a/core/base/src/main/res/values-in/strings.xml b/core/base/src/main/res/values-in/strings.xml
new file mode 100644
index 00000000..b65ead68
--- /dev/null
+++ b/core/base/src/main/res/values-in/strings.xml
@@ -0,0 +1,885 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Length -->
+    <string name="attometer">Atometer</string>
+    <string name="attometer_short">am</string>
+    <string name="nanometer">Nanometer</string>
+    <string name="nanometer_short">nm</string>
+    <string name="micrometer">Mikrometer</string>
+    <string name="micrometer_short">μm</string>
+    <string name="millimeter">Milimeter</string>
+    <string name="millimeter_short">mm</string>
+    <string name="centimeter">Sentimeter</string>
+    <string name="centimeter_short">cm</string>
+    <string name="decimeter">Desimeter</string>
+    <string name="decimeter_short">dm</string>
+    <string name="meter">Meter</string>
+    <string name="meter_short">m</string>
+    <string name="kilometer">Kilometer</string>
+    <string name="kilometer_short">km</string>
+    <string name="mile">Mil</string>
+    <string name="mile_short">Mi</string>
+    <string name="yard">Yard</string>
+    <string name="yard_short">yd</string>
+    <string name="foot">Kaki</string>
+    <string name="foot_short">ft</string>
+    <string name="inch">Inci</string>
+    <string name="inch_short">in</string>
+    <string name="light_year">Tahun cahaya</string>
+    <string name="light_year_short">tc</string>
+    <string name="parsec">Parsek</string>
+    <string name="parsec_short">pc</string>
+    <string name="kiloparsec">Kiloparsek</string>
+    <string name="kiloparsec_short">kpc</string>
+    <string name="megaparsec">Megaparsek</string>
+    <string name="megaparsec_short">Mpc</string>
+    <string name="mercury_equatorial_radius">Radius merkurius</string>
+    <string name="mercury_equatorial_radius_short">R Merkurius</string>
+    <string name="venus_equatorial_radius">Radius venus</string>
+    <string name="venus_equatorial_radius_short">R Venus</string>
+    <string name="earth_equatorial_radius">Radius bumi</string>
+    <string name="earth_equatorial_radius_short">R Bumi</string>
+    <string name="mars_equatorial_radius">Radius mars</string>
+    <string name="mars_equatorial_radius_short">R Mars</string>
+    <string name="jupiter_equatorial_radius">Radius jupiter</string>
+    <string name="jupiter_equatorial_radius_short">R Jupiter</string>
+    <string name="saturn_equatorial_radius">Radius saturnus</string>
+    <string name="saturn_equatorial_radius_short">R Saturnus</string>
+    <string name="uranus_equatorial_radius">Radius uranus</string>
+    <string name="uranus_equatorial_radius_short">R Uranus</string>
+    <string name="neptune_equatorial_radius">Radius neptunus</string>
+    <string name="neptune_equatorial_radius_short">R Neptunus</string>
+    <string name="sun_equatorial_radius">Radius matahari</string>
+    <string name="sun_equatorial_radius_short">R Matahari</string>
+
+    <!-- Mass -->
+    <string name="electron_mass_rest">Massa elektron</string>
+    <string name="electron_mass_rest_short">me</string>
+    <string name="atomic_mass_unit">Dalton</string>
+    <string name="atomic_mass_unit_short">u</string>
+    <string name="milligram">Miligram</string>
+    <string name="milligram_short">mg</string>
+    <string name="gram">Gram</string>
+    <string name="gram_short">g</string>
+    <string name="kilogram">Kilogram</string>
+    <string name="kilogram_short">kg</string>
+    <string name="metric_ton">Ton metrik</string>
+    <string name="metric_ton_short">t</string>
+    <string name="imperial_ton">Ton imperial</string>
+    <string name="imperial_ton_short">t (UK)</string>
+    <string name="pound">Pon</string>
+    <string name="pound_short">lbs</string>
+    <string name="ounce">Ons</string>
+    <string name="ounce_short">oz</string>
+    <string name="carat">Karat</string>
+    <string name="carat_short">ct</string>
+    <string name="mercury_mass">Massa merkurius</string>
+    <string name="mercury_mass_short">M Merkurius</string>
+    <string name="venus_mass">Massa venus</string>
+    <string name="venus_mass_short">M Venus</string>
+    <string name="earth_mass">Massa bumi</string>
+    <string name="earth_mass_short">M Bumi</string>
+    <string name="mars_mass">Massa mars</string>
+    <string name="mars_mass_short">M Mars</string>
+    <string name="jupiter_mass">Massa jupiter</string>
+    <string name="jupiter_mass_short">M Jupiter</string>
+    <string name="saturn_mass">Massa saturnus</string>
+    <string name="saturn_mass_short">M Saturnus</string>
+    <string name="uranus_mass">Massa uranus</string>
+    <string name="uranus_mass_short">M Uranus</string>
+    <string name="neptune_mass">Massa Neptunus</string>
+    <string name="neptune_mass_short">M Neptunus</string>
+    <string name="sun_mass">Massa matahari</string>
+    <string name="sun_mass_short">M Matahari</string>
+
+    <!-- Temperature -->
+    <string name="celsius">Celcius</string>
+    <string name="fahrenheit">Fahrenheit</string>
+    <string name="kelvin">Kelvin</string>
+
+    <!-- Speed -->
+    <string name="millimeter_per_hour">Milimeter/jam</string>
+    <string name="millimeter_per_hour_short">mm/j</string>
+    <string name="millimeter_per_minute">Milimeter/menit</string>
+    <string name="millimeter_per_minute_short">mm/m</string>
+    <string name="millimeter_per_second">Milimeter/detik</string>
+    <string name="millimeter_per_second_short">mm/d</string>
+    <string name="centimeter_per_hour">Sentimeter/j</string>
+    <string name="centimeter_per_hour_short">cm/j</string>
+    <string name="centimeter_per_minute">Sentimeter/menit</string>
+    <string name="centimeter_per_minute_short">cm/m</string>
+    <string name="centimeter_per_second">Sentimeter/detik</string>
+    <string name="centimeter_per_second_short">cm/d</string>
+    <string name="meter_per_hour">Meter/jam</string>
+    <string name="meter_per_hour_short">m/j</string>
+    <string name="meter_per_minute">Meter/menit</string>
+    <string name="meter_per_minute_short">m/m</string>
+    <string name="meter_per_second">Meter/detik</string>
+    <string name="meter_per_second_short">m/d</string>
+    <string name="kilometer_per_hour">Kilometer/jam</string>
+    <string name="kilometer_per_hour_short">km/j</string>
+    <string name="kilometer_per_minute">Kilometer/menit</string>
+    <string name="kilometer_per_minute_short">km/m</string>
+    <string name="kilometer_per_second">Kilometer/detik</string>
+    <string name="kilometer_per_second_short">km/d</string>
+    <string name="foot_per_hour">Kaki/jam</string>
+    <string name="foot_per_hour_short">ft/j</string>
+    <string name="foot_per_minute">Kaki/menit</string>
+    <string name="foot_per_minute_short">ft/m</string>
+    <string name="foot_per_second">Kaki/detik</string>
+    <string name="foot_per_second_short">ft/d</string>
+    <string name="yard_per_hour">Yard/jam</string>
+    <string name="yard_per_hour_short">yd/j</string>
+    <string name="yard_per_minute">Yard/menit</string>
+    <string name="yard_per_minute_short">yd/m</string>
+    <string name="yard_per_second">Yard/detik</string>
+    <string name="yard_per_second_short">yd/d</string>
+    <string name="mile_per_hour">Mil/jam</string>
+    <string name="mile_per_hour_short">mi/j</string>
+    <string name="mile_per_minute">Mil/menit</string>
+    <string name="mile_per_minute_short">mi/m</string>
+    <string name="mile_per_second">Mil/detik</string>
+    <string name="mile_per_second_short">mi/d</string>
+    <string name="knot">Knot</string>
+    <string name="knot_short">kt</string>
+    <string name="velocity_of_light_in_vacuum">Kecepatan cahaya dalam ruang hampa</string>
+    <string name="cosmic_velocity_first">Percepatan kosmik pertama</string>
+    <string name="cosmic_velocity_second">Percepatan kosmik kedua</string>
+    <string name="cosmic_velocity_third">Percepatan kosmik ketiga</string>
+    <string name="earths_orbital_speed">Kecepatan rotasi bumi</string>
+    <string name="mach">Mach</string>
+    <string name="mach_si_standard">Mach (SI)</string>
+
+    <!-- File size -->
+    <string name="bit">Bit</string>
+    <string name="bit_short">b</string>
+    <string name="kibibit">Kibibit</string>
+    <string name="kibibit_short">Kib</string>
+    <string name="kilobit">Kilobit</string>
+    <string name="kilobit_short">Kb</string>
+    <string name="megabit">Megabit</string>
+    <string name="megabit_short">Mb</string>
+    <string name="mebibit">Mebibit</string>
+    <string name="mebibit_short">Mib</string>
+    <string name="gigabit">Gigabit</string>
+    <string name="gigabit_short">Gb</string>
+    <string name="terabit">Terabit</string>
+    <string name="terabit_short">Tb</string>
+    <string name="petabit">Petabit</string>
+    <string name="petabit_short">Pb</string>
+    <string name="exabit">Eksabit</string>
+    <string name="exabit_short">Eb</string>
+    <string name="byte_">Bita</string>
+    <string name="byte_short">B</string>
+    <string name="kibibyte">Kibibita</string>
+    <string name="kibibyte_short">KiB</string>
+    <string name="kilobyte">Kliobita</string>
+    <string name="kilobyte_short">KB</string>
+    <string name="megabyte">Megabita</string>
+    <string name="megabyte_short">MB</string>
+    <string name="mebibyte">Mebibita</string>
+    <string name="mebibyte_short">MiB</string>
+    <string name="gigabyte">Gigabita</string>
+    <string name="gigabyte_short">GB</string>
+    <string name="terabyte">Terabita</string>
+    <string name="terabyte_short">TB</string>
+    <string name="petabyte">Petabita</string>
+    <string name="petabyte_short">PB</string>
+    <string name="exabyte">Eksabita</string>
+    <string name="exabyte_short">EB</string>
+
+    <!-- Data transfer -->
+    <string name="bit_per_second">Bit/detik</string>
+    <string name="bit_per_second_short">b/d</string>
+    <string name="kibibit_per_second">Kibibit/detik</string>
+    <string name="kibibit_per_second_short">Kib/d</string>
+    <string name="kilobit_per_second">Kilobit/detik</string>
+    <string name="kilobit_per_second_short">Kb/d</string>
+    <string name="megabit_per_second">Megabit/detik</string>
+    <string name="megabit_per_second_short">Mb/d</string>
+    <string name="mebibit_per_second">Mebibit/detik</string>
+    <string name="mebibit_per_second_short">Mib/d</string>
+    <string name="gigabit_per_second">Gigabit/detik</string>
+    <string name="gigabit_per_second_short">Gb/d</string>
+    <string name="terabit_per_second">Terabit/detik</string>
+    <string name="terabit_per_second_short">Tb/d</string>
+    <string name="petabit_per_second">Petabit/detik</string>
+    <string name="petabit_per_second_short">Pb/d</string>
+    <string name="exabit_per_second">Eksabit/detik</string>
+    <string name="exabit_per_second_short">Eb/d</string>
+    <string name="byte_per_second">Bita/detik</string>
+    <string name="byte_per_second_short">B/d</string>
+    <string name="kibibyte_per_second">Kibibita/detik</string>
+    <string name="kibibyte_per_second_short">KiB/d</string>
+    <string name="kilobyte_per_second">Kilobita/detik</string>
+    <string name="kilobyte_per_second_short">KB/d</string>
+    <string name="megabyte_per_second">Megabita/detik</string>
+    <string name="megabyte_per_second_short">MB/d</string>
+    <string name="mebibyte_per_second">Mebibita/detik</string>
+    <string name="mebibyte_per_second_short">MiB/d</string>
+    <string name="gigabyte_per_second">Gigabita/detik</string>
+    <string name="gigabyte_per_second_short">GB/d</string>
+    <string name="terabyte_per_second">Terabita/detik</string>
+    <string name="terabyte_per_second_short">TB/d</string>
+    <string name="petabyte_per_second">Petabita/detik</string>
+    <string name="petabyte_per_second_short">PB/d</string>
+    <string name="exabyte_per_second">Eksabita/detik</string>
+    <string name="exabyte_per_second_short">EB/d</string>
+
+    <!-- Volume -->
+    <string name="attoliter">Atoliter</string>
+    <string name="attoliter_short">aL</string>
+    <string name="milliliter">Mililiter</string>
+    <string name="milliliter_short">mL</string>
+    <string name="liter">Liter</string>
+    <string name="liter_short">L</string>
+    <string name="us_liquid_gallon_short">gal (AS)</string>
+    <string name="imperial_gallon_short">gal (UK)</string>
+    <string name="cubic_millimeter">Milimeter kubik</string>
+    <string name="cubic_millimeter_short">mm^3</string>
+    <string name="cubic_centimeter">Sentimeter kubik</string>
+    <string name="cubic_centimeter_short">cm^3</string>
+    <string name="cubic_meter">Meter kubik</string>
+    <string name="cubic_meter_short">m^3</string>
+    <string name="cubic_kilometer">Kilometer kubik</string>
+    <string name="cubic_kilometer_short">km^3</string>
+
+    <!-- Time -->
+    <string name="attosecond">Atodetik</string>
+    <string name="attosecond_short">ad</string>
+    <string name="nanosecond">Nanodetik</string>
+    <string name="nanosecond_short">nd</string>
+    <string name="microsecond">Mikrodetik</string>
+    <string name="microsecond_short">µd</string>
+    <string name="millisecond">Milidetik</string>
+    <string name="millisecond_short">md</string>
+    <string name="second">Detik</string>
+    <string name="second_short">d</string>
+    <string name="minute">Menit</string>
+    <string name="minute_short">m</string>
+    <string name="hour">Jam</string>
+    <string name="hour_short">j</string>
+    <string name="day">Hari</string>
+    <string name="day_short">h</string>
+    <string name="week">Minggu</string>
+    <string name="week_short">m</string>
+    <string name="electron_cross_section_short">ecs</string>
+    <string name="acre">Are</string>
+    <string name="acre_short">ac</string>
+    <string name="hectare">Hektare</string>
+    <string name="hectare_short">ha</string>
+    <string name="square_foot">Kaki persegi</string>
+    <string name="square_foot_short">ft^2</string>
+    <string name="square_mile">Mil persegi</string>
+    <string name="square_mile_short">mi^2</string>
+    <string name="square_yard">Yard persegi</string>
+    <string name="square_yard_short">yd^2</string>
+    <string name="square_inch">Inci persegi</string>
+    <string name="square_inch_short">in^2</string>
+    <string name="square_micrometer">Mikrometer persegi</string>
+    <string name="square_micrometer_short">µm^2</string>
+    <string name="square_millimeter">Milimeter persegi</string>
+    <string name="square_millimeter_short">mm^2</string>
+    <string name="square_centimeter">Sentimeter persegi</string>
+    <string name="square_centimeter_short">cm^2</string>
+    <string name="square_decimeter">Desimeter persegi</string>
+    <string name="square_decimeter_short">dm^2</string>
+    <string name="square_meter">Meter persegi</string>
+    <string name="square_meter_short">m^2</string>
+    <string name="square_kilometer">Kilometer persegi</string>
+    <string name="square_kilometer_short">km^2</string>
+
+    <!-- Energy -->
+    <string name="electron_volt">Volt elektron</string>
+    <string name="electron_volt_short">eV</string>
+    <string name="attojoule">Atojoule</string>
+    <string name="attojoule_short">aJ</string>
+    <string name="energy_horse_power_metric">Tenaga kuda</string>
+    <string name="energy_horse_power_metric_short">hp</string>
+    <string name="joule">Joule</string>
+    <string name="joule_short">J</string>
+    <string name="kilojoule">Kilojoule</string>
+    <string name="kilojoule_short">kJ</string>
+    <string name="gigajoule">Megajoule</string>
+    <string name="gigajoule_short">MJ</string>
+    <string name="megajoule">Gigajoule</string>
+    <string name="megajoule_short">GJ</string>
+    <string name="energy_ton">Ton TNT</string>
+    <string name="energy_ton_short">t</string>
+    <string name="kiloton">Kiloton TNT</string>
+    <string name="kiloton_short">kt</string>
+    <string name="megaton">Megaton TNT</string>
+    <string name="megaton_short">Mt</string>
+    <string name="gigaton">Gigaton TNT</string>
+    <string name="gigaton_short">Gt</string>
+    <string name="calorie_th">Kalori (th)</string>
+    <string name="calorie_th_short">kal</string>
+    <string name="kilocalorie_th">Kilokalori</string>
+    <string name="kilocalorie_th_short">kkal</string>
+
+    <!-- Power -->
+    <string name="attowatt">Atowatt</string>
+    <string name="attowatt_short">aW</string>
+    <string name="watt">Watt</string>
+    <string name="watt_short">W</string>
+    <string name="kilowatt">Kilowatt</string>
+    <string name="kilowatt_short">kW</string>
+    <string name="megawatt">Megawatt</string>
+    <string name="megawatt_short">MW</string>
+    <string name="horse_power_mechanical">Tenagakuda</string>
+    <string name="horse_power_mechanical_short">hp</string>
+
+    <!-- Angle -->
+    <string name="angle_second">Detik</string>
+    <string name="angle_minute">Menit</string>
+    <string name="degree">Derajat</string>
+    <string name="radian">Radian</string>
+    <string name="radian_short">rad</string>
+    <string name="sextant">Sekstan</string>
+    <string name="sextant_short">sxt</string>
+
+    <!-- Pressure -->
+    <string name="attopascal">Atopascal</string>
+    <string name="attopascal_short">aPa</string>
+    <string name="femtopascal">Femtopascal</string>
+    <string name="femtopascal_short">fPa</string>
+    <string name="picopascal">Pikopascal</string>
+    <string name="picopascal_short">pPa</string>
+    <string name="nanopascal">Nanopascal</string>
+    <string name="nanopascal_short">nPa</string>
+    <string name="micropascal">Mikropascal</string>
+    <string name="micropascal_short">µPa</string>
+    <string name="millipascal">Milipascal</string>
+    <string name="millipascal_short">mPa</string>
+    <string name="centipascal">Sentipascal</string>
+    <string name="centipascal_short">cPa</string>
+    <string name="decipascal">Desipascal</string>
+    <string name="decipascal_short">dPa</string>
+    <string name="pascal">Pascal</string>
+    <string name="pascal_short">Pa</string>
+    <string name="dekapascal">Dekapascal</string>
+    <string name="dekapascal_short">daPa</string>
+    <string name="hectopascal">Hektopascal</string>
+    <string name="hectopascal_short">hPa</string>
+    <string name="bar">Bar</string>
+    <string name="bar_short">bar</string>
+    <string name="megapascal">Megapascal</string>
+    <string name="megapascal_short">MPa</string>
+    <string name="gigapascal">Gigapascal</string>
+    <string name="gigapascal_short">GPa</string>
+    <string name="terapascal">Terapascal</string>
+    <string name="terapascal_short">TPa</string>
+    <string name="petapascal">Petapascal</string>
+    <string name="petapascal_short">PPa</string>
+    <string name="exapascal">Eksapascal</string>
+    <string name="exapascal_short">EPa</string>
+    <string name="psi">Pon/inci persegi</string>
+    <string name="ksi">Kilopon/inci persegi</string>
+    <string name="millimeter_of_mercury_short">mm Hg</string>
+
+    <!-- Acceleration -->
+    <string name="attometer_per_square_second">Atometer/detik persegi</string>
+    <string name="attometer_per_square_second_short">am/d^2</string>
+    <string name="femtometer_per_square_second">Femtometer/detik persegi</string>
+    <string name="femtometer_per_square_second_short">fm/d^2</string>
+    <string name="picometer_per_square_second">Pikometer/detik persegi</string>
+    <string name="picometer_per_square_second_short">pm/d^2</string>
+    <string name="nanometer_per_square_second">Nanometer/detik persegi</string>
+    <string name="nanometer_per_square_second_short">nm/d^2</string>
+    <string name="micrometer_per_square_second">Mikrometer/detik persegi</string>
+    <string name="micrometer_per_square_second_short">µm/d^2</string>
+    <string name="millimeter_per_square_second">Milimeter/detik persegi</string>
+    <string name="millimeter_per_square_second_short">mm/d^2</string>
+    <string name="centimeter_per_square_second">Sentimeter/detik persegi</string>
+    <string name="centimeter_per_square_second_short">cm/d^2</string>
+    <string name="decimeter_per_square_second">Desimeter/detik persegi</string>
+    <string name="decimeter_per_square_second_short">dm/d^2</string>
+    <string name="meter_per_square_second">Meter/detik persegi</string>
+    <string name="meter_per_square_second_short">m/d^2</string>
+    <string name="kilometer_per_square_second">Kilometer/detik persegi</string>
+    <string name="kilometer_per_square_second_short">km/d^2</string>
+    <string name="dekameter_per_square_second">Dekameter/detik persegi</string>
+    <string name="dekameter_per_square_second_short">dam/d^2</string>
+    <string name="hectometer_per_square_second">Hektometer/detik persegi</string>
+    <string name="hectometer_per_square_second_short">hm/d^2</string>
+    <string name="gal">Gal</string>
+    <string name="gal_short">Gal</string>
+    <string name="mercury_surface_gravity">Gravitasi merkurius</string>
+    <string name="mercury_surface_gravity_short">G Merkurius</string>
+    <string name="venus_surface_gravity">Gravitasi venus</string>
+    <string name="venus_surface_gravity_short">G Venus</string>
+    <string name="earth_surface_gravity">Gravitasi bumi</string>
+    <string name="earth_surface_gravity_short">G Bumi</string>
+    <string name="mars_surface_gravity">Gravitasi mars</string>
+    <string name="mars_surface_gravity_short">G Mars</string>
+    <string name="jupiter_surface_gravity">Gravitasi jupiter</string>
+    <string name="jupiter_surface_gravity_short">G Jupiter</string>
+    <string name="saturn_surface_gravity">Gravitasi saturnus</string>
+    <string name="saturn_surface_gravity_short">G Saturnus</string>
+    <string name="uranus_surface_gravity">Gravitasi uranus</string>
+    <string name="uranus_surface_gravity_short">G Uranus</string>
+    <string name="neptune_surface_gravity">Gravitasi neptunus</string>
+    <string name="neptune_surface_gravity_short">G Neptunus</string>
+    <string name="sun_surface_gravity">Gravitasi matahari</string>
+    <string name="sun_surface_gravity_short">G Matahari</string>
+    <string name="currency_ada">Cardano</string>
+    <string name="currency_aed">Dirham Uni Emirat Arab</string>
+    <string name="currency_ars">Peso Argentina</string>
+    <string name="currency_aud">Dolar Australia</string>
+    <string name="currency_bbd">Dolar Bajan</string>
+    <string name="currency_bhd">Dinar Bahrain</string>
+    <string name="currency_bmd">Dolar Bermuda</string>
+    <string name="currency_bnd">Dolar Brunei</string>
+    <string name="currency_bsd">Dolar Bahama</string>
+    <string name="currency_byn">Rubel Belarusia Baru</string>
+    <string name="currency_byr">Rubel Belarusia</string>
+    <string name="currency_cad">Dolar Kanada</string>
+    <string name="currency_cny">Yuan Cina</string>
+    <string name="currency_cop">Peso Kolombia</string>
+    <string name="currency_cup">Peso Kuba</string>
+    <string name="currency_dop">Peso Dominika</string>
+    <string name="currency_dzd">Dinar Algeria</string>
+    <string name="currency_egp">Pound Mesir</string>
+    <string name="currency_eur">Euro</string>
+    <string name="currency_fjd">Dolar Fiji</string>
+    <string name="currency_fkp">Pound Kepulauan Falkland</string>
+    <string name="currency_gbp">Poundsterling</string>
+    <string name="currency_gip">Pound Gibraltar</string>
+    <string name="currency_gyd">Dolar Guyana</string>
+    <string name="currency_hkd">Dolar Hongkong</string>
+    <string name="currency_idr">Rupiah Indonesia</string>
+    <string name="currency_inr">Rupe India</string>
+    <string name="currency_iqd">Dinar Irak</string>
+    <string name="currency_irr">Rial Iran</string>
+    <string name="currency_jmd">Dolar Jamaika</string>
+    <string name="currency_jod">Dinar Yordania</string>
+    <string name="currency_jpy">Yen Jepang</string>
+    <string name="currency_kpw">Won Korea Utara</string>
+    <string name="currency_krw">Won Korea Selatan</string>
+    <string name="currency_kwd">Dinar Kuwait</string>
+    <string name="currency_kyd">Dolar Kepulauan Cayman</string>
+    <string name="currency_lkr">Rupe Sri Lanka</string>
+    <string name="currency_lrd">Dolar Liberia</string>
+    <string name="currency_lyd">Dinar Libya</string>
+    <string name="currency_mad">Dirham Moroko</string>
+    <string name="currency_mur">Rupe Mauritania</string>
+    <string name="currency_mxn">Peso Meksiko</string>
+    <string name="currency_myr">Ringgit Malaysia</string>
+    <string name="currency_nad">Dolar Namibia</string>
+    <string name="currency_npr">Rupe Nepal</string>
+    <string name="currency_nzd">Dolar Selandia Baru</string>
+    <string name="currency_omr">Rial Oman</string>
+    <string name="currency_pen">Sol</string>
+    <string name="currency_php">Peso Filipina</string>
+    <string name="currency_pkr">Rupe Pakistan</string>
+    <string name="currency_qar">Rial Qatar</string>
+    <string name="currency_rsd">Dinar Serbia</string>
+    <string name="currency_rub">Rubel Rusia</string>
+    <string name="currency_sar">Riyal Saudi</string>
+    <string name="currency_sbd">Dolar Kepulauan Solomon</string>
+    <string name="currency_sdg">Pound Sudan</string>
+    <string name="currency_sek">Krona Swedia</string>
+    <string name="currency_sgd">Dolar Singapura</string>
+    <string name="currency_shib">Shiba Inu</string>
+    <string name="currency_srd">Dolar Suriname</string>
+    <string name="currency_theta">Theta</string>
+    <string name="currency_tnd">Dinar Tunisia</string>
+    <string name="currency_try">Lira Turki</string>
+    <string name="currency_ttd">Dolar Trinidad &amp; Tobago</string>
+    <string name="currency_twd">Dolar Taiwan Baru</string>
+    <string name="currency_uni">Universe</string>
+    <string name="currency_usd">Dolar Amerika Serikat</string>
+    <string name="currency_uyu">Peso Uruguay</string>
+    <string name="currency_vnd">Dong Vietnam</string>
+    <string name="currency_xcd">Dolar Karibia Timur</string>
+    <string name="currency_yer">Rial Yaman</string>
+    <string name="currency_zwl">Dolar Zimbabwe</string>
+
+    <!-- Groups -->
+    <string name="length">Panjang</string>
+    <string name="time">Waktu</string>
+    <string name="volume">Volume</string>
+    <string name="area">Area</string>
+    <string name="temperature">Temperatur</string>
+    <string name="speed">Kecepatan</string>
+    <string name="mass">Massa</string>
+    <string name="data">Data</string>
+    <string name="energy">Energi</string>
+    <string name="power">Daya</string>
+    <string name="angle">Sudut</string>
+    <string name="data_transfer">Transfer data</string>
+    <string name="pressure">Tekanan</string>
+    <string name="acceleration">Akselerasi</string>
+    <string name="currency">Mata Uang</string>
+
+    <!-- Screen names -->
+    <string name="units_screen_from">Ubah dari</string>
+    <string name="units_screen_to">Ubah ke</string>
+    <string name="settings_screen">Pengaturan</string>
+
+    <!-- Settings items -->
+    <string name="theme_setting">Tema</string>
+    <string name="separator_setting">Pemisah</string>
+    <string name="exponential_notation_setting">Notasi eksponensial</string>
+    <string name="unit_groups_setting">Grup unit</string>
+    <string name="currency_rates_note_setting">Nilai tukar mata uang salah?</string>
+    <string name="terms_and_conditions">Syarat dan Ketentuan</string>
+    <string name="privacy_policy">Kebijakan Privasi</string>
+    <string name="third_party_licenses">Lisensi pihak ketiga</string>
+    <string name="rate_this_app">Nilai aplikasi ini</string>
+    <string name="formatting_setting">Pemformatan</string>
+    <string name="max_precision">%1$s (Maks)</string>
+
+    <!-- Separator -->
+    <string name="separator_setting_support">Simbol pemisah grup</string>
+    <string name="period">Titik</string>
+    <string name="comma">Koma</string>
+    <string name="space">Spasi</string>
+
+    <!-- Output format -->
+    <string name="exponential_notation_setting_support">Ganti sebagian angka dengan E</string>
+
+    <!-- Theme -->
+    <string name="theme_setting_support">Penampilan aplikasi</string>
+    <string name="auto_label">Otomatis</string>
+    <string name="force_light_mode">Terang</string>
+    <string name="force_dark_mode">Gelap</string>
+    <string name="color_theme">Tema warna</string>
+    <string name="force_amoled_mode">Gelap AMOLED</string>
+    <string name="force_amoled_mode_support">Gunakan latar hitam untuk tema gelap</string>
+    <string name="enable_dynamic_colors">Warna dinamis</string>
+    <string name="enable_dynamic_colors_support">Gunakan warna dari wallpaper Anda</string>
+
+    <!-- MISC. -->
+    <string name="loading_label">Memuat…</string>
+    <string name="error_label">Galat</string>
+    <string name="copied">%1$s disalin!</string>
+    <string name="cancel_label">Batal</string>
+    <string name="search_bar_placeholder">Cari unit</string>
+    <string name="search_placeholder">Hasil tidak ditemukan</string>
+    <string name="search_placeholder_button_label">Buka pengaturan</string>
+    <string name="hello_label">Halo!</string>
+    <string name="enabled_label">Aktif</string>
+    <string name="disabled_label">Nonaktif</string>
+    <string name="checked_filter_description">Filter yang dipilih</string>
+    <string name="open_settings_description">Buka pengaturan</string>
+    <string name="swap_units_description">Tukar unit</string>
+    <string name="search_button_description">Tombol cari</string>
+    <string name="clear_input_description">Hapus masukan</string>
+    <string name="favorite_button_description">Tambah atau hapus unit dari favorit</string>
+    <string name="empty_search_result_description">Hapus hasil pencarian</string>
+    <string name="drop_down_description">Buka atau tutup menu dropdown</string>
+    <string name="enable_unit_group_description">Aktifkan grup unit</string>
+    <string name="reorder_unit_group_description">Urutkan grup unit</string>
+    <string name="disable_unit_group_description">Nonaktifkan grup unit</string>
+    <string name="app_version_name_setting">Nama versi</string>
+    <string name="about_unitto">Tentang Unitto</string>
+    <string name="about_unitto_support">Pelajari tentang aplikasi</string>
+    <string name="unit_groups_support">Nonaktifkan dan urutkan ulang unit</string>
+    <string name="cent">Sen</string>
+    <string name="cent_short">sen</string>
+
+    <!-- Flux -->
+    <string name="maxwell">Maxwell</string>
+    <string name="maxwell_short">Mx</string>
+    <string name="weber">Weber</string>
+    <string name="weber_short">Wb</string>
+    <string name="milliweber">Miliweber</string>
+    <string name="milliweber_short">mWb</string>
+    <string name="microweber">Mikroweber</string>
+    <string name="microweber_short">μWb</string>
+    <string name="kiloweber">Kiloweber</string>
+    <string name="kiloweber_short">kWb</string>
+    <string name="megaweber">Megaweber</string>
+    <string name="megaweber_short">MWb</string>
+    <string name="gigaweber">Gigaweber</string>
+    <string name="gigaweber_short">GWb</string>
+    <string name="flux">Flux</string>
+    <string name="open_source">Lihat kode sumber</string>
+    <string name="translate_app">Terjemahkan apl ini</string>
+    <string name="translate_app_support">Gabung proyek POEditor untuk membantu</string>
+
+    <!-- Number base -->
+    <string name="binary">Biner</string>
+    <string name="decimal">Desimal</string>
+    <string name="tridecimal">Tridesimal</string>
+    <string name="tetradecimal">Tetradesimal</string>
+    <string name="pentadecimal">Pentadesimal</string>
+    <string name="hexadecimal">Heksadesimal</string>
+    <string name="enable_vibrations">Getaran</string>
+    <string name="millibar">Milibar</string>
+    <string name="millibar_short">mbar</string>
+    <string name="kilopascal">Kilopascal</string>
+    <string name="kilopascal_short">kPa</string>
+    <string name="micron_of_mercury_short">μmHg</string>
+
+    <!-- Calculator -->
+    <string name="calculator">Kalkulator</string>
+
+    <!-- Epoch -->
+    <string name="year_short">t</string>
+    <string name="month_short">b</string>
+    <string name="nautical_mile">Mil laut</string>
+    <string name="nautical_mile_short">M</string>
+    <string name="starting_screen_setting">Layar mulai</string>
+    <string name="starting_screen_setting_support">Pilih yang ditampilkan saat Anda membuka aplikasi</string>
+
+    <!-- Tools -->
+    <string name="unit_converter">Konverter unit</string>
+    <string name="calculator_clear_history_label">Hapus</string>
+    <string name="calculator_clear_history_title">Hapus riwayat</string>
+    <string name="calculator_clear_history_support">Semua ekspresi dari riwayat akan dihapus selamanya. Tindakan ini tidak bisa diurungkan!</string>
+    <string name="calculator_no_history">Tidak ada riwayat</string>
+    <string name="open_menu_description">Buka menu</string>
+    <string name="microgram">Mikrogram</string>
+    <string name="microgram_short">µg</string>
+
+    <!-- ELECTROSTATIC CAPACITANCE -->
+    <string name="attofarad">Atofarad</string>
+    <string name="attofarad_short">aF</string>
+    <string name="statfarad">Statfarad</string>
+    <string name="statfarad_short">stF</string>
+    <string name="farad">Farad</string>
+    <string name="farad_short">F</string>
+    <string name="exafarad">Eksafarad</string>
+    <string name="exafarad_short">EF</string>
+    <string name="picofarad">Pikofarad</string>
+    <string name="picofarad_short">pF</string>
+    <string name="nanofarad">Nanofarad</string>
+    <string name="nanofarad_short">nF</string>
+    <string name="microfarad">Mikrofarad</string>
+    <string name="microfarad_short">µF</string>
+    <string name="millifarad">Milifarad</string>
+    <string name="millifarad_short">mF</string>
+    <string name="kilofarad">Kilofarad</string>
+    <string name="kilofarad_short">kF</string>
+    <string name="megafarad">Megafarad</string>
+    <string name="megafarad_short">MF</string>
+    <string name="gigafarad">Gigafarad</string>
+    <string name="gigafarad_short">GF</string>
+    <string name="petafarad">Petafarad</string>
+    <string name="petafarad_short">PF</string>
+    <string name="prefix_zetta">Zeta</string>
+    <string name="prefix_zetta_short">Z</string>
+    <string name="prefix_exa">Eksa</string>
+    <string name="prefix_exa_short">E</string>
+    <string name="prefix_peta">Peta</string>
+    <string name="prefix_peta_short">P</string>
+    <string name="prefix_tera">Tera</string>
+    <string name="prefix_tera_short">T</string>
+    <string name="prefix_giga">Giga</string>
+    <string name="prefix_giga_short">G</string>
+    <string name="prefix_mega">Mega</string>
+    <string name="prefix_mega_short">M</string>
+    <string name="prefix_kilo">Kilo</string>
+    <string name="prefix_kilo_short">k</string>
+    <string name="prefix_hecto">Hekta</string>
+    <string name="prefix_hecto_short">h</string>
+    <string name="prefix_deca">Deka</string>
+    <string name="prefix_deca_short">da</string>
+    <string name="prefix_deci">Desi</string>
+    <string name="prefix_deci_short">d</string>
+    <string name="prefix_centi">Senti</string>
+    <string name="prefix_centi_short">c</string>
+    <string name="prefix_milli">Mili</string>
+    <string name="prefix_milli_short">m</string>
+    <string name="prefix_micro">Mikro</string>
+    <string name="prefix_micro_short">μ</string>
+    <string name="prefix_nano">Nano</string>
+    <string name="prefix_nano_short">n</string>
+    <string name="prefix_pico">Piko</string>
+    <string name="prefix_pico_short">p</string>
+    <string name="prefix_femto">Femto</string>
+    <string name="prefix_femto_short">f</string>
+    <string name="prefix_atto">Ato</string>
+    <string name="prefix_atto_short">a</string>
+    <string name="prefix_zepto_short">z</string>
+    <string name="prefix_yocto_short">y</string>
+    <string name="prefix_ronto_short">r</string>
+    <string name="prefix_quecto_short">q</string>
+
+    <!-- Force -->
+    <string name="newton">Newton</string>
+    <string name="newton_short">N</string>
+    <string name="kilonewton">Kilonewton</string>
+    <string name="kilonewton_short">kN</string>
+    <string name="gram_force_short">gf</string>
+    <string name="kilogram_force_short">kgf</string>
+    <string name="ton_force_short">tf</string>
+    <string name="millinewton">Milinewton</string>
+    <string name="millinewton_short">mN</string>
+    <string name="attonewton">Atonewton</string>
+    <string name="attonewton_short">aN</string>
+    <string name="joule_per_meter">Joule/meter</string>
+    <string name="joule_per_meter_short">J/m</string>
+    <string name="joule_per_centimeter">Joule/sentimeter</string>
+    <string name="joule_per_centimeter_short">J/cm</string>
+    <string name="kilopound_force_short">kipf</string>
+    <string name="pound_force_short">lbf</string>
+    <string name="ounce_force_short">ozf</string>
+    <string name="pond_short">p</string>
+    <string name="kilopond_short">kp</string>
+
+    <!-- Torque -->
+    <string name="newton_meter">Meter newton</string>
+    <string name="newton_meter_short">N*m</string>
+    <string name="newton_centimeter">Sentimeter newton</string>
+    <string name="newton_centimeter_short">N*cm</string>
+    <string name="newton_millimeter">Milimeter newton</string>
+    <string name="newton_millimeter_short">N*mm</string>
+    <string name="kilonewton_meter">Meter kilonewton</string>
+    <string name="kilonewton_meter_short">kN*m</string>
+    <string name="dyne_meter_short">dyn*m</string>
+    <string name="dyne_centimeter_short">dyn*cm</string>
+    <string name="dyne_millimeter_short">dyn*mm</string>
+    <string name="kilogram_force_meter_short">kgf*m</string>
+    <string name="kilogram_force_centimeter_short">kgf*cm</string>
+    <string name="kilogram_force_millimeter_short">kgf*mm</string>
+    <string name="gram_force_meter_short">gf*m</string>
+    <string name="gram_force_centimeter_short">gf*cm</string>
+    <string name="gram_force_millimeter_short">gf*mm</string>
+    <string name="ounce_force_foot_short">ozf*ft</string>
+    <string name="ounce_force_inch_short">ozf*in</string>
+    <string name="pound_force_foot_short">lbf*ft</string>
+    <string name="pound_force_inch_short">lbf*in</string>
+
+    <!-- Flow rate -->
+    <string name="liter_per_hour">Liter/jam</string>
+    <string name="liter_per_hour_short">L/j</string>
+    <string name="liter_per_minute">Liter/menit</string>
+    <string name="liter_per_minute_short">L/m</string>
+    <string name="liter_per_second">Liter/detik</string>
+    <string name="liter_per_second_short">L/d</string>
+    <string name="milliliter_per_hour">Mililiter/jam</string>
+    <string name="milliliter_per_hour_short">mL/j</string>
+    <string name="milliliter_per_minute">Mililiter/menit</string>
+    <string name="milliliter_per_minute_short">mL/m</string>
+    <string name="milliliter_per_second">Mililiter/detik</string>
+    <string name="milliliter_per_second_short">mL/d</string>
+    <string name="cubic_meter_per_hour">Meter kubik/jam</string>
+    <string name="cubic_meter_per_hour_short">m3/j</string>
+    <string name="cubic_meter_per_minute">Meter kubik/menit</string>
+    <string name="cubic_meter_per_minute_short">m3/m</string>
+    <string name="cubic_meter_per_second">Meter kubik/detik</string>
+    <string name="cubic_meter_per_second_short">m3/d</string>
+    <string name="cubic_millimeter_per_hour">Milimeter kubik/jam</string>
+    <string name="cubic_millimeter_per_hour_short">mm3/j</string>
+    <string name="cubic_millimeter_per_minute">Milimeter kubik/menit</string>
+    <string name="cubic_millimeter_per_minute_short">mm3/m</string>
+    <string name="cubic_millimeter_per_second">Milimeter kubik/detik</string>
+    <string name="cubic_millimeter_per_second_short">mm3/d</string>
+    <string name="cubic_foot_per_hour">Kaki kubik/jam</string>
+    <string name="cubic_foot_per_hour_short">ft3/j</string>
+    <string name="cubic_foot_per_minute">Kaki kubik/menit</string>
+    <string name="cubic_foot_per_minute_short">ft3/m</string>
+    <string name="cubic_foot_per_second">Kaki kubik/detik</string>
+    <string name="cubic_foot_per_second_short">ft3/d</string>
+    <string name="gallon_per_hour_us_short">gal/j</string>
+    <string name="gallon_per_minute_us_short">gal/m</string>
+    <string name="gallon_per_second_us_short">gal/d</string>
+    <string name="gallon_per_hour_imperial_short">gal/j</string>
+    <string name="gallon_per_minute_imperial_short">gal/m</string>
+    <string name="gallon_per_second_imperial_short">gal/d</string>
+    <string name="candela_per_square_meter_short">cd/m^2</string>
+    <string name="candela_per_square_centimeter_short">cd/cm^2</string>
+    <string name="candela_per_square_foot_short">cd/ft^2</string>
+    <string name="candela_per_square_inch_short">cd/in^2</string>
+    <string name="kilocandela_per_square_meter_short">kcd</string>
+    <string name="stilb">Stilb</string>
+    <string name="stilb_short">sb</string>
+    <string name="lumen_per_square_meter_per_steradian_short">lm/m^2/sr</string>
+    <string name="lumen_per_square_centimeter_per_steradian_short">lm/cm^2/sr</string>
+    <string name="lumen_per_square_foot_per_steradian_short">lm/ft^2/sr</string>
+    <string name="watt_per_square_centimeter_per_steradian_short">W/cm^2/sr</string>
+    <string name="nit">Nit</string>
+    <string name="nit_short">nt</string>
+    <string name="millinit">Milinit</string>
+    <string name="millinit_short">mnt</string>
+    <string name="lambert">Lambert</string>
+    <string name="lambert_short">L</string>
+    <string name="millilambert">Mililambert</string>
+    <string name="millilambert_short">mL</string>
+    <string name="foot_lambert">Kaki-lambert</string>
+    <string name="foot_lambert_short">fL</string>
+    <string name="apostilb">Apostilb</string>
+    <string name="apostilb_short">asb</string>
+    <string name="blondel">Blondel</string>
+    <string name="blondel_short">blondel</string>
+    <string name="bril">Bril</string>
+    <string name="bril_short">bril</string>
+    <string name="skot">Skot</string>
+    <string name="skot_short">sk</string>
+    <string name="electrostatic_capacitance">Kapasitas</string>
+    <string name="prefix">Prefiks</string>
+    <string name="force">Gaya</string>
+    <string name="torque">Torsi</string>
+    <string name="flow_rate">Arus</string>
+    <string name="luminance">Kekuatan cahaya</string>
+    <string name="format_time">Format waktu</string>
+    <string name="format_time_support">Contoh: Tampilkan 130 menit sebagagai 2j 10m</string>
+    <string name="units_sorting">Urutan daftar unit</string>
+    <string name="units_sorting_support">Ubah urutan unit</string>
+    <string name="sort_by_alphabetical">Abjad</string>
+    <string name="sort_by_scale_desc">Skala (Turun)</string>
+    <string name="sort_by_scale_asc">Skala (Naik)</string>
+    <string name="color_theme_support">Pilih mode tema</string>
+    <string name="color_scheme">Skema warna</string>
+    <string name="selected_color">Warna terpilih</string>
+    <string name="monet_mode">Gaya terpilih</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/Gj9ZCNPXIfKddDQgccvboVFz.jpg 
+https://s3.eu-west-1.amazonaws.com/po-pub/i/prtM85P6x1fMuLg1I0zbkceo.png 
+
+Maybe this can be labeled better? Let me know. It should be something that can describe content of the Formatting screen. -->
+    <string name="formatting_setting_support">Tampilan angka dan kepresisian</string>
+    <string name="divide_by_zero_error">Tidak bisa dibagi dengan 0</string>
+    <string name="date_difference">Perbedaan tanggal</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/uWOHJmIq9riqsq7PO82ZQp3a.png -->
+    <string name="select_time">Pilih waktu</string>
+    <string name="date_difference_start">Mulai</string>
+    <string name="date_difference_end">Akhir</string>
+    <string name="date_difference_result">Perbedaan</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
+    <string name="date_difference_years">Tahun</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
+    <string name="date_difference_months">Bulan</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
+    <string name="date_difference_days">Hari</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
+    <string name="date_difference_hours">Jam</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
+    <string name="date_difference_minutes">Menit</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/9lSfdkfKShwyQFEF4nvbVaIb.jpg 
+
+Used in this dialog window. Should be short -->
+    <string name="next_label">Selanjutnya</string>
+    <string name="formatting_setting_preview_box_label">Pratinjau (klik untuk berganti)</string>
+    <string name="gibibit">Gibibit</string>
+    <string name="gibibit_short">Gib</string>
+    <string name="gibibyte">Gibibita</string>
+    <string name="gibibyte_short">GiB</string>
+    <string name="gibibit_per_second">Gibibit/detik</string>
+    <string name="gibibit_per_second_short">Gib/d</string>
+    <string name="gibibyte_per_second">Gibibita/detik</string>
+    <string name="gibibyte_per_second_short">GiB/d</string>
+    <string name="time_zone_screen">Zona waktu</string>
+    <string name="try_again_label">Klik untuk mencoba lagi</string>
+    <string name="tomorrow">Besok</string>
+    <string name="yesterday">Kemarin</string>
+    <string name="search_text_field_placeholder">Cari…</string>
+    <string name="add_time_zone_title">Tambah zona waktu</string>
+    <string name="middle_zero_option">Nol di tengah</string>
+    <string name="middle_zero_option_support">Tukar tombol desimal dan nol</string>
+    <string name="difference">Perbedaan</string>
+    <string name="add">Tambah</string>
+    <string name="subtract">Kurang</string>
+    <string name="date_calculator">Kalkulator Tanggal</string>
+</resources>
\ No newline at end of file
diff --git a/core/base/src/main/res/values-it/strings.xml b/core/base/src/main/res/values-it/strings.xml
index 89b828a7..aeefe8a4 100644
--- a/core/base/src/main/res/values-it/strings.xml
+++ b/core/base/src/main/res/values-it/strings.xml
@@ -63,7 +63,7 @@
     <string name="gram">Grammo</string>
     <string name="gram_short">g</string>
     <string name="kilogram">Chilogrammo</string>
-    <string name="kilogram_short">hg</string>
+    <string name="kilogram_short">kg</string>
     <string name="metric_ton">Tonnellata metrica</string>
     <string name="metric_ton_short">t</string>
     <string name="imperial_ton">Tonnellata imperiale</string>
@@ -101,45 +101,45 @@
     <!-- Speed -->
     <string name="millimeter_per_hour">Millimetro all\'ora</string>
     <string name="millimeter_per_hour_short">mm/h</string>
-    <string name="millimeter_per_minute">Millimetro al minuto</string>
+    <string name="millimeter_per_minute">Millimetro/minuto</string>
     <string name="millimeter_per_minute_short">mm/m</string>
-    <string name="millimeter_per_second">Millimetro al secondo</string>
+    <string name="millimeter_per_second">Millimetro/secondo</string>
     <string name="millimeter_per_second_short">mm/s</string>
     <string name="centimeter_per_hour">Centimetro all\'ora</string>
     <string name="centimeter_per_hour_short">cm/h</string>
-    <string name="centimeter_per_minute">Centimetro al minuto</string>
+    <string name="centimeter_per_minute">Centimetro/minuto</string>
     <string name="centimeter_per_minute_short">cm/m</string>
-    <string name="centimeter_per_second">Centimetro al secondo</string>
+    <string name="centimeter_per_second">Centimetro/secondo</string>
     <string name="centimeter_per_second_short">cm/s</string>
     <string name="meter_per_hour">Metro all\'ora</string>
     <string name="meter_per_hour_short">m/h</string>
-    <string name="meter_per_minute">Metro al minuto</string>
+    <string name="meter_per_minute">Metro/minuto</string>
     <string name="meter_per_minute_short">m/m</string>
-    <string name="meter_per_second">Metro al secondo</string>
+    <string name="meter_per_second">Metro/secondo</string>
     <string name="meter_per_second_short">m/s</string>
     <string name="kilometer_per_hour">Chilometro all\'ora</string>
     <string name="kilometer_per_hour_short">km/h</string>
-    <string name="kilometer_per_minute">Chilometro al minuto</string>
+    <string name="kilometer_per_minute">Chilometro/minuto</string>
     <string name="kilometer_per_minute_short">km/m</string>
-    <string name="kilometer_per_second">Chilometro al secondo</string>
+    <string name="kilometer_per_second">Chilometro/secondo</string>
     <string name="kilometer_per_second_short">km/s</string>
     <string name="foot_per_hour">Piede all\'ora</string>
     <string name="foot_per_hour_short">ft/h</string>
-    <string name="foot_per_minute">Piede al minuto</string>
+    <string name="foot_per_minute">Piede/minuto</string>
     <string name="foot_per_minute_short">ft/m</string>
-    <string name="foot_per_second">Piede al secondo</string>
+    <string name="foot_per_second">Piede/secondo</string>
     <string name="foot_per_second_short">ft/s</string>
     <string name="yard_per_hour">Iarda all\'ora</string>
     <string name="yard_per_hour_short">yd/h</string>
     <string name="yard_per_minute">Iarda al minuto</string>
     <string name="yard_per_minute_short">yd/m</string>
-    <string name="yard_per_second">Iarda al secondo</string>
+    <string name="yard_per_second">Iarda/secondo</string>
     <string name="yard_per_second_short">yd/s</string>
     <string name="mile_per_hour">Miglia all\'ora</string>
     <string name="mile_per_hour_short">mi/h</string>
     <string name="mile_per_minute">Miglia al minuto</string>
     <string name="mile_per_minute_short">mi/m</string>
-    <string name="mile_per_second">Miglia al secondo</string>
+    <string name="mile_per_second">Miglia/secondo</string>
     <string name="mile_per_second_short">mi/s</string>
     <string name="knot">Nodi</string>
     <string name="knot_short">kt</string>
@@ -190,41 +190,41 @@
     <string name="exabyte_short">EB</string>
 
     <!-- Data transfer -->
-    <string name="bit_per_second">Bit al secondo</string>
+    <string name="bit_per_second">Bit/secondo</string>
     <string name="bit_per_second_short">b/s</string>
-    <string name="kibibit_per_second">Kibibit al secondo</string>
+    <string name="kibibit_per_second">Kibibit/secondo</string>
     <string name="kibibit_per_second_short">Kib/s</string>
-    <string name="kilobit_per_second">Kilobit al secondo</string>
+    <string name="kilobit_per_second">Kilobit/secondo</string>
     <string name="kilobit_per_second_short">Kb/s</string>
-    <string name="megabit_per_second">Megabit al secondo</string>
+    <string name="megabit_per_second">Megabit/secondo</string>
     <string name="megabit_per_second_short">Mb/s</string>
-    <string name="mebibit_per_second">Mebibit al secondo</string>
+    <string name="mebibit_per_second">Mebibit/secondo</string>
     <string name="mebibit_per_second_short">Mib/s</string>
-    <string name="gigabit_per_second">Gigabit al secondo</string>
+    <string name="gigabit_per_second">Gigabit/secondo</string>
     <string name="gigabit_per_second_short">Gb/s</string>
-    <string name="terabit_per_second">Terabit al secondo</string>
+    <string name="terabit_per_second">Terabit/secondo</string>
     <string name="terabit_per_second_short">Tb/s</string>
-    <string name="petabit_per_second">Petabit al secondo</string>
+    <string name="petabit_per_second">Petabit/secondo</string>
     <string name="petabit_per_second_short">Pb/s</string>
-    <string name="exabit_per_second">Exabit al secondo</string>
+    <string name="exabit_per_second">Exabit/secondo</string>
     <string name="exabit_per_second_short">Eb/s</string>
-    <string name="byte_per_second">Byte al secondo</string>
+    <string name="byte_per_second">Byte/secondo</string>
     <string name="byte_per_second_short">B/s</string>
-    <string name="kibibyte_per_second">Kibibyte al secondo</string>
+    <string name="kibibyte_per_second">Kibibyte/secondo</string>
     <string name="kibibyte_per_second_short">KiB/s</string>
-    <string name="kilobyte_per_second">Kilobyte al secondo</string>
+    <string name="kilobyte_per_second">Kilobyte/secondo</string>
     <string name="kilobyte_per_second_short">KB/s</string>
-    <string name="megabyte_per_second">Megabyte al secondo</string>
+    <string name="megabyte_per_second">Megabyte/secondo</string>
     <string name="megabyte_per_second_short">MB/s</string>
-    <string name="mebibyte_per_second">Mebibyte al secondo</string>
+    <string name="mebibyte_per_second">Mebibyte/secondo</string>
     <string name="mebibyte_per_second_short">MiB/s</string>
-    <string name="gigabyte_per_second">Gigabyte al secondo</string>
+    <string name="gigabyte_per_second">Gigabyte/secondo</string>
     <string name="gigabyte_per_second_short">GB/s</string>
-    <string name="terabyte_per_second">Terabyte al secondo</string>
+    <string name="terabyte_per_second">Terabyte/secondo</string>
     <string name="terabyte_per_second_short">TB/s</string>
-    <string name="petabyte_per_second">Petabyte al secondo</string>
+    <string name="petabyte_per_second">Petabyte/secondo</string>
     <string name="petabyte_per_second_short">PB/s</string>
-    <string name="exabyte_per_second">Exabyte al secondo</string>
+    <string name="exabyte_per_second">Exabyte/secondo</string>
     <string name="exabyte_per_second_short">EB/s</string>
 
     <!-- Volume -->
@@ -234,7 +234,7 @@
     <string name="milliliter_short">mL</string>
     <string name="liter">Litro</string>
     <string name="liter_short">L</string>
-    <string name="us_liquid_gallon">Gallone USA</string>
+    <string name="us_liquid_gallon">Gallone US</string>
     <string name="us_liquid_gallon_short">gal (US)</string>
     <string name="us_liquid_quart">Quarto US</string>
     <string name="us_liquid_quart_short">qt (US)</string>
@@ -259,7 +259,7 @@
     <string name="imperial_fluid_ounce">Oncia liquida imperiale</string>
     <string name="imperial_fluid_ounce_short">fl oz (UK)</string>
     <string name="imperial_tablespoon">Cucchiaio imperiale</string>
-    <string name="imperial_tablespoon_short">Cucchiaino (UK)</string>
+    <string name="imperial_tablespoon_short">Cucchiaio (UK)</string>
     <string name="imperial_teaspoon">Cucchiaino imperiale</string>
     <string name="imperial_teaspoon_short">Cucchiaino (UK)</string>
     <string name="cubic_millimeter">Millimetro cubo</string>
@@ -344,9 +344,9 @@
     <string name="megaton_short">Mt</string>
     <string name="gigaton">Gigatone di TNT</string>
     <string name="gigaton_short">Gt</string>
-    <string name="calorie_th">Calorie (th)</string>
+    <string name="calorie_th">Caloria (th)</string>
     <string name="calorie_th_short">cal</string>
-    <string name="kilocalorie_th">Kilocalorie (th)</string>
+    <string name="kilocalorie_th">Chilocaloria (th)</string>
     <string name="kilocalorie_th_short">kcal</string>
 
     <!-- Power -->
@@ -400,7 +400,9 @@
     <string name="megapascal">Megapascal</string>
     <string name="megapascal_short">MPa</string>
     <string name="gigapascal">Gigapascal</string>
-    <string name="gigapascal_short">GPA</string>
+
+    <!-- it should be GPa, not GPA -->
+    <string name="gigapascal_short">GPa</string>
     <string name="terapascal">Terapascal</string>
     <string name="terapascal_short">TPa</string>
     <string name="petapascal">Petapascal</string>
@@ -641,11 +643,11 @@
     <string name="temperature">Temperatura</string>
     <string name="speed">Velocità</string>
     <string name="mass">Massa</string>
-    <string name="data">Data</string>
+    <string name="data">Dati</string>
     <string name="energy">Energia</string>
     <string name="power">Potenza</string>
     <string name="angle">Angolo</string>
-    <string name="data_transfer">Traferimenti dati</string>
+    <string name="data_transfer">Traferimento dati</string>
     <string name="pressure">Pressione</string>
     <string name="acceleration">Accelerazione</string>
     <string name="currency">Valuta</string>
@@ -744,7 +746,9 @@
     <string name="megaweber_short">MWb</string>
     <string name="gigaweber">Gigaweber</string>
     <string name="gigaweber_short">GWb</string>
-    <string name="flux">Flusso</string>
+
+    <!-- If flusso magnetico is too long it could be "Flusso magn." -->
+    <string name="flux">Flusso magnetico</string>
     <string name="open_source">Vedi codice sorgente</string>
     <string name="translate_app">Traduci questa app</string>
     <string name="translate_app_support">Unisciti al progetto POEditor per aiutare</string>
@@ -991,11 +995,17 @@
     <string name="cubic_foot_per_minute_short">ft3/m</string>
     <string name="cubic_foot_per_second">Piede cubo/secondo</string>
     <string name="cubic_foot_per_second_short">ft3/s</string>
-    <string name="gallon_per_hour_us">Gallone/ora (U.S.)</string>
+
+    <!-- It would be better written (US) without dots -->
+    <string name="gallon_per_hour_us">Gallone/ora (US)</string>
     <string name="gallon_per_hour_us_short">gal/h</string>
-    <string name="gallon_per_minute_us">Gallone/minuto (U.S.)</string>
+
+    <!-- It would be better written (US) without dots -->
+    <string name="gallon_per_minute_us">Gallone/minuto (US)</string>
     <string name="gallon_per_minute_us_short">gal/m</string>
-    <string name="gallon_per_second_us">Gallone/secondo (U.S.)</string>
+
+    <!-- It would be better written (US) without dots -->
+    <string name="gallon_per_second_us">Gallone/secondo (US)</string>
     <string name="gallon_per_second_us_short">gal/s</string>
     <string name="gallon_per_hour_imperial">Gallone/ora (Imperiale)</string>
     <string name="gallon_per_hour_imperial_short">gal/h</string>
@@ -1098,4 +1108,58 @@ Maybe this can be labeled better? Let me know. It should be something that can d
 Used in this dialog window. Should be short -->
     <string name="next_label">Avanti</string>
     <string name="formatting_setting_preview_box_label">Anteprima (tocca per cambiare)</string>
+    <string name="gibibit">Gibibit</string>
+    <string name="gibibit_short">Gib</string>
+    <string name="gibibyte">Gibibyte</string>
+    <string name="gibibyte_short">GiB</string>
+    <string name="gibibit_per_second">Gibibit/secondo</string>
+    <string name="gibibit_per_second_short">Gib/s</string>
+    <string name="gibibyte_per_second">Gibibyte/secondo</string>
+    <string name="gibibyte_per_second_short">GiB/s</string>
+    <string name="time_zone_screen">Fusi orari</string>
+    <string name="try_again_label">Click per riprovare</string>
+    <string name="tomorrow">Domani</string>
+    <string name="yesterday">Ieri</string>
+    <string name="search_text_field_placeholder">Cerca…</string>
+    <string name="add_time_zone_title">Aggiungi fuso orario</string>
+    <string name="middle_zero_option">Zero al centro</string>
+    <string name="middle_zero_option_support">Scambia pulsanti zero e decimali</string>
+    <string name="difference">Differenza</string>
+    <string name="add">Aggiungi</string>
+    <string name="subtract">Sottrai</string>
+    <string name="date_calculator">Calcolatore data</string>
+    <string name="language_setting">Lingua</string>
+    <string name="language_setting_support">Cambia lingua dell\'app</string>
+    <string name="system_font_setting">Font di sistema</string>
+    <string name="system_font_setting_support">Usa font di sistema per i testi nell\'app</string>
+    <string name="fuel_consumption">Carburante</string>
+    <string name="km_per_l">Chilometro/litro</string>
+    <string name="km_per_l_short">km/L</string>
+    <string name="l_per_km">Litro/chilometro</string>
+    <string name="l_per_km_short">L/km</string>
+    <string name="l_per_100_km">Litro/100 chilometri</string>
+    <string name="l_per_100_km_short">L/100 km</string>
+    <string name="mi_per_gallon_uk">Miglia/gallone (UK)</string>
+    <string name="mi_per_gallon_uk_short">mpg (UK)</string>
+    <string name="mi_per_gallon_us">Miglia/gallone (US)</string>
+    <string name="mi_per_gallon_us_short">mpg (US)</string>
+    <string name="mi_us_per_l">Miglia/litro (US)</string>
+    <string name="mi_us_per_l_short">mi/L (US)</string>
+    <string name="gallon_us_per_mile">Gallone/miglio (US)</string>
+    <string name="gallon_us_per_mile_short">gal/mi (US)</string>
+    <string name="gallon_uk_per_mile">Gallone/miglio (UK)</string>
+    <string name="gallon_uk_per_mile_short">gal/mi (UK)</string>
+    <string name="gallon_us_per_100_mile">Gallone/100 miglia (US)</string>
+    <string name="gallon_us_per_100_mile_short">gal/100 mi (US)</string>
+    <string name="gallon_uk_per_100_mile">Gallone/100 miglia (UK)</string>
+    <string name="gallon_uk_per_100_mile_short">gal/100 mi (UK)</string>
+    <string name="partial_history_view_setting">Vista cronologia parziale</string>
+    <string name="partial_history_view_setting_support">Vedi ultimo risultato in cronologia</string>
+    <string name="calculator_settings_support">Vista cronologia</string>
+    <string name="converter_settings_support">Gruppi di unità, ordine, formato</string>
+    <string name="display_settings">Schermo</string>
+    <string name="clear_cache">Pulisci cache</string>
+
+    <!-- Option name to use system default setting -->
+    <string name="system">Sistema</string>
 </resources>
\ No newline at end of file
diff --git a/core/base/src/main/res/values-nl/strings.xml b/core/base/src/main/res/values-nl/strings.xml
new file mode 100644
index 00000000..498cfd86
--- /dev/null
+++ b/core/base/src/main/res/values-nl/strings.xml
@@ -0,0 +1,1121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Length -->
+    <string name="attometer">Attometer</string>
+    <string name="attometer_short">am</string>
+    <string name="nanometer">Nanometer</string>
+    <string name="nanometer_short">nm</string>
+    <string name="micrometer">Micrometer</string>
+    <string name="micrometer_short">µm</string>
+    <string name="millimeter">Millimeter</string>
+    <string name="millimeter_short">mm</string>
+    <string name="centimeter">Centimeter</string>
+    <string name="centimeter_short">cm</string>
+    <string name="decimeter">Decimeter</string>
+    <string name="decimeter_short">dm</string>
+    <string name="meter">Meter</string>
+    <string name="meter_short">m</string>
+    <string name="kilometer">Kilometer</string>
+    <string name="kilometer_short">km</string>
+    <string name="mile">Mijl</string>
+    <string name="mile_short">mi</string>
+    <string name="yard">Yard</string>
+    <string name="yard_short">yd</string>
+    <string name="foot">Voet</string>
+    <string name="foot_short">ft</string>
+    <string name="inch">Inch</string>
+    <string name="inch_short">in</string>
+    <string name="light_year">Lichtjaar</string>
+    <string name="light_year_short">lj</string>
+    <string name="parsec">Parsec</string>
+    <string name="parsec_short">ps</string>
+    <string name="kiloparsec">Kiloparsec</string>
+    <string name="kiloparsec_short">kpc</string>
+    <string name="megaparsec">Megaparsec</string>
+    <string name="megaparsec_short">Mpc</string>
+    <string name="mercury_equatorial_radius">Mercurius equatoriale straal</string>
+    <string name="mercury_equatorial_radius_short">Mercurius R</string>
+    <string name="venus_equatorial_radius">Venus equatoriale straal</string>
+    <string name="venus_equatorial_radius_short">Venus R</string>
+    <string name="earth_equatorial_radius">Aarde equatoriale straal</string>
+    <string name="earth_equatorial_radius_short">Aarde R</string>
+    <string name="mars_equatorial_radius">Mars equatoriale straal</string>
+    <string name="mars_equatorial_radius_short">Mars R</string>
+    <string name="jupiter_equatorial_radius">Jupiter equatoriale straal</string>
+    <string name="jupiter_equatorial_radius_short">Jupiter R</string>
+    <string name="saturn_equatorial_radius">Saturnus equatoriale straal</string>
+    <string name="saturn_equatorial_radius_short">Saturnus R</string>
+    <string name="uranus_equatorial_radius">Uranus equatoriale straal</string>
+    <string name="uranus_equatorial_radius_short">Uranus R</string>
+    <string name="neptune_equatorial_radius">Neptunus equatoriale straal</string>
+    <string name="neptune_equatorial_radius_short">Neptunus R</string>
+    <string name="sun_equatorial_radius">Zon equatoriale straal</string>
+    <string name="sun_equatorial_radius_short">Zon R</string>
+
+    <!-- Mass -->
+    <string name="electron_mass_rest">Elektronmassa</string>
+    <string name="electron_mass_rest_short">me</string>
+    <string name="atomic_mass_unit">Dalton</string>
+    <string name="atomic_mass_unit_short">u</string>
+    <string name="milligram">Milligram</string>
+    <string name="milligram_short">mg</string>
+    <string name="gram">Gram</string>
+    <string name="gram_short">g</string>
+    <string name="kilogram">Kilogram</string>
+    <string name="kilogram_short">kg</string>
+    <string name="metric_ton">Ton</string>
+    <string name="metric_ton_short">t</string>
+    <string name="imperial_ton">Anglo-Amerikaanse ton</string>
+    <string name="imperial_ton_short">t (UK)</string>
+    <string name="pound">Pond</string>
+    <string name="pound_short">lbs</string>
+    <string name="ounce">Ons</string>
+    <string name="ounce_short">oz</string>
+    <string name="carat">Karaat</string>
+    <string name="carat_short">cd</string>
+    <string name="mercury_mass">Mercuriusmassa</string>
+    <string name="mercury_mass_short">Mercurius M</string>
+    <string name="venus_mass">Venusmassa</string>
+    <string name="venus_mass_short">Venus M</string>
+    <string name="earth_mass">Aardmassa</string>
+    <string name="earth_mass_short">Aarde M</string>
+    <string name="mars_mass">Marsmassa</string>
+    <string name="mars_mass_short">Mars M</string>
+    <string name="jupiter_mass">Jupitermassa</string>
+    <string name="jupiter_mass_short">Jupiter M</string>
+    <string name="saturn_mass">Saturnusmassa</string>
+    <string name="saturn_mass_short">Saturnus M</string>
+    <string name="uranus_mass">Uranusmassa</string>
+    <string name="uranus_mass_short">Uranus M</string>
+    <string name="neptune_mass">Neptunusmassa</string>
+    <string name="neptune_mass_short">Neptunus M</string>
+    <string name="sun_mass">Zonsmassa</string>
+    <string name="sun_mass_short">Zon M</string>
+
+    <!-- Temperature -->
+    <string name="celsius">Celsius</string>
+    <string name="fahrenheit">Fahrenheit</string>
+    <string name="kelvin">Kelvin</string>
+
+    <!-- Speed -->
+    <string name="millimeter_per_hour">Millimeter/uur</string>
+    <string name="millimeter_per_hour_short">mm/h</string>
+    <string name="millimeter_per_minute">Millimeter/minuut</string>
+    <string name="millimeter_per_minute_short">mm/m</string>
+    <string name="millimeter_per_second">Millimeter/seconde</string>
+    <string name="millimeter_per_second_short">mm/s</string>
+    <string name="centimeter_per_hour">Centimeter/uur</string>
+    <string name="centimeter_per_hour_short">cm/h</string>
+    <string name="centimeter_per_minute">Centimeter/minuut</string>
+    <string name="centimeter_per_minute_short">cm/m</string>
+    <string name="centimeter_per_second">Centimeter/seconde</string>
+    <string name="centimeter_per_second_short">cm/s</string>
+    <string name="meter_per_hour">Meter/uur</string>
+    <string name="meter_per_hour_short">m/h</string>
+    <string name="meter_per_minute">Meter/minuut</string>
+    <string name="meter_per_minute_short">m/m</string>
+    <string name="meter_per_second">Meter/seconde</string>
+    <string name="meter_per_second_short">m/s</string>
+    <string name="kilometer_per_hour">Kilometer/uur</string>
+    <string name="kilometer_per_hour_short">km/h</string>
+    <string name="kilometer_per_minute">Kilometer/minuut</string>
+    <string name="kilometer_per_minute_short">km/m</string>
+    <string name="kilometer_per_second">Kilometer/seconde</string>
+    <string name="kilometer_per_second_short">km/s</string>
+    <string name="foot_per_hour">Voet/uur</string>
+    <string name="foot_per_hour_short">ft/h</string>
+    <string name="foot_per_minute">Voet/minuut</string>
+    <string name="foot_per_minute_short">ft/m</string>
+    <string name="foot_per_second">Voet/seconde</string>
+    <string name="foot_per_second_short">ft/s</string>
+    <string name="yard_per_hour">Yard/uur</string>
+    <string name="yard_per_hour_short">yd/h</string>
+    <string name="yard_per_minute">Yard/minuut</string>
+    <string name="yard_per_minute_short">yd/m</string>
+    <string name="yard_per_second">Yard/seconde</string>
+    <string name="yard_per_second_short">yd/s</string>
+    <string name="mile_per_hour">Mijl/uur</string>
+    <string name="mile_per_hour_short">mi/h</string>
+    <string name="mile_per_minute">Mijl/minuut</string>
+    <string name="mile_per_minute_short">mi/m</string>
+    <string name="mile_per_second">Mijl/seconde</string>
+    <string name="mile_per_second_short">mi/s</string>
+    <string name="knot">Knoop</string>
+    <string name="knot_short">kt</string>
+    <string name="velocity_of_light_in_vacuum">Lichtsnelheid in vacuum</string>
+    <string name="cosmic_velocity_first">Eerste kosmische snelheid</string>
+    <string name="cosmic_velocity_second">Tweede kosmische snelheid</string>
+    <string name="cosmic_velocity_third">Derde kosmische snelheid</string>
+    <string name="earths_orbital_speed">Omloopsnelheid aarde</string>
+    <string name="mach">Mach</string>
+    <string name="mach_si_standard">Mach (SI)</string>
+
+    <!-- File size -->
+    <string name="bit">Bit</string>
+    <string name="bit_short">b</string>
+    <string name="kibibit">Kibibit</string>
+    <string name="kibibit_short">Kib</string>
+    <string name="kilobit">Kilobit</string>
+    <string name="kilobit_short">Kb</string>
+    <string name="megabit">Megabit</string>
+    <string name="megabit_short">Mb</string>
+    <string name="mebibit">Mebibit</string>
+    <string name="mebibit_short">Mib</string>
+    <string name="gigabit">Gigabit</string>
+    <string name="gigabit_short">Gb</string>
+    <string name="terabit">Terabit</string>
+    <string name="terabit_short">Tb</string>
+    <string name="petabit">Petabit</string>
+    <string name="petabit_short">Pb</string>
+    <string name="exabit">Exabit</string>
+    <string name="exabit_short">Eb</string>
+    <string name="byte_">Byte</string>
+    <string name="byte_short">B</string>
+    <string name="kibibyte">Kibibyte</string>
+    <string name="kibibyte_short">KiB</string>
+    <string name="kilobyte">Kilobyte</string>
+    <string name="kilobyte_short">KB</string>
+    <string name="megabyte">Megabyte</string>
+    <string name="megabyte_short">MB</string>
+    <string name="mebibyte">Mebibyte</string>
+    <string name="mebibyte_short">MiB</string>
+    <string name="gigabyte">Gigabyte</string>
+    <string name="gigabyte_short">GB</string>
+    <string name="terabyte">Terabyte</string>
+    <string name="terabyte_short">TB</string>
+    <string name="petabyte">Petabyte</string>
+    <string name="petabyte_short">PB</string>
+    <string name="exabyte">Exabyte</string>
+    <string name="exabyte_short">EB</string>
+
+    <!-- Data transfer -->
+    <string name="bit_per_second">Bit/seconde</string>
+    <string name="bit_per_second_short">b/s</string>
+    <string name="kibibit_per_second">Kibibit/seconde</string>
+    <string name="kibibit_per_second_short">Kib/s</string>
+    <string name="kilobit_per_second">Kilobit/seconde</string>
+    <string name="kilobit_per_second_short">Kb/s</string>
+    <string name="megabit_per_second">Megabit/seconde</string>
+    <string name="megabit_per_second_short">Mb/s</string>
+    <string name="mebibit_per_second">Mebibit/seconde</string>
+    <string name="mebibit_per_second_short">Mib/s</string>
+    <string name="gigabit_per_second">Gigabit/seconde</string>
+    <string name="gigabit_per_second_short">Gb/s</string>
+    <string name="terabit_per_second">Terabit/seconde</string>
+    <string name="terabit_per_second_short">Tb/s</string>
+    <string name="petabit_per_second">Petabit/seconde</string>
+    <string name="petabit_per_second_short">Pb/s</string>
+    <string name="exabit_per_second">Exabit/seconde</string>
+    <string name="exabit_per_second_short">Eb/s</string>
+    <string name="byte_per_second">Byte/seconde</string>
+    <string name="byte_per_second_short">B/s</string>
+    <string name="kibibyte_per_second">Kibibyte/seconde</string>
+    <string name="kibibyte_per_second_short">KiB/s</string>
+    <string name="kilobyte_per_second">Kilobyte/seconde</string>
+    <string name="kilobyte_per_second_short">KB/s</string>
+    <string name="megabyte_per_second">Megabyte/seconde</string>
+    <string name="megabyte_per_second_short">MB/s</string>
+    <string name="mebibyte_per_second">Mebibyte/seconde</string>
+    <string name="mebibyte_per_second_short">MiB/s</string>
+    <string name="gigabyte_per_second">Gigabyte/seconde</string>
+    <string name="gigabyte_per_second_short">GB/s</string>
+    <string name="terabyte_per_second">Terabyte/seconde</string>
+    <string name="terabyte_per_second_short">TB/s</string>
+    <string name="petabyte_per_second">Petabyte/seconde</string>
+    <string name="petabyte_per_second_short">PB/s</string>
+    <string name="exabyte_per_second">Exabyte/seconde</string>
+    <string name="exabyte_per_second_short">EB/s</string>
+
+    <!-- Volume -->
+    <string name="attoliter">Attoliter</string>
+    <string name="attoliter_short">al</string>
+    <string name="milliliter">Milliliter</string>
+    <string name="milliliter_short">ml</string>
+    <string name="liter">Liter</string>
+    <string name="liter_short">l</string>
+    <string name="us_liquid_gallon">US liquid gallon</string>
+    <string name="us_liquid_gallon_short">gal (US)</string>
+    <string name="us_liquid_quart">US liquid quart</string>
+    <string name="us_liquid_quart_short">qt (US)</string>
+    <string name="us_liquid_pint">US liquid pint</string>
+    <string name="us_liquid_pint_short">pt (US)</string>
+    <string name="us_legal_cup">US legal cup</string>
+    <string name="us_legal_cup_short">cup (US)</string>
+    <string name="us_fluid_ounce">US fluid ounce</string>
+    <string name="us_fluid_ounce_short">fl oz (US)</string>
+    <string name="us_tablespoon">US eetlepel</string>
+    <string name="us_tablespoon_short">tbsp (US)</string>
+    <string name="us_teaspoon">US theelepel</string>
+    <string name="us_teaspoon_short">tsp (US)</string>
+    <string name="imperial_gallon">Imperiale gallon</string>
+    <string name="imperial_gallon_short">gal (UK)</string>
+    <string name="imperial_quart">Imperiale quart</string>
+    <string name="imperial_quart_short">qt (UK)</string>
+    <string name="imperial_pint">Imperiale pint</string>
+    <string name="imperial_pint_short">pt (UK)</string>
+    <string name="imperial_cup">Imperiale cup</string>
+    <string name="imperial_cup_short">cup (UK)</string>
+    <string name="imperial_fluid_ounce">Imperial fluid ounce</string>
+    <string name="imperial_fluid_ounce_short">fl oz (UK)</string>
+    <string name="imperial_tablespoon">Imperiale eetlepel</string>
+    <string name="imperial_tablespoon_short">tbsp (UK)</string>
+    <string name="imperial_teaspoon">Imperiale theelepel</string>
+    <string name="imperial_teaspoon_short">tsp (UK)</string>
+    <string name="cubic_millimeter">Kubieke millimeter</string>
+    <string name="cubic_millimeter_short">mm³</string>
+    <string name="cubic_centimeter">Kubieke centimeter</string>
+    <string name="cubic_centimeter_short">cm³</string>
+    <string name="cubic_meter">Kubieke meter</string>
+    <string name="cubic_meter_short">m³</string>
+    <string name="cubic_kilometer">Kubieke kilometer</string>
+    <string name="cubic_kilometer_short">km³</string>
+
+    <!-- Time -->
+    <string name="attosecond">Attoseconde</string>
+    <string name="attosecond_short">as</string>
+    <string name="nanosecond">Nanoseconde</string>
+    <string name="nanosecond_short">ns</string>
+    <string name="microsecond">microseconde</string>
+    <string name="microsecond_short">µs</string>
+    <string name="millisecond">milliseconde</string>
+    <string name="millisecond_short">ms</string>
+    <string name="jiffy">Jiffy</string>
+    <string name="jiffy_short">j</string>
+    <string name="second">Seconde</string>
+    <string name="second_short">sec</string>
+    <string name="minute">Minuut</string>
+    <string name="minute_short">min</string>
+    <string name="hour">Uur</string>
+    <string name="hour_short">h</string>
+    <string name="day">Dag</string>
+    <string name="day_short">d</string>
+    <string name="week">Week</string>
+    <string name="week_short">w</string>
+
+    <!-- Area -->
+    <string name="electron_cross_section">Werkzame doorsnede</string>
+    <string name="electron_cross_section_short">ecs</string>
+    <string name="acre">Acre</string>
+    <string name="acre_short">ac</string>
+    <string name="hectare">Hectare</string>
+    <string name="hectare_short">ha</string>
+    <string name="square_foot">Vierkante voet</string>
+    <string name="square_foot_short">ft²</string>
+    <string name="square_mile">Vierkante mijl</string>
+    <string name="square_mile_short">mi²</string>
+    <string name="square_yard">Vierkante yard</string>
+    <string name="square_yard_short">yd²</string>
+    <string name="square_inch">Vierkante inch</string>
+    <string name="square_inch_short">in²</string>
+    <string name="square_micrometer">Vierkante micrometer</string>
+    <string name="square_micrometer_short">µm²</string>
+    <string name="square_millimeter">Vierkante millimeter</string>
+    <string name="square_millimeter_short">mm²</string>
+    <string name="square_centimeter">Vierkante centimeter</string>
+    <string name="square_centimeter_short">cm²</string>
+    <string name="square_decimeter">Vierkante decimeter</string>
+    <string name="square_decimeter_short">dm²</string>
+    <string name="square_meter">Vierkante meter</string>
+    <string name="square_meter_short">m²</string>
+    <string name="square_kilometer">Vierkante kilometer</string>
+    <string name="square_kilometer_short">km²</string>
+
+    <!-- Energy -->
+    <string name="electron_volt">Elektronvolt</string>
+    <string name="electron_volt_short">eV</string>
+    <string name="attojoule">Attojoule</string>
+    <string name="attojoule_short">aJ</string>
+    <string name="energy_horse_power_metric">Paardenkracht</string>
+    <string name="energy_horse_power_metric_short">pk</string>
+    <string name="joule">Joule</string>
+    <string name="joule_short">J</string>
+    <string name="kilojoule">Kilojoule</string>
+    <string name="kilojoule_short">kJ</string>
+    <string name="gigajoule">Megajoule</string>
+    <string name="gigajoule_short">MJ</string>
+    <string name="megajoule">Gigajoule</string>
+    <string name="megajoule_short">GJ</string>
+    <string name="energy_ton">Ton TNT</string>
+    <string name="energy_ton_short">t</string>
+    <string name="kiloton">Kiloton TNT</string>
+    <string name="kiloton_short">kt</string>
+    <string name="megaton">Megaton TNT</string>
+    <string name="megaton_short">Mt</string>
+    <string name="gigaton">Gigaton TNT</string>
+    <string name="gigaton_short">Gt</string>
+    <string name="calorie_th">Calorie (th)</string>
+    <string name="calorie_th_short">cal</string>
+    <string name="kilocalorie_th">Kilocalorie (th)</string>
+    <string name="kilocalorie_th_short">kcal</string>
+
+    <!-- Power -->
+    <string name="attowatt">Attowatt</string>
+    <string name="attowatt_short">aW</string>
+    <string name="watt">Watt</string>
+    <string name="watt_short">W</string>
+    <string name="kilowatt">Kilowatt</string>
+    <string name="kilowatt_short">kW</string>
+    <string name="megawatt">Megawatt</string>
+    <string name="megawatt_short">MW</string>
+    <string name="horse_power_mechanical">Paardenkracht</string>
+    <string name="horse_power_mechanical_short">pk</string>
+
+    <!-- Angle -->
+    <string name="angle_second">Seconde</string>
+    <string name="angle_minute">Minuut</string>
+    <string name="degree">Graden</string>
+    <string name="radian">Radiaal</string>
+    <string name="radian_short">rad</string>
+    <string name="sextant">Sextant</string>
+    <string name="sextant_short">sxt</string>
+    <string name="turn">Volle hoek</string>
+    <string name="turn_short">tr</string>
+
+    <!-- Pressure -->
+    <string name="attopascal">Attopascal</string>
+    <string name="attopascal_short">aPa</string>
+    <string name="femtopascal">Femtopascal</string>
+    <string name="femtopascal_short">fPa</string>
+    <string name="picopascal">Picopascal</string>
+    <string name="picopascal_short">pPa</string>
+    <string name="nanopascal">Nanopascal</string>
+    <string name="nanopascal_short">nPa</string>
+    <string name="micropascal">Micropascal</string>
+    <string name="micropascal_short">µPa</string>
+    <string name="millipascal">Millipascal</string>
+    <string name="millipascal_short">mPa</string>
+    <string name="centipascal">Centipascal</string>
+    <string name="centipascal_short">cPa</string>
+    <string name="decipascal">Decipascal</string>
+    <string name="decipascal_short">dPa</string>
+    <string name="pascal">Pascal</string>
+    <string name="pascal_short">Pa</string>
+    <string name="dekapascal">Decapascal</string>
+    <string name="dekapascal_short">daPa</string>
+    <string name="hectopascal">Hectopascal</string>
+    <string name="hectopascal_short">hPa</string>
+    <string name="bar">Bar</string>
+    <string name="bar_short">bar</string>
+    <string name="megapascal">Megapascal</string>
+    <string name="megapascal_short">MPa</string>
+    <string name="gigapascal">Gigapascal</string>
+    <string name="gigapascal_short">GPa</string>
+    <string name="terapascal">Terapascal</string>
+    <string name="terapascal_short">TPa</string>
+    <string name="petapascal">Petapascal</string>
+    <string name="petapascal_short">PPa</string>
+    <string name="exapascal">Exapascal</string>
+    <string name="exapascal_short">EPa</string>
+    <string name="psi">Pond per vierkante inch</string>
+    <string name="ksi">Kilopond per vierkante inch</string>
+    <string name="standard_atmosphere">Atmosfeer</string>
+    <string name="standard_atmosphere_short">atm</string>
+    <string name="torr">Torr</string>
+    <string name="torr_short">torr</string>
+    <string name="millimeter_of_mercury">Millimeter kwik</string>
+    <string name="millimeter_of_mercury_short">mm Hg</string>
+
+    <!-- Acceleration -->
+    <string name="attometer_per_square_second">Attometer/vierkante seconde</string>
+    <string name="attometer_per_square_second_short">am/s²</string>
+    <string name="femtometer_per_square_second">Femtometer/vierkante seconde</string>
+    <string name="femtometer_per_square_second_short">fm/s²</string>
+    <string name="picometer_per_square_second">Picometer/vierkante seconde</string>
+    <string name="picometer_per_square_second_short">pm/s²</string>
+    <string name="nanometer_per_square_second">Nanometer/vierkante seconde</string>
+    <string name="nanometer_per_square_second_short">nm/s²</string>
+    <string name="micrometer_per_square_second">Micrometer/vierkante seconde</string>
+    <string name="micrometer_per_square_second_short">µm/s²</string>
+    <string name="millimeter_per_square_second">Millimeter per vierkante seconde</string>
+    <string name="millimeter_per_square_second_short">mm/s²</string>
+    <string name="centimeter_per_square_second">Centimeter per vierkante seconde</string>
+    <string name="centimeter_per_square_second_short">cm/s²</string>
+    <string name="decimeter_per_square_second">Decimeter per vierkante seconde</string>
+    <string name="decimeter_per_square_second_short">dm/s²</string>
+    <string name="meter_per_square_second">Meter/vierkante seconde</string>
+    <string name="meter_per_square_second_short">m/s²</string>
+    <string name="kilometer_per_square_second">Kilometer/vierkante seconde</string>
+    <string name="kilometer_per_square_second_short">km/s²</string>
+    <string name="dekameter_per_square_second">Decameter/vierkante seconde</string>
+    <string name="dekameter_per_square_second_short">dm/s²</string>
+    <string name="hectometer_per_square_second">Hectometer/vierkante seconde</string>
+    <string name="hectometer_per_square_second_short">hm/s²</string>
+    <string name="gal">Gal</string>
+    <string name="gal_short">Gal</string>
+    <string name="mercury_surface_gravity">Mercurius zwaartekracht</string>
+    <string name="mercury_surface_gravity_short">Mercurius g</string>
+    <string name="venus_surface_gravity">Venus zwaartekracht</string>
+    <string name="venus_surface_gravity_short">Venus g</string>
+    <string name="earth_surface_gravity">Aarde zwaartekracht</string>
+    <string name="earth_surface_gravity_short">Aarde g</string>
+    <string name="mars_surface_gravity">Mars zwaartekracht</string>
+    <string name="mars_surface_gravity_short">Mars g</string>
+    <string name="jupiter_surface_gravity">Jupiter zwaartekracht</string>
+    <string name="jupiter_surface_gravity_short">Jupiter g</string>
+    <string name="saturn_surface_gravity">Saturnus zwaartekracht</string>
+    <string name="saturn_surface_gravity_short">Saturnus g</string>
+    <string name="uranus_surface_gravity">Uranus zwaartekracht</string>
+    <string name="uranus_surface_gravity_short">Uranus g</string>
+    <string name="neptune_surface_gravity">Neptunus zwaartekracht</string>
+    <string name="neptune_surface_gravity_short">Neptunus g</string>
+    <string name="sun_surface_gravity">Zon zwaartekracht</string>
+    <string name="sun_surface_gravity_short">Zon g</string>
+    <string name="currency_ada">Cardano</string>
+    <string name="currency_aed">VAE-dirham</string>
+    <string name="currency_afn">Afghaanse afghani</string>
+    <string name="currency_all">Albanese lek</string>
+    <string name="currency_amd">Armeense dram</string>
+    <string name="currency_ang">Antilliaanse gulden</string>
+    <string name="currency_aoa">Angolese kwanza</string>
+    <string name="currency_ars">Argentijnse peso</string>
+    <string name="currency_aud">Australische dollar</string>
+    <string name="currency_awg">Arubaanse florin</string>
+    <string name="currency_azn">Azerbeidzjaanse manat</string>
+    <string name="currency_bam">Bosnische inwisselbare mark</string>
+    <string name="currency_bbd">Barbadiaanse dollar</string>
+    <string name="currency_bdt">Bengalese taka</string>
+    <string name="currency_bgn">Bulgaarse lev</string>
+    <string name="currency_bhd">Bahreinse dinar</string>
+    <string name="currency_bif">Burundese frank</string>
+    <string name="currency_bmd">Bermudaanse dollar</string>
+    <string name="currency_bnd">Bruneise dollar</string>
+    <string name="currency_bob">Boliviaanse boliviano</string>
+    <string name="currency_brl">Braziliaanse real</string>
+    <string name="currency_bsd">Bahamaanse dollar</string>
+    <string name="currency_btn">Bhutaanse ngultrum</string>
+    <string name="currency_bwp">Botswaanse pula</string>
+    <string name="currency_byn">Nieuwe Belarussische roebel</string>
+    <string name="currency_byr">Belarussische roebel</string>
+    <string name="currency_bzd">Belizaanse dollar</string>
+    <string name="currency_cad">Canadese dollar</string>
+    <string name="currency_cdf">Congolese frank</string>
+    <string name="currency_chf">Zwitserse frank</string>
+    <string name="currency_clf">Chileense Unidad de Fomento (UF)</string>
+    <string name="currency_clp">Chileense peso</string>
+    <string name="currency_cny">Chinese Yuan</string>
+    <string name="currency_cop">Colombiaanse peso</string>
+    <string name="currency_crc">Costa Ricaanse colon</string>
+    <string name="currency_cuc">Cubaanse convertibele peso</string>
+    <string name="currency_cup">Cubaanse peso</string>
+    <string name="currency_cve">Kaapverdische escudo</string>
+    <string name="currency_czk">Tsjechische kroon</string>
+    <string name="currency_dai">Dai</string>
+    <string name="currency_djf">Djiboutiaanse frank</string>
+    <string name="currency_dkk">Deense kroon</string>
+    <string name="currency_dop">Dominicaanse peso</string>
+    <string name="currency_dzd">Algerijnse dinar</string>
+    <string name="currency_egp">Egyptisch pond</string>
+    <string name="currency_ern">Eritrese nakfa</string>
+    <string name="currency_etb">Ethiopische birr</string>
+    <string name="currency_eur">Euro</string>
+    <string name="currency_fjd">Fiji-dollar</string>
+    <string name="currency_fkp">Falklandeilands pond</string>
+    <string name="currency_gbp">Britse pond</string>
+    <string name="currency_gel">Georgische lari</string>
+    <string name="currency_ghs">Ghanese cedi</string>
+    <string name="currency_gip">Gibraltarees pond</string>
+    <string name="currency_gmd">Gambiaanse dalasi</string>
+    <string name="currency_gnf">Guineese frank</string>
+    <string name="currency_gtq">Guatemalteekse quetzal</string>
+    <string name="currency_gyd">Guyaanse dollar</string>
+    <string name="currency_hkd">Hongkongse dollar</string>
+    <string name="currency_hnl">Hondurese lempira</string>
+    <string name="currency_hrk">Kroatische kuna</string>
+    <string name="currency_htg">Haïtiaanse gourde</string>
+    <string name="currency_huf">Hongaarse forint</string>
+    <string name="currency_idr">Indonesische roepia</string>
+    <string name="currency_ils">Israëlische sjekel</string>
+    <string name="currency_inr">Indiase roepie</string>
+    <string name="currency_iqd">Iraakse dinar</string>
+    <string name="currency_irr">Iraanse rial</string>
+    <string name="currency_isk">IJslandse kroon</string>
+    <string name="currency_jep">Jerseypond</string>
+    <string name="currency_jmd">Jamaicaanse dollar</string>
+    <string name="currency_jod">Jordaanse dinar</string>
+    <string name="currency_jpy">Japanse yen</string>
+    <string name="currency_kes">Keniaanse shilling</string>
+    <string name="currency_kgs">Kirgizische som</string>
+    <string name="currency_khr">Cambodjaanse riel</string>
+    <string name="currency_kmf">Comorese frank</string>
+    <string name="currency_kpw">Noord-Koreaanse won</string>
+    <string name="currency_krw">Zuid-Koreaanse won</string>
+    <string name="currency_kwd">Koeweitse dinar</string>
+    <string name="currency_kyd">Kaaimaneilandse dollar</string>
+    <string name="currency_kzt">Kazachse tenge</string>
+    <string name="currency_lak">Laotiaanse kip</string>
+    <string name="currency_lbp">Libanees pond</string>
+    <string name="currency_lkr">Sri Lankaanse roepie</string>
+    <string name="currency_lrd">Liberiaanse dollar</string>
+    <string name="currency_lsl">Lesothaanse loti</string>
+    <string name="currency_ltl">Litouwse litas</string>
+    <string name="currency_lvl">Letse lats</string>
+    <string name="currency_lyd">Libische dinar</string>
+    <string name="currency_mad">Marokkaanse dirham</string>
+    <string name="currency_mdl">Moldavische leu</string>
+    <string name="currency_mga">Malagassische ariary</string>
+    <string name="currency_mkd">Macedonische denar</string>
+    <string name="currency_mmk">Myanmarese kyat</string>
+    <string name="currency_mnt">Mongoolse tugrik</string>
+    <string name="currency_mop">Macause pataca</string>
+    <string name="currency_mro">Mauritaanse ouguiya</string>
+    <string name="currency_mur">Mauritiaanse roepie</string>
+    <string name="currency_mvr">Maldivische rufiyaa</string>
+    <string name="currency_mwk">Malawische kwacha</string>
+    <string name="currency_mxn">Mexicaanse peso</string>
+    <string name="currency_myr">Maleisische ringgit</string>
+    <string name="currency_mzn">Mozambikaanse metical</string>
+    <string name="currency_nad">Namibische dollar</string>
+    <string name="currency_ngn">Nigeriaanse naira</string>
+    <string name="currency_nio">Nicaraguaanse córdoba</string>
+    <string name="currency_nok">Noorse kroon</string>
+    <string name="currency_npr">Nepalese roepie</string>
+    <string name="currency_nzd">Nieuw-Zeelandse dollar</string>
+    <string name="currency_omr">Omaanse rial</string>
+    <string name="currency_pab">Panamese balboa</string>
+    <string name="currency_pen">Sol</string>
+    <string name="currency_pgk">Papoea-Nieuw-Guinese kina</string>
+    <string name="currency_php">Filipijnse peso</string>
+    <string name="currency_pkr">Pakistaanse roepie</string>
+    <string name="currency_pln">Poolse złoty</string>
+    <string name="currency_pyg">Paraguayaanse Guarani</string>
+    <string name="currency_qar">Qatarese rial</string>
+    <string name="currency_ron">Roemeense leu</string>
+    <string name="currency_rsd">Servische dinar</string>
+    <string name="currency_rub">Russische roebel</string>
+    <string name="currency_rwf">Rwandese frank</string>
+    <string name="currency_sar">Saoedi-Arabische riyal</string>
+    <string name="currency_sbd">Salomon-dollar</string>
+    <string name="currency_scr">Seychelse roepie</string>
+    <string name="currency_sdg">Soedanees pond</string>
+    <string name="currency_sek">Zweedse kroon</string>
+    <string name="currency_sgd">Singaporese dollar</string>
+    <string name="currency_shib">Shiba Inu</string>
+    <string name="currency_shp">Sint-Heleens pond</string>
+    <string name="currency_sll">Sierra Leoonse leone</string>
+    <string name="currency_sos">Somalische shilling</string>
+    <string name="currency_srd">Surinaamse dollar</string>
+    <string name="currency_std">Santomese dobra (pre-2018)</string>
+    <string name="currency_svc">Salvadoraanse colon</string>
+    <string name="currency_syp">Syrisch pond</string>
+    <string name="currency_szl">Swazische lilangeni</string>
+    <string name="currency_thb">Thaise baht</string>
+    <string name="currency_theta">Theta</string>
+    <string name="currency_tjs">Tadzjiekse somoni</string>
+    <string name="currency_tmt">Turkmeense manat</string>
+    <string name="currency_tnd">Tunesische dinar</string>
+    <string name="currency_top">Tongaanse pa\'anga</string>
+    <string name="currency_try">Turkse lira</string>
+    <string name="currency_ttd">Trinidad en Tobagodollar</string>
+    <string name="currency_twd">Nieuwe Taiwanese dollar</string>
+    <string name="currency_tzs">Tanzaniaanse shilling</string>
+    <string name="currency_uah">Oekraïense hryvnia</string>
+    <string name="currency_ugx">Oegandese shilling</string>
+    <string name="currency_uni">Universe</string>
+    <string name="currency_usd">Amerikaanse dollar</string>
+    <string name="currency_usdc">USD Coin</string>
+    <string name="currency_uyu">Uruguayaanse peso</string>
+    <string name="currency_uzs">Oezbeekse sum</string>
+    <string name="currency_vef">Venezolaanse bolivar</string>
+    <string name="currency_vnd">Vietnamese dong</string>
+    <string name="currency_vuv">Vanuatuaanse vatu</string>
+    <string name="currency_wbtc">Wrapped Bitcoin</string>
+    <string name="currency_wst">Samoaanse tala</string>
+    <string name="currency_xaf">CFA-frank</string>
+    <string name="currency_xag">Zilver (ons)</string>
+    <string name="currency_xcd">Oost-Caribische dollar</string>
+    <string name="currency_xdr">Speciale trekkingsrechten</string>
+    <string name="currency_xof">CFA-Frank BCEAO</string>
+    <string name="currency_xpf">CFP-frank</string>
+    <string name="currency_yer">Jemenitische rial</string>
+    <string name="currency_zar">Zuid-Afrikaanse rand</string>
+    <string name="currency_zmk">Zambiaanse kwacha</string>
+    <string name="currency_zmw">Zambiaanse kwacha</string>
+    <string name="currency_zwl">Zimbabwaanse dollar</string>
+
+    <!-- Groups -->
+    <string name="length">Lengte</string>
+    <string name="time">Tijd</string>
+    <string name="volume">Volume</string>
+    <string name="area">Oppervlakte</string>
+    <string name="temperature">Temperatuur</string>
+    <string name="speed">Snelheid</string>
+    <string name="mass">Massa</string>
+    <string name="data">Data</string>
+    <string name="energy">Energie</string>
+    <string name="power">Kracht</string>
+    <string name="angle">Hoek</string>
+    <string name="data_transfer">Gegevensoverdracht</string>
+    <string name="pressure">Druk</string>
+    <string name="acceleration">Versnelling</string>
+    <string name="currency">Munteenheid</string>
+
+    <!-- Screen names -->
+    <string name="units_screen_from">Omzetten van</string>
+    <string name="units_screen_to">Omzetten naar</string>
+    <string name="settings_screen">Instellingen</string>
+
+    <!-- Settings items -->
+    <string name="theme_setting">Thema\'s</string>
+    <string name="precision_setting">Nauwkeurigheid</string>
+    <string name="separator_setting">Scheidingsteken</string>
+    <string name="exponential_notation_setting">Wetenschappelijke notatie</string>
+    <string name="unit_groups_setting">Eenheidsgroepen</string>
+    <string name="currency_rates_note_setting">Verkeerde wisselkoersen?</string>
+    <string name="currency_rates_note_title">Kennisgeving</string>
+    <string name="currency_rates_note_text">Wisselkoersen worden dagelijks bijgewerkt. De app houdt niet constant de markt bij.</string>
+    <string name="terms_and_conditions">Voorwaarden</string>
+    <string name="privacy_policy">Privacybeleid</string>
+    <string name="third_party_licenses">Licenties van derden</string>
+    <string name="rate_this_app">Beoordeel deze app</string>
+    <string name="formatting_setting">Opmaak</string>
+    <string name="additional_settings_group">Overig</string>
+
+    <!-- Precision -->
+    <string name="precision_setting_support">Aantal decimalen</string>
+    <string name="precision_setting_info">Geconverteerde waarden kunnen een hogere nauwkeurigheid hebben dan de voorkeurswaarde.</string>
+    <string name="max_precision">%1$s (Maximum)</string>
+
+    <!-- Separator -->
+    <string name="separator_setting_support">Scheidingsteken voor groepen</string>
+    <string name="period">Punt</string>
+    <string name="comma">Komma</string>
+    <string name="space">Spatie</string>
+
+    <!-- Output format -->
+    <string name="exponential_notation_setting_support">Vervang een deel van het nummer door E</string>
+
+    <!-- Theme -->
+    <string name="theme_setting_support">Uiterlijk van de app</string>
+    <string name="auto_label">Automatisch</string>
+    <string name="force_light_mode">Licht</string>
+    <string name="force_dark_mode">Donker</string>
+    <string name="color_theme">Kleurthema</string>
+    <string name="force_amoled_mode">AMOLED-donker</string>
+    <string name="force_amoled_mode_support">Gebruik een zwarte achtergrond voor donkere thema\'s</string>
+    <string name="enable_dynamic_colors">Dynamische kleuren</string>
+    <string name="enable_dynamic_colors_support">Gebruik kleuren uit je achtergrond</string>
+
+    <!-- MISC. -->
+    <string name="loading_label">Laden…</string>
+    <string name="error_label">Fout</string>
+    <string name="copied">%1$s gekopieerd!</string>
+    <string name="cancel_label">Annuleren</string>
+    <string name="search_bar_placeholder">Zoek eenheden</string>
+    <string name="search_placeholder">Geen resultaten gevonden</string>
+    <string name="search_placeholder_button_label">Open instellingen</string>
+    <string name="search_placeholder_secondary">Zorg ervoor dat er geen typefouten zijn, probeer verschillende filters of controleer op uitgeschakelde eenheidsgroepen.</string>
+    <string name="hello_label">Hallo!</string>
+    <string name="enabled_label">ingeschakeld</string>
+    <string name="disabled_label">Uitgeschakeld</string>
+
+    <!-- Content descriptions -->
+    <string name="navigate_up_description">Navigeer omhoog</string>
+    <string name="checked_filter_description">Geselecteerde filters</string>
+    <string name="open_settings_description">Open instellingen</string>
+    <string name="swap_units_description">Verwissel eenheden</string>
+    <string name="search_button_description">Zoekknop</string>
+    <string name="clear_input_description">Invoer verwijderen</string>
+    <string name="favorite_button_description">Eenheid toevoegen aan of verwijderen uit favorieten</string>
+    <string name="empty_search_result_description">Wis zoekresultaat</string>
+    <string name="drop_down_description">Open of sluit keuzemenu</string>
+    <string name="enable_unit_group_description">Schakel eenheidsgroep in</string>
+    <string name="reorder_unit_group_description">Herschik eenheidsgroep</string>
+    <string name="disable_unit_group_description">Schakel eenheidsgroep uit</string>
+    <string name="app_version_name_setting">Versienaam</string>
+    <string name="about_unitto">Over Unitto</string>
+    <string name="about_unitto_support">Leer meer over de app</string>
+    <string name="unit_groups_support">Schakel eenheden uit en herschik ze</string>
+    <string name="cent">Cent</string>
+    <string name="cent_short">cent</string>
+
+    <!-- Flux -->
+    <string name="maxwell">Maxwell</string>
+    <string name="maxwell_short">Mx</string>
+    <string name="weber">Weber</string>
+    <string name="weber_short">Wb</string>
+    <string name="milliweber">Milliweber</string>
+    <string name="milliweber_short">mWb</string>
+    <string name="microweber">Microweber</string>
+    <string name="microweber_short">μWb</string>
+    <string name="kiloweber">Kiloweber</string>
+    <string name="kiloweber_short">kWb</string>
+    <string name="megaweber">Megaweber</string>
+    <string name="megaweber_short">MWb</string>
+    <string name="gigaweber">Gigaweber</string>
+    <string name="gigaweber_short">GWb</string>
+    <string name="flux">Flux</string>
+    <string name="open_source">Bekijk broncode</string>
+    <string name="translate_app">Vertaal deze app</string>
+    <string name="translate_app_support">Word lid van het POEditor-project om te helpen</string>
+
+    <!-- Number base -->
+    <string name="binary">Binair</string>
+    <string name="binary_short">base2</string>
+    <string name="ternary">Ternair</string>
+    <string name="ternary_short">base3</string>
+    <string name="quaternary">Kwartair</string>
+    <string name="quaternary_short">base4</string>
+    <string name="quinary">Quinair</string>
+    <string name="quinary_short">base5</string>
+    <string name="senary">Senair</string>
+    <string name="senary_short">base6</string>
+    <string name="septenary">Septair</string>
+    <string name="septenary_short">base7</string>
+    <string name="octal">Octaal</string>
+    <string name="octal_short">base8</string>
+    <string name="nonary">Novenair</string>
+    <string name="nonary_short">base9</string>
+    <string name="decimal">Decimaal</string>
+    <string name="decimal_short">base10</string>
+    <string name="undecimal">Undecimaal</string>
+    <string name="undecimal_short">base11</string>
+    <string name="duodecimal">Duodecimaal</string>
+    <string name="duodecimal_short">base12</string>
+    <string name="tridecimal">Triodecimaal</string>
+    <string name="tridecimal_short">base13</string>
+    <string name="tetradecimal">Tetradecimaal</string>
+    <string name="tetradecimal_short">base14</string>
+    <string name="pentadecimal">Pentadecimaal</string>
+    <string name="pentadecimal_short">base15</string>
+    <string name="hexadecimal">Hexadecimaal</string>
+    <string name="hexadecimal_short">base16</string>
+    <string name="number_base">Base</string>
+    <string name="enable_vibrations">Trillingen</string>
+    <string name="enable_vibrations_support">Haptische feedback bij het klikken op toetsenbordknoppen</string>
+    <string name="millibar">Millibar</string>
+    <string name="millibar_short">mbar</string>
+    <string name="kilopascal">Kilopascal</string>
+    <string name="kilopascal_short">kPa</string>
+    <string name="micron_of_mercury">Micrometer kwik</string>
+    <string name="micron_of_mercury_short">μmHg</string>
+
+    <!-- Tools -->
+    <string name="epoch_converter">Epochconversie</string>
+
+    <!-- Calculator -->
+    <string name="calculator">Rekenmachine</string>
+
+    <!-- Epoch -->
+    <string name="year_short">y</string>
+    <string name="month_short">m</string>
+    <string name="nautical_mile">Nautische mijl</string>
+    <string name="nautical_mile_short">M</string>
+    <string name="starting_screen_setting">Startscherm</string>
+    <string name="starting_screen_setting_support">Kies welk scherm wordt weergegeven wanneer de app start</string>
+
+    <!-- Tools -->
+    <string name="unit_converter">Eenheidsconversie</string>
+    <string name="calculator_clear_history_label">Wis</string>
+    <string name="calculator_clear_history_title">Wis geschiedenis</string>
+    <string name="calculator_clear_history_support">Alle berekeningen worden uit de geschiedenis verwijderd. Deze actie kan niet ongedaan worden gemaakt!</string>
+    <string name="calculator_no_history">Geen geschiedenis</string>
+    <string name="open_menu_description">Menu openen</string>
+    <string name="microgram">Microgram</string>
+    <string name="microgram_short">µg</string>
+
+    <!-- ELECTROSTATIC CAPACITANCE -->
+    <string name="attofarad">Attofarad</string>
+    <string name="attofarad_short">aF</string>
+    <string name="statfarad">Statfarad</string>
+    <string name="statfarad_short">stF</string>
+    <string name="farad">Farad</string>
+    <string name="farad_short">F</string>
+    <string name="exafarad">Exafarad</string>
+    <string name="exafarad_short">EF</string>
+    <string name="picofarad">Picofarad</string>
+    <string name="picofarad_short">pF</string>
+    <string name="nanofarad">Nanofarad</string>
+    <string name="nanofarad_short">nF</string>
+    <string name="microfarad">Microfarad</string>
+    <string name="microfarad_short">µF</string>
+    <string name="millifarad">Millifarad</string>
+    <string name="millifarad_short">mF</string>
+    <string name="kilofarad">mF</string>
+    <string name="kilofarad_short">kF</string>
+    <string name="megafarad">Megafarad</string>
+    <string name="megafarad_short">MF</string>
+    <string name="gigafarad">Gigafarad</string>
+    <string name="gigafarad_short">GF</string>
+    <string name="petafarad">Petafarad</string>
+    <string name="petafarad_short">PF</string>
+
+    <!-- Prefixes -->
+    <string name="prefix_quetta">Quetta</string>
+    <string name="prefix_quetta_short">Q</string>
+    <string name="prefix_ronna">Ronna</string>
+    <string name="prefix_ronna_short">R</string>
+    <string name="prefix_yotta">Yotta</string>
+    <string name="prefix_yotta_short">Y</string>
+    <string name="prefix_zetta">Zetta</string>
+    <string name="prefix_zetta_short">Z</string>
+    <string name="prefix_exa">Exa</string>
+    <string name="prefix_exa_short">E</string>
+    <string name="prefix_peta">Peta</string>
+    <string name="prefix_peta_short">P</string>
+    <string name="prefix_tera">Tera</string>
+    <string name="prefix_tera_short">Tera</string>
+    <string name="prefix_giga">Giga</string>
+    <string name="prefix_giga_short">G</string>
+    <string name="prefix_mega">Mega</string>
+    <string name="prefix_mega_short">M</string>
+    <string name="prefix_kilo">Kilo</string>
+    <string name="prefix_kilo_short">k</string>
+    <string name="prefix_hecto">Hecto</string>
+    <string name="prefix_hecto_short">h</string>
+    <string name="prefix_deca">Deca</string>
+    <string name="prefix_deca_short">da</string>
+    <string name="prefix_base">Base</string>
+    <string name="prefix_base_short">Base</string>
+    <string name="prefix_deci">Deci</string>
+    <string name="prefix_deci_short">d</string>
+    <string name="prefix_centi">Centi</string>
+    <string name="prefix_centi_short">c</string>
+    <string name="prefix_milli">Milli</string>
+    <string name="prefix_milli_short">m</string>
+    <string name="prefix_micro">Micro</string>
+    <string name="prefix_micro_short">μ</string>
+    <string name="prefix_nano">Nano</string>
+    <string name="prefix_nano_short">n</string>
+    <string name="prefix_pico">Pico</string>
+    <string name="prefix_pico_short">p</string>
+    <string name="prefix_femto">Femto</string>
+    <string name="prefix_femto_short">f</string>
+    <string name="prefix_atto">Atto</string>
+    <string name="prefix_atto_short">a</string>
+    <string name="prefix_zepto">Zepto</string>
+    <string name="prefix_zepto_short">z</string>
+    <string name="prefix_yocto">Yocto</string>
+    <string name="prefix_yocto_short">y</string>
+    <string name="prefix_ronto">Ronto</string>
+    <string name="prefix_ronto_short">r</string>
+    <string name="prefix_quecto">Quecto</string>
+    <string name="prefix_quecto_short">q</string>
+
+    <!-- Force -->
+    <string name="newton">Newton</string>
+    <string name="newton_short">N</string>
+    <string name="kilonewton">Kilonewton</string>
+    <string name="kilonewton_short">kN</string>
+    <string name="gram_force">Gram-kracht</string>
+    <string name="gram_force_short">gf</string>
+    <string name="kilogram_force">Kilogram-kracht</string>
+    <string name="kilogram_force_short">kgf</string>
+    <string name="ton_force">Ton-kracht</string>
+    <string name="ton_force_short">tf</string>
+    <string name="millinewton">Millinewton</string>
+    <string name="millinewton_short">mN</string>
+    <string name="attonewton">Attonewton</string>
+    <string name="attonewton_short">aN</string>
+    <string name="dyne">Dyne</string>
+    <string name="dyne_short">dyn</string>
+    <string name="joule_per_meter">Joule/meter</string>
+    <string name="joule_per_meter_short">J/m</string>
+    <string name="joule_per_centimeter">Joule/centimeter</string>
+    <string name="joule_per_centimeter_short">J/cm</string>
+    <string name="kilopound_force">Kilopond-kracht</string>
+    <string name="kilopound_force_short">kipf</string>
+    <string name="pound_force">Pond-kracht</string>
+    <string name="pound_force_short">lbf</string>
+    <string name="ounce_force">Ons-kracht</string>
+    <string name="ounce_force_short">ozf</string>
+    <string name="pond">Pond</string>
+    <string name="pond_short">p</string>
+    <string name="kilopond">Kilopond</string>
+    <string name="kilopond_short">kp</string>
+
+    <!-- Torque -->
+    <string name="newton_meter">Newtonmeter</string>
+    <string name="newton_meter_short">N*m</string>
+    <string name="newton_centimeter">Newtoncentimeter</string>
+    <string name="newton_centimeter_short">N*cm</string>
+    <string name="newton_millimeter">Newtonmillimeter</string>
+    <string name="newton_millimeter_short">N*mm</string>
+    <string name="kilonewton_meter">Kilonewtonmeter</string>
+    <string name="kilonewton_meter_short">kN*m</string>
+    <string name="dyne_meter">Dyne meter</string>
+    <string name="dyne_meter_short">dyn*m</string>
+    <string name="dyne_centimeter">Dyne centimeter</string>
+    <string name="dyne_centimeter_short">dyn*cm</string>
+    <string name="dyne_millimeter">Dyne millimeter</string>
+    <string name="dyne_millimeter_short">dyn*mm</string>
+    <string name="kilogram_force_meter">Kilogram-kracht meter</string>
+    <string name="kilogram_force_meter_short">kgf*m</string>
+    <string name="kilogram_force_centimeter">Kilogram-kracht centimeter</string>
+    <string name="kilogram_force_centimeter_short">kgf*cm</string>
+    <string name="kilogram_force_millimeter">Kilogram-kracht millimeter</string>
+    <string name="kilogram_force_millimeter_short">kgf*mm</string>
+    <string name="gram_force_meter">Gram-kracht meter</string>
+    <string name="gram_force_meter_short">gf*m</string>
+    <string name="gram_force_centimeter">Gram-kracht centimeter</string>
+    <string name="gram_force_centimeter_short">gf*cm</string>
+    <string name="gram_force_millimeter">Gram-kracht millimeter</string>
+    <string name="gram_force_millimeter_short">gf*mm</string>
+    <string name="ounce_force_foot">Ons-kracht voet</string>
+    <string name="ounce_force_foot_short">ozf*ft</string>
+    <string name="ounce_force_inch">Ons-kracht inch</string>
+    <string name="ounce_force_inch_short">ozf*in</string>
+    <string name="pound_force_foot">Pond-kracht voet</string>
+    <string name="pound_force_foot_short">lbf*ft</string>
+    <string name="pound_force_inch">Pond-kracht inch</string>
+    <string name="pound_force_inch_short">lbf*in</string>
+
+    <!-- Flow rate -->
+    <string name="liter_per_hour">Liter/uur</string>
+    <string name="liter_per_hour_short">L/h</string>
+    <string name="liter_per_minute">Liter/minuut</string>
+    <string name="liter_per_minute_short">L/m</string>
+    <string name="liter_per_second">Liter/seconde</string>
+    <string name="liter_per_second_short">L/s</string>
+    <string name="milliliter_per_hour">Milliliter/uur</string>
+    <string name="milliliter_per_hour_short">mL/h</string>
+    <string name="milliliter_per_minute">Milliliter/minuut</string>
+    <string name="milliliter_per_minute_short">mL/m</string>
+    <string name="milliliter_per_second">Milliliter/seconde</string>
+    <string name="milliliter_per_second_short">mL/s</string>
+    <string name="cubic_meter_per_hour">Kubieke meter/uur</string>
+    <string name="cubic_meter_per_hour_short">m3/h</string>
+    <string name="cubic_meter_per_minute">Kubieke meter/minuut</string>
+    <string name="cubic_meter_per_minute_short">m3/m</string>
+    <string name="cubic_meter_per_second">Kubieke meter/seconde</string>
+    <string name="cubic_meter_per_second_short">m3/s</string>
+    <string name="cubic_millimeter_per_hour">Kubieke millimeter/uur</string>
+    <string name="cubic_millimeter_per_hour_short">mm3/h</string>
+    <string name="cubic_millimeter_per_minute">Kubieke millimeter/minuut</string>
+    <string name="cubic_millimeter_per_minute_short">mm3/m</string>
+    <string name="cubic_millimeter_per_second">Kubieke millimeter/seconde</string>
+    <string name="cubic_millimeter_per_second_short">mm3/s</string>
+    <string name="cubic_foot_per_hour">Kubieke voet/uur</string>
+    <string name="cubic_foot_per_hour_short">ft3/h</string>
+    <string name="cubic_foot_per_minute">Kubieke voet/minuut</string>
+    <string name="cubic_foot_per_minute_short">ft/m</string>
+    <string name="cubic_foot_per_second">Kubieke voet/seconde</string>
+    <string name="cubic_foot_per_second_short">ft3/s</string>
+    <string name="gallon_per_hour_us">Gallon/uur (US)</string>
+    <string name="gallon_per_hour_us_short">gal/h</string>
+    <string name="gallon_per_minute_us">Gallon/minuut (US)</string>
+    <string name="gallon_per_minute_us_short">gal/m</string>
+    <string name="gallon_per_second_us">Gallon/seconde (US)</string>
+    <string name="gallon_per_second_us_short">gal/s</string>
+    <string name="gallon_per_hour_imperial">Gallon/uur (imperiaal)</string>
+    <string name="gallon_per_hour_imperial_short">gal/h</string>
+    <string name="gallon_per_minute_imperial">Gallon/minuut (imperiaal)</string>
+    <string name="gallon_per_minute_imperial_short">gal/m</string>
+    <string name="gallon_per_second_imperial">Gallon/seconde (imperiaal)</string>
+    <string name="gallon_per_second_imperial_short">gal/s</string>
+
+    <!-- Luminance -->
+    <string name="candela_per_square_meter">Candela/vierkante meter</string>
+    <string name="candela_per_square_meter_short">cd/m²</string>
+    <string name="candela_per_square_centimeter">Candela/vierkante centimeter</string>
+    <string name="candela_per_square_centimeter_short">cd/m²</string>
+    <string name="candela_per_square_foot">Candela/vierkante voet</string>
+    <string name="candela_per_square_foot_short">cd/ft²</string>
+    <string name="candela_per_square_inch">Candela/vierkante inch</string>
+    <string name="candela_per_square_inch_short">cd/in²</string>
+    <string name="kilocandela_per_square_meter">Kilocandela/vierkante meter</string>
+    <string name="kilocandela_per_square_meter_short">kcd</string>
+    <string name="stilb">Stilb</string>
+    <string name="stilb_short">sb</string>
+    <string name="lumen_per_square_meter_per_steradian">Lumen/vierkante meter/steradiaal</string>
+    <string name="lumen_per_square_meter_per_steradian_short">lm/m²/sr</string>
+    <string name="lumen_per_square_centimeter_per_steradian">Lumen/vierkante centimeter/steradiaal</string>
+    <string name="lumen_per_square_centimeter_per_steradian_short">lm/cm²/sr</string>
+    <string name="lumen_per_square_foot_per_steradian">Lumen/vierkante voet/steradiaal</string>
+    <string name="lumen_per_square_foot_per_steradian_short">lm/ft²/sr</string>
+    <string name="watt_per_square_centimeter_per_steradian">Watt/vierkante centimeter/steradiaal</string>
+    <string name="watt_per_square_centimeter_per_steradian_short">W/cm²/sr</string>
+    <string name="nit">Nit</string>
+    <string name="nit_short">nt</string>
+    <string name="millinit">Millinit</string>
+    <string name="millinit_short">mnt</string>
+    <string name="lambert">Lambert</string>
+    <string name="lambert_short">L</string>
+    <string name="millilambert">Millilambert</string>
+    <string name="millilambert_short">mL</string>
+    <string name="foot_lambert">voet-lambert</string>
+    <string name="foot_lambert_short">fL</string>
+    <string name="apostilb">Apostilb</string>
+    <string name="apostilb_short">asb</string>
+    <string name="blondel">Blondel</string>
+    <string name="blondel_short">blondel</string>
+    <string name="bril">Bril</string>
+    <string name="bril_short">bril</string>
+    <string name="skot">Skot</string>
+    <string name="skot_short">sk</string>
+    <string name="electrostatic_capacitance">Capaciteit</string>
+    <string name="prefix">Prefix</string>
+    <string name="force">Kracht</string>
+    <string name="torque">Krachtmoment</string>
+    <string name="flow_rate">Stroom</string>
+    <string name="luminance">Luminantie</string>
+    <string name="format_time">Tijdsindeling</string>
+    <string name="format_time_support">Voorbeeld: Toon 130 minuten als 2u 10m</string>
+    <string name="units_sorting">Sorteer eenhedenlijst</string>
+    <string name="units_sorting_support">Volgorde eenheden wijzigen</string>
+
+    <!-- Units list sorting -->
+    <string name="sort_by_usage">Gebruik</string>
+    <string name="sort_by_alphabetical">Alfabetisch</string>
+    <string name="sort_by_scale_desc">Schaal (afl.)</string>
+    <string name="sort_by_scale_asc">Schaal (opl.)</string>
+    <string name="color_theme_support">Selecteer kleurthema</string>
+    <string name="color_scheme">Kleurenschema</string>
+    <string name="selected_color">Geselecteerde kleur</string>
+    <string name="monet_mode">Geselecteerde stijl</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/Gj9ZCNPXIfKddDQgccvboVFz.jpg 
+https://s3.eu-west-1.amazonaws.com/po-pub/i/prtM85P6x1fMuLg1I0zbkceo.png 
+
+Maybe this can be labeled better? Let me know. It should be something that can describe content of the Formatting screen. -->
+    <string name="formatting_setting_support">Nauwkeurigheid en cijferuiterlijk</string>
+    <string name="divide_by_zero_error">Kan niet door 0 delen</string>
+    <string name="date_difference">Datumverschil</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/uWOHJmIq9riqsq7PO82ZQp3a.png -->
+    <string name="select_time">Tijd selecteren</string>
+    <string name="date_difference_start">Begin</string>
+    <string name="date_difference_end">Eind</string>
+    <string name="date_difference_result">Verschil</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
+    <string name="date_difference_years">Jaren</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
+    <string name="date_difference_months">Maanden</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
+    <string name="date_difference_days">Dagen</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
+    <string name="date_difference_hours">Uur</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
+    <string name="date_difference_minutes">Minuten</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/9lSfdkfKShwyQFEF4nvbVaIb.jpg 
+
+Used in this dialog window. Should be short -->
+    <string name="next_label">Volgende</string>
+    <string name="formatting_setting_preview_box_label">Voorbeeld (klik om te wisselen)</string>
+    <string name="gibibit">Gibibit</string>
+    <string name="gibibit_short">Gib</string>
+    <string name="gibibyte">Gibi</string>
+    <string name="gibibyte_short">GiB</string>
+    <string name="gibibit_per_second">Gibibit/seconde</string>
+    <string name="gibibit_per_second_short">Gib/s</string>
+    <string name="gibibyte_per_second">Gibibyte/seconde</string>
+    <string name="gibibyte_per_second_short">GiB/s</string>
+    <string name="time_zone_screen">Tijdzones</string>
+    <string name="try_again_label">Klik om opnieuw te proberen</string>
+    <string name="tomorrow">Morgen</string>
+    <string name="yesterday">Gisteren</string>
+    <string name="search_text_field_placeholder">Zoek…</string>
+    <string name="add_time_zone_title">Voeg tijdzone toe</string>
+    <string name="middle_zero_option">Nul in het midden</string>
+    <string name="middle_zero_option_support">Verwissel de nul en decimale knoppen</string>
+    <string name="difference">Verschil</string>
+    <string name="add">Optellen</string>
+    <string name="subtract">Aftrekken</string>
+    <string name="date_calculator">Datum berekenen</string>
+</resources>
\ No newline at end of file
diff --git a/core/base/src/main/res/values-ru/strings.xml b/core/base/src/main/res/values-ru/strings.xml
index ffed6130..d315f1f8 100644
--- a/core/base/src/main/res/values-ru/strings.xml
+++ b/core/base/src/main/res/values-ru/strings.xml
@@ -99,47 +99,47 @@
     <string name="kelvin">Кельвин</string>
 
     <!-- Speed -->
-    <string name="millimeter_per_hour">Миллиметр в час</string>
+    <string name="millimeter_per_hour">Миллиметр/час</string>
     <string name="millimeter_per_hour_short">мм/ч</string>
-    <string name="millimeter_per_minute">Миллиметр в минуту</string>
+    <string name="millimeter_per_minute">Миллиметр/минута</string>
     <string name="millimeter_per_minute_short">мм/м</string>
-    <string name="millimeter_per_second">Миллиметр в секунду</string>
+    <string name="millimeter_per_second">Миллиметр/секунда</string>
     <string name="millimeter_per_second_short">мм/с</string>
-    <string name="centimeter_per_hour">Сантиметр в час</string>
+    <string name="centimeter_per_hour">Сантиметр/час</string>
     <string name="centimeter_per_hour_short">см/ч</string>
-    <string name="centimeter_per_minute">Сантиметр в минуту</string>
+    <string name="centimeter_per_minute">Сантиметр/минута</string>
     <string name="centimeter_per_minute_short">см/м</string>
-    <string name="centimeter_per_second">Сантиметр в секунду</string>
+    <string name="centimeter_per_second">Сантиметр/секунда</string>
     <string name="centimeter_per_second_short">см/с</string>
-    <string name="meter_per_hour">Метр в час</string>
+    <string name="meter_per_hour">Метр/час</string>
     <string name="meter_per_hour_short">м/ч</string>
-    <string name="meter_per_minute">Метр в минуту</string>
+    <string name="meter_per_minute">Метр/минута</string>
     <string name="meter_per_minute_short">м/м</string>
-    <string name="meter_per_second">Метр в секунду</string>
+    <string name="meter_per_second">Метр/секунда</string>
     <string name="meter_per_second_short">м/с</string>
-    <string name="kilometer_per_hour">Километр в час</string>
+    <string name="kilometer_per_hour">Километр/час</string>
     <string name="kilometer_per_hour_short">км/ч</string>
-    <string name="kilometer_per_minute">Километр в минуту</string>
+    <string name="kilometer_per_minute">Километр/минута</string>
     <string name="kilometer_per_minute_short">км/м</string>
-    <string name="kilometer_per_second">Километр в секунду</string>
+    <string name="kilometer_per_second">Километр/секунда</string>
     <string name="kilometer_per_second_short">км/с</string>
-    <string name="foot_per_hour">Фут в час</string>
+    <string name="foot_per_hour">Фут/час</string>
     <string name="foot_per_hour_short">фут/ч</string>
-    <string name="foot_per_minute">Фут в минуту</string>
+    <string name="foot_per_minute">Фут/минута</string>
     <string name="foot_per_minute_short">фут/м</string>
-    <string name="foot_per_second">Фут в секунду</string>
+    <string name="foot_per_second">Фут/секунда</string>
     <string name="foot_per_second_short">фут/с</string>
-    <string name="yard_per_hour">Ярд в час</string>
+    <string name="yard_per_hour">Ярд/час</string>
     <string name="yard_per_hour_short">ярд/ч</string>
-    <string name="yard_per_minute">Ярд в минуту</string>
+    <string name="yard_per_minute">Ярд/минута</string>
     <string name="yard_per_minute_short">ярд/м</string>
-    <string name="yard_per_second">Ярд в секунду</string>
+    <string name="yard_per_second">Ярд/секунда</string>
     <string name="yard_per_second_short">ярд/с</string>
-    <string name="mile_per_hour">Миля в час</string>
+    <string name="mile_per_hour">Миля/час</string>
     <string name="mile_per_hour_short">миля/ч</string>
-    <string name="mile_per_minute">Миля в минуту</string>
+    <string name="mile_per_minute">Миля/минута</string>
     <string name="mile_per_minute_short">миля/м</string>
-    <string name="mile_per_second">Миля в секунду</string>
+    <string name="mile_per_second">Миля/секунда</string>
     <string name="mile_per_second_short">миля/с</string>
     <string name="knot">Узел</string>
     <string name="knot_short">уз</string>
@@ -190,41 +190,41 @@
     <string name="exabyte_short">ЭБ</string>
 
     <!-- Data transfer -->
-    <string name="bit_per_second">Бит в секунду</string>
+    <string name="bit_per_second">Бит/секунда</string>
     <string name="bit_per_second_short">б/с</string>
-    <string name="kibibit_per_second">Кибибит в секунду</string>
+    <string name="kibibit_per_second">Кибибит/секунда</string>
     <string name="kibibit_per_second_short">Киб/с</string>
-    <string name="kilobit_per_second">Килобит в секунду</string>
+    <string name="kilobit_per_second">Килобит/секунда</string>
     <string name="kilobit_per_second_short">Кб/с</string>
-    <string name="megabit_per_second">Мегабит в секунду</string>
+    <string name="megabit_per_second">Мегабит/секунда</string>
     <string name="megabit_per_second_short">Мб/с</string>
-    <string name="mebibit_per_second">Мебибит в секунду</string>
+    <string name="mebibit_per_second">Мебибит/секунда</string>
     <string name="mebibit_per_second_short">Миб/с</string>
-    <string name="gigabit_per_second">Гигабит в секунду</string>
+    <string name="gigabit_per_second">Гигабит/секунда</string>
     <string name="gigabit_per_second_short">Гб/с</string>
-    <string name="terabit_per_second">Терабит в секунду</string>
+    <string name="terabit_per_second">Терабит/секунда</string>
     <string name="terabit_per_second_short">Тб/с</string>
-    <string name="petabit_per_second">Петабит в секунду</string>
+    <string name="petabit_per_second">Петабит/секунда</string>
     <string name="petabit_per_second_short">Пб/с</string>
-    <string name="exabit_per_second">Эксабит в секунду</string>
+    <string name="exabit_per_second">Эксабит/секунда</string>
     <string name="exabit_per_second_short">Эб/с</string>
-    <string name="byte_per_second">Байт в секунду</string>
+    <string name="byte_per_second">Байт/секунда</string>
     <string name="byte_per_second_short">Б/с</string>
-    <string name="kibibyte_per_second">Кибибайт в секунду</string>
+    <string name="kibibyte_per_second">Кибибайт/секунда</string>
     <string name="kibibyte_per_second_short">КиБ/с</string>
-    <string name="kilobyte_per_second">Килобайт в секунду</string>
+    <string name="kilobyte_per_second">Килобайт/секунда</string>
     <string name="kilobyte_per_second_short">КБ/с</string>
-    <string name="megabyte_per_second">Мегабайт в секунду</string>
+    <string name="megabyte_per_second">Мегабайт/секунда</string>
     <string name="megabyte_per_second_short">МБ/с</string>
-    <string name="mebibyte_per_second">Мебибайт в секунду</string>
+    <string name="mebibyte_per_second">Мебибайт/секунда</string>
     <string name="mebibyte_per_second_short">МиБ/с</string>
-    <string name="gigabyte_per_second">Гигабайт в секунду</string>
+    <string name="gigabyte_per_second">Гигабайт/секунда</string>
     <string name="gigabyte_per_second_short">ГБ/с</string>
-    <string name="terabyte_per_second">Терабайт в секунду</string>
+    <string name="terabyte_per_second">Терабайт/секунда</string>
     <string name="terabyte_per_second_short">ТБ/с</string>
-    <string name="petabyte_per_second">Петабайт в секунду</string>
+    <string name="petabyte_per_second">Петабайт/секунда</string>
     <string name="petabyte_per_second_short">ПБ/с</string>
-    <string name="exabyte_per_second">Эксабайт в секунду</string>
+    <string name="exabyte_per_second">Эксабайт/секунда</string>
     <string name="exabyte_per_second_short">ЭБ/с</string>
 
     <!-- Volume -->
@@ -417,29 +417,29 @@
     <string name="millimeter_of_mercury_short">мм рт.ст.</string>
 
     <!-- Acceleration -->
-    <string name="attometer_per_square_second">Аттометер на секунду в квадрате</string>
+    <string name="attometer_per_square_second">Аттометр/секунда в квадрате</string>
     <string name="attometer_per_square_second_short">ам/с^2</string>
-    <string name="femtometer_per_square_second">Фемтометер на секунду в квадрате</string>
+    <string name="femtometer_per_square_second">Фемтометр/секунда в квадрате</string>
     <string name="femtometer_per_square_second_short">фм/с^2</string>
-    <string name="picometer_per_square_second">Пикометер на секунду в квадрате</string>
+    <string name="picometer_per_square_second">Пикометр/секунда в квадрате</string>
     <string name="picometer_per_square_second_short">пм/с^2</string>
-    <string name="nanometer_per_square_second">Нанометер на секунду в квадрате</string>
+    <string name="nanometer_per_square_second">Нанометр/секунда в квадрате</string>
     <string name="nanometer_per_square_second_short">нм/с^2</string>
-    <string name="micrometer_per_square_second">Микрометер на секунду в квадрате</string>
+    <string name="micrometer_per_square_second">Микрометр/секунда в квадрате</string>
     <string name="micrometer_per_square_second_short">мкм/с^2</string>
-    <string name="millimeter_per_square_second">Миллиметер на секунду в квадрате</string>
+    <string name="millimeter_per_square_second">Миллиметр/секунда в квадрате</string>
     <string name="millimeter_per_square_second_short">мм/с^2</string>
-    <string name="centimeter_per_square_second">Сантиметер на секунду в квадрате</string>
+    <string name="centimeter_per_square_second">Сантиметр/секунда в квадрате</string>
     <string name="centimeter_per_square_second_short">см/с^2</string>
-    <string name="decimeter_per_square_second">Дециметер на секунду в квадрате</string>
+    <string name="decimeter_per_square_second">Дециметр/секунда в квадрате</string>
     <string name="decimeter_per_square_second_short">дм/с^2</string>
-    <string name="meter_per_square_second">Метер на секунду в квадрате</string>
+    <string name="meter_per_square_second">Метр/секунда в квадрате</string>
     <string name="meter_per_square_second_short">м/с^2</string>
-    <string name="kilometer_per_square_second">Километер на секунду в квадрате</string>
+    <string name="kilometer_per_square_second">Километр/секунда в квадрате</string>
     <string name="kilometer_per_square_second_short">км/с^2</string>
-    <string name="dekameter_per_square_second">Декаметер на секунду в квадрате</string>
+    <string name="dekameter_per_square_second">Декаметр/секунда в квадрате</string>
     <string name="dekameter_per_square_second_short">дам/с^2</string>
-    <string name="hectometer_per_square_second">Гектометер на секунду в квадрате</string>
+    <string name="hectometer_per_square_second">Гектометр/секунда в квадрате</string>
     <string name="hectometer_per_square_second_short">гм/с^2</string>
     <string name="gal">Гал</string>
     <string name="gal_short">Гал</string>
@@ -991,11 +991,11 @@
     <string name="cubic_foot_per_minute_short">фут^3/м</string>
     <string name="cubic_foot_per_second">Кубический фут/секунда</string>
     <string name="cubic_foot_per_second_short">фут^3/с</string>
-    <string name="gallon_per_hour_us">Галлон/час (Амер.)</string>
+    <string name="gallon_per_hour_us">Галлон/час (США)</string>
     <string name="gallon_per_hour_us_short">гал/ч</string>
-    <string name="gallon_per_minute_us">Галлон/минута (Амер.)</string>
+    <string name="gallon_per_minute_us">Галлон/минута (США)</string>
     <string name="gallon_per_minute_us_short">гал/м</string>
-    <string name="gallon_per_second_us">Галлон/секунда (Амер.)</string>
+    <string name="gallon_per_second_us">Галлон/секунда (США)</string>
     <string name="gallon_per_second_us_short">гал/с</string>
     <string name="gallon_per_hour_imperial">Галлон/час (Англ.)</string>
     <string name="gallon_per_hour_imperial_short">гал/ч</string>
@@ -1098,4 +1098,56 @@ Maybe this can be labeled better? Let me know. It should be something that can d
 Used in this dialog window. Should be short -->
     <string name="next_label">Далее</string>
     <string name="formatting_setting_preview_box_label">Предпросмотр (нажмите для переключения)</string>
+    <string name="gibibit">Гибибит</string>
+    <string name="gibibit_short">ГиБ</string>
+    <string name="gibibyte">Гибибайт</string>
+    <string name="gibibyte_short">Гиб</string>
+    <string name="gibibit_per_second">Гибибит/секунда</string>
+    <string name="gibibit_per_second_short">Гиб/с</string>
+    <string name="gibibyte_per_second">Гибибайт/секунда</string>
+    <string name="gibibyte_per_second_short">ГиБ/с</string>
+    <string name="try_again_label">Нажмите для повторной попытки</string>
+    <string name="tomorrow">Завтра</string>
+    <string name="yesterday">Вчера</string>
+    <string name="search_text_field_placeholder">Поиск…</string>
+    <string name="middle_zero_option">Ноль по середине</string>
+    <string name="middle_zero_option_support">Поменять местами кнопки \"ноль\" и \"точка\"</string>
+    <string name="difference">Разница</string>
+    <string name="add">Сложить</string>
+    <string name="subtract">Вычесть</string>
+    <string name="date_calculator">Калькулятор дат</string>
+    <string name="language_setting">Язык</string>
+    <string name="language_setting_support">Изменить язык приложения</string>
+    <string name="system_font_setting">Системный шрифт</string>
+    <string name="system_font_setting_support">Использовать системный шрифт для текстов в приложении</string>
+    <string name="fuel_consumption">Топливо</string>
+    <string name="km_per_l">Километр/литр</string>
+    <string name="km_per_l_short">км/л</string>
+    <string name="l_per_km">Литр/километер</string>
+    <string name="l_per_km_short">л/км</string>
+    <string name="l_per_100_km">Литр/100 Километров</string>
+    <string name="l_per_100_km_short">л/100 км</string>
+    <string name="mi_per_gallon_uk">Миля/галлон (Англ.)</string>
+    <string name="mi_per_gallon_uk_short">миля/гал (англ.)</string>
+    <string name="mi_per_gallon_us">Мила/галлон (США)</string>
+    <string name="mi_per_gallon_us_short">миля/гал (США)</string>
+    <string name="mi_us_per_l">Миля/литр (США)</string>
+    <string name="mi_us_per_l_short">миля/л (США)</string>
+    <string name="gallon_us_per_mile">Галлон/миля (США)</string>
+    <string name="gallon_us_per_mile_short">гал/миля (США)</string>
+    <string name="gallon_uk_per_mile">Галлон/миля (Англ.)</string>
+    <string name="gallon_uk_per_mile_short">гал/миля (англ.)</string>
+    <string name="gallon_us_per_100_mile">Галлон/100 миль (США)</string>
+    <string name="gallon_us_per_100_mile_short">гал/100 миль (США)</string>
+    <string name="gallon_uk_per_100_mile">Галлон/100 миль (Англ.)</string>
+    <string name="gallon_uk_per_100_mile_short">гал/100 миль (Англ.)</string>
+    <string name="partial_history_view_setting">Частичный вид истории</string>
+    <string name="partial_history_view_setting_support">Просмотр последней записи в истории</string>
+    <string name="calculator_settings_support">Вид истории</string>
+    <string name="converter_settings_support">Группы единиц, сортировка, форматирование</string>
+    <string name="display_settings">Внешний вид</string>
+    <string name="clear_cache">Очистить кэш</string>
+
+    <!-- Option name to use system default setting -->
+    <string name="system">Системный</string>
 </resources>
\ No newline at end of file
diff --git a/core/base/src/main/res/values-tr/strings.xml b/core/base/src/main/res/values-tr/strings.xml
new file mode 100644
index 00000000..25d9171f
--- /dev/null
+++ b/core/base/src/main/res/values-tr/strings.xml
@@ -0,0 +1,596 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Length -->
+    <string name="attometer">Attometre</string>
+    <string name="attometer_short">am</string>
+    <string name="nanometer">Nanometre</string>
+    <string name="nanometer_short">nm</string>
+    <string name="micrometer">Mikrometre</string>
+    <string name="micrometer_short">μm</string>
+    <string name="millimeter">Milimetre</string>
+    <string name="millimeter_short">mm</string>
+    <string name="centimeter">Santimetre</string>
+    <string name="centimeter_short">cm</string>
+    <string name="decimeter">Desimetre</string>
+    <string name="decimeter_short">dm</string>
+    <string name="meter">Metre</string>
+    <string name="meter_short">m</string>
+    <string name="kilometer">Kilometre</string>
+    <string name="kilometer_short">km</string>
+    <string name="mile">Mil</string>
+    <string name="yard">Yarda</string>
+    <string name="yard_short">yd</string>
+    <string name="foot">Fit</string>
+    <string name="foot_short">ft</string>
+    <string name="inch">İnç</string>
+    <string name="inch_short">in</string>
+    <string name="light_year">Işık yılı</string>
+    <string name="light_year_short">ly</string>
+    <string name="parsec">Parsek</string>
+    <string name="parsec_short">pc</string>
+    <string name="kiloparsec">Kiloparsek</string>
+    <string name="kiloparsec_short">kpc</string>
+    <string name="megaparsec">Megaparsek</string>
+    <string name="megaparsec_short">Mpc</string>
+    <string name="mercury_equatorial_radius">Merkür ekvator yarıçapı</string>
+    <string name="mercury_equatorial_radius_short">Merkür R</string>
+    <string name="venus_equatorial_radius">Venüs ekvator yarıçapı</string>
+    <string name="venus_equatorial_radius_short">Venüs R</string>
+    <string name="earth_equatorial_radius">Dünya ekvator yarıçapı</string>
+    <string name="earth_equatorial_radius_short">Dünya R</string>
+    <string name="mars_equatorial_radius">Mars ekvator yarıçapı</string>
+    <string name="mars_equatorial_radius_short">Mars R</string>
+    <string name="jupiter_equatorial_radius">Jüpiter ekvator yarıçapı</string>
+    <string name="jupiter_equatorial_radius_short">Jüpiter R</string>
+    <string name="saturn_equatorial_radius">Satürn ekvator yarıçapı</string>
+    <string name="saturn_equatorial_radius_short">Satürn R</string>
+    <string name="uranus_equatorial_radius">Uranüs ekvator yarıçapı</string>
+    <string name="uranus_equatorial_radius_short">Uranüs R</string>
+    <string name="neptune_equatorial_radius">Neptün ekvator yarıçapı</string>
+    <string name="neptune_equatorial_radius_short">Neptün R</string>
+    <string name="sun_equatorial_radius">Güneş ekvator yarıçapı</string>
+    <string name="sun_equatorial_radius_short">Güneş R</string>
+
+    <!-- Mass -->
+    <string name="electron_mass_rest">Elektron kütlesi</string>
+    <string name="electron_mass_rest_short">me</string>
+    <string name="atomic_mass_unit">Dalton</string>
+    <string name="atomic_mass_unit_short">u</string>
+    <string name="milligram">Miligram</string>
+    <string name="milligram_short">mg</string>
+    <string name="gram">Gram</string>
+    <string name="gram_short">g</string>
+    <string name="kilogram">Kilogram</string>
+    <string name="kilogram_short">kg</string>
+    <string name="metric_ton">Metrik ton</string>
+    <string name="metric_ton_short">t</string>
+    <string name="imperial_ton">İngiliz tonu</string>
+    <string name="imperial_ton_short">t (UK)</string>
+    <string name="pound">Pound</string>
+    <string name="pound_short">lbs</string>
+    <string name="ounce">Ons</string>
+    <string name="ounce_short">oz</string>
+    <string name="carat">Karat</string>
+    <string name="carat_short">ct</string>
+    <string name="mercury_mass">Merkür kütlesi</string>
+    <string name="mercury_mass_short">Merkür M</string>
+    <string name="venus_mass">Venüs kütlesi</string>
+    <string name="venus_mass_short">Venüs M</string>
+    <string name="earth_mass">Dünya kütlesi</string>
+    <string name="earth_mass_short">Dünya M</string>
+    <string name="mars_mass">Mars kütlesi</string>
+    <string name="mars_mass_short">Mars M</string>
+    <string name="jupiter_mass">Jüpiter kütlesi</string>
+    <string name="jupiter_mass_short">Jüpiter M</string>
+    <string name="saturn_mass">Satürn kütlesi</string>
+    <string name="saturn_mass_short">Satürn M</string>
+    <string name="uranus_mass">Uranüs kütlesi</string>
+    <string name="uranus_mass_short">Uranüs M</string>
+    <string name="neptune_mass">Neptün kütlesi</string>
+    <string name="neptune_mass_short">Neptün M</string>
+    <string name="sun_mass">Güneş kütlesi</string>
+    <string name="sun_mass_short">Güneş M</string>
+
+    <!-- Temperature -->
+    <string name="celsius">Celsius</string>
+    <string name="fahrenheit">Fahrenhayt</string>
+    <string name="kelvin">Kelvin</string>
+
+    <!-- Speed -->
+    <string name="millimeter_per_hour">Milimetre/saat</string>
+    <string name="millimeter_per_hour_short">mm/sa</string>
+    <string name="millimeter_per_minute">Milimetre/dakika</string>
+    <string name="millimeter_per_minute_short">Milimetre/dk</string>
+    <string name="millimeter_per_second">Milimetre/saniye</string>
+    <string name="millimeter_per_second_short">mm/sn</string>
+    <string name="centimeter_per_hour">Santimetre/saat</string>
+    <string name="centimeter_per_hour_short">cm/sa</string>
+    <string name="centimeter_per_minute">Santimetre/dakika</string>
+    <string name="centimeter_per_minute_short">cm/dk</string>
+    <string name="centimeter_per_second">Santimetre/saniye</string>
+    <string name="centimeter_per_second_short">cm/sn</string>
+    <string name="meter_per_hour">Metre/saat</string>
+    <string name="meter_per_hour_short">m/sa</string>
+    <string name="meter_per_minute">Metre/dakika</string>
+    <string name="meter_per_minute_short">m/dk</string>
+    <string name="meter_per_second">Metre/saniye</string>
+    <string name="meter_per_second_short">m/sn</string>
+    <string name="kilometer_per_hour">Kilometre/saat</string>
+    <string name="kilometer_per_hour_short">km/sa</string>
+    <string name="kilometer_per_minute">Kilometre/dakika</string>
+    <string name="kilometer_per_minute_short">km/dk</string>
+    <string name="kilometer_per_second">Kilometre/saniye</string>
+    <string name="kilometer_per_second_short">km/sn</string>
+    <string name="foot_per_hour">Fit/saat</string>
+    <string name="foot_per_hour_short">ft/sa</string>
+    <string name="foot_per_minute">Fit/dakika</string>
+    <string name="foot_per_minute_short">ft/dk</string>
+    <string name="foot_per_second">Fit/saniye</string>
+    <string name="foot_per_second_short">ft/sn</string>
+    <string name="yard_per_hour">Yarda/saat</string>
+    <string name="yard_per_hour_short">yd/sa</string>
+    <string name="yard_per_minute">Yarda/dakika</string>
+    <string name="yard_per_minute_short">yd/dk</string>
+    <string name="yard_per_second">Yarda/saniye</string>
+    <string name="yard_per_second_short">yd/sn</string>
+    <string name="mile_per_hour">Mil/saat</string>
+    <string name="mile_per_hour_short">mi/sa</string>
+    <string name="mile_per_minute">Mil/dakika</string>
+    <string name="mile_per_minute_short">mi/dk</string>
+    <string name="mile_per_second">Mil/saniye</string>
+    <string name="mile_per_second_short">mi/sn</string>
+    <string name="knot">Knot</string>
+    <string name="knot_short">kt</string>
+    <string name="velocity_of_light_in_vacuum">Işığın boşluktaki hızı</string>
+    <string name="cosmic_velocity_first">İlk Kozmik Hız</string>
+    <string name="cosmic_velocity_second">İkinci Kozmik Hız</string>
+    <string name="cosmic_velocity_third">Üçüncü Kozmik Hız</string>
+    <string name="earths_orbital_speed">Dünyanın yörünge hızı</string>
+    <string name="mach">Mach</string>
+    <string name="mach_si_standard">Mach (SI)</string>
+
+    <!-- File size -->
+    <string name="bit">Bit</string>
+    <string name="bit_short">b</string>
+    <string name="kibibit">Kibibit</string>
+    <string name="kibibit_short">Kib</string>
+    <string name="kilobit">Kilobit</string>
+    <string name="kilobit_short">Kb</string>
+    <string name="megabit">Megabit</string>
+    <string name="megabit_short">Mb</string>
+    <string name="mebibit">Mebibit</string>
+    <string name="gigabit">Gigabit</string>
+    <string name="terabit">Terabit</string>
+    <string name="petabit">Petabit</string>
+    <string name="exabit">Eksabit</string>
+    <string name="byte_">Bayt</string>
+    <string name="kibibyte">Kibibayt</string>
+    <string name="kilobyte">Kilobayt</string>
+    <string name="megabyte">Megabayt</string>
+    <string name="mebibyte">Mebibayt</string>
+    <string name="gigabyte">Gigabayt</string>
+    <string name="terabyte">Terabayt</string>
+    <string name="petabyte">Petabayt</string>
+    <string name="exabyte">Eksabayt</string>
+
+    <!-- Data transfer -->
+    <string name="bit_per_second">Bit/saniye</string>
+    <string name="kibibit_per_second">Kibibit/saniye</string>
+    <string name="kilobit_per_second">Kibibit/saniye</string>
+    <string name="megabit_per_second">Megabit/saniye</string>
+    <string name="mebibit_per_second">Mebibit/saniye</string>
+    <string name="gigabit_per_second">Gigabit/saniye</string>
+    <string name="terabit_per_second">Terabit/saniye</string>
+    <string name="petabit_per_second">Petabit/saniye</string>
+    <string name="exabit_per_second">Eksabit/saniye</string>
+    <string name="byte_per_second">Bayt/saniye</string>
+    <string name="kibibyte_per_second">Kibibayt/saniye</string>
+    <string name="kilobyte_per_second">Kilobayt/saniye</string>
+    <string name="megabyte_per_second">Megabayt/saniye</string>
+    <string name="mebibyte_per_second">Mebibayt/saniye</string>
+    <string name="gigabyte_per_second">Gigabayt/saniye</string>
+    <string name="terabyte_per_second">Terabayt/saniye</string>
+    <string name="petabyte_per_second">Petabayt/saniye</string>
+    <string name="exabyte_per_second">Eksabayt/saniye</string>
+
+    <!-- Volume -->
+    <string name="attoliter">Attolitre</string>
+    <string name="milliliter">Mililitre</string>
+    <string name="liter">Litre</string>
+    <string name="cubic_millimeter">Milimetreküp</string>
+    <string name="cubic_centimeter">Santimetreküp</string>
+    <string name="cubic_meter">Metreküp</string>
+    <string name="cubic_kilometer">Kilometreküp</string>
+
+    <!-- Time -->
+    <string name="attosecond">Attosaniye</string>
+    <string name="nanosecond">Nanosaniye</string>
+    <string name="microsecond">Mikrosaniye</string>
+    <string name="millisecond">Milisaniye</string>
+    <string name="second">Saniye</string>
+    <string name="second_short">sn</string>
+    <string name="minute">Dakika</string>
+    <string name="minute_short">dk</string>
+    <string name="hour">Saat</string>
+    <string name="hour_short">sa</string>
+    <string name="day">Gün</string>
+    <string name="day_short">g</string>
+    <string name="week">Hafta</string>
+    <string name="week_short">h</string>
+    <string name="acre">Dönüm</string>
+    <string name="hectare">Hektar</string>
+    <string name="square_foot">Fitkare</string>
+    <string name="square_mile">Milkare</string>
+    <string name="square_yard">Yardakare</string>
+    <string name="square_inch">İnçkare</string>
+    <string name="square_micrometer">Mikrometrekare</string>
+    <string name="square_millimeter">Milimetrekare</string>
+    <string name="square_centimeter">Santimetrekare</string>
+    <string name="square_decimeter">Desimetrekare</string>
+    <string name="square_meter">Metrekare</string>
+    <string name="square_kilometer">Kilometrekare</string>
+    <string name="energy_horse_power_metric">Beygir gücü</string>
+    <string name="calorie_th">Kalori (th)</string>
+    <string name="kilocalorie_th">Kilokalori (th)</string>
+    <string name="horse_power_mechanical">Beygir gücü</string>
+
+    <!-- Angle -->
+    <string name="angle_second">Saniye</string>
+    <string name="angle_minute">Dakika</string>
+    <string name="degree">Derece</string>
+    <string name="radian">Radyan</string>
+    <string name="sextant">Sekstant</string>
+    <string name="turn">Tur</string>
+
+    <!-- Pressure -->
+    <string name="attopascal">Attopaskal</string>
+    <string name="femtopascal">Femtopaskal</string>
+    <string name="picopascal">Pikopaskal</string>
+    <string name="nanopascal">Nanopaskal</string>
+    <string name="micropascal">Mikropaskal</string>
+    <string name="millipascal">Milipaskal</string>
+    <string name="centipascal">Santipaskal</string>
+    <string name="decipascal">Desipaskal</string>
+    <string name="pascal">Paskal</string>
+    <string name="dekapascal">Dekapaskal</string>
+    <string name="hectopascal">Hektopaskal</string>
+    <string name="megapascal">Megapaskal</string>
+    <string name="gigapascal">Gigapaskal</string>
+    <string name="terapascal">Terapaskal</string>
+    <string name="petapascal">Petapaskal</string>
+    <string name="exapascal">Eksapaskal</string>
+    <string name="psi">Pound/inçkare</string>
+    <string name="ksi">Kilopound/inçkare</string>
+    <string name="standard_atmosphere">Standart atmosfer</string>
+    <string name="millimeter_of_mercury">Milimetre cıva</string>
+
+    <!-- Acceleration -->
+    <string name="attometer_per_square_second">Attometre/saniye kare</string>
+    <string name="femtometer_per_square_second">Femtometre/saniye kare</string>
+    <string name="picometer_per_square_second">Pikometre/saniye kare</string>
+    <string name="nanometer_per_square_second">Nanometre/saniye kare</string>
+    <string name="micrometer_per_square_second">Mikrometre/saniye kare</string>
+    <string name="millimeter_per_square_second">Milimetre/saniye kare</string>
+    <string name="centimeter_per_square_second">Santimetre/saniye kare</string>
+    <string name="decimeter_per_square_second">Desimetre/saniye kare</string>
+    <string name="meter_per_square_second">Metre/saniye kare</string>
+    <string name="kilometer_per_square_second">Kilometre/saniye kare</string>
+    <string name="dekameter_per_square_second">Dekametre/saniye kare</string>
+    <string name="hectometer_per_square_second">Hektometre/saniye kare</string>
+    <string name="mercury_surface_gravity">Merkür yüzey yerçekimi</string>
+    <string name="venus_surface_gravity">Venüs yüzey yerçekimi</string>
+    <string name="earth_surface_gravity">Dünya yüzeyi yerçekimi</string>
+    <string name="mars_surface_gravity">Mars yüzey yerçekimi</string>
+    <string name="jupiter_surface_gravity">Jüpiter yüzey yerçekimi</string>
+    <string name="saturn_surface_gravity">Satürn yüzey yerçekimi</string>
+    <string name="uranus_surface_gravity">Uranüs yüzey yerçekimi</string>
+    <string name="neptune_surface_gravity">Neptün yüzey yerçekimi</string>
+    <string name="sun_surface_gravity">Güneş yüzeyi yerçekimi</string>
+    <string name="currency_aed">Birleşik Arap Emirlikleri Dirhemi</string>
+    <string name="currency_afn">Afgan Afganisi</string>
+    <string name="currency_all">Arnavutluk Leki</string>
+    <string name="currency_amd">Ermenistan Dramı</string>
+    <string name="currency_ang">Hollanda Antilleri Guldeni</string>
+    <string name="currency_aoa">Angola Kwanzası</string>
+    <string name="currency_ars">Arjantin Pesosu</string>
+    <string name="currency_aud">Avustralya Doları</string>
+    <string name="currency_awg">Aruba Florini</string>
+    <string name="currency_azn">Azerbaycan Manatı</string>
+    <string name="currency_bam">Bosna-Hersek Markı</string>
+    <string name="currency_bbd">Barbados Doları</string>
+    <string name="currency_bdt">Bangladeş Takası</string>
+    <string name="currency_bgn">Bulgar Levası</string>
+    <string name="currency_bhd">Bahreyn Dinarı</string>
+    <string name="currency_bif">Burundi Frangı</string>
+    <string name="currency_bmd">Bermuda Doları</string>
+    <string name="currency_bnd">Brunei Doları</string>
+    <string name="currency_bob">Bolivya Bolivianosu</string>
+    <string name="currency_brl">Brezilya Reali</string>
+    <string name="currency_bsd">Bahama Doları</string>
+    <string name="currency_btn">Bhutan parası</string>
+    <string name="currency_bwp">Botsvana Pulası</string>
+    <string name="currency_byn">Yeni Beyaz Rusya Rublesi</string>
+    <string name="currency_byr">Beyaz Rusya Rublesi</string>
+    <string name="currency_eur">Euro</string>
+    <string name="currency_gbp">İngiliz Sterlini</string>
+    <string name="currency_try">Türk Lirası</string>
+    <string name="currency_ttd">Trinidad ve Tobago Doları</string>
+    <string name="currency_twd">Yeni Tayvan Doları</string>
+    <string name="currency_tzs">Tanzanya Şilini</string>
+    <string name="currency_uah">Ukrayna Grivnası</string>
+    <string name="currency_ugx">Uganda Şilini</string>
+    <string name="currency_usd">ABD Doları</string>
+    <string name="currency_uyu">Uruguay Pesosu</string>
+    <string name="currency_uzs">Özbekistan Somu</string>
+    <string name="currency_vef">Venezuela Bolivarı</string>
+    <string name="currency_vnd">Vietnam Dongu</string>
+    <string name="currency_vuv">Vanuatu Vatusu</string>
+    <string name="currency_wst">Samoa Talası</string>
+    <string name="currency_xaf">Orta Afrika CFA Frangı</string>
+    <string name="currency_xag">Ons Gümüş</string>
+    <string name="currency_xcd">Doğu Karayip Doları</string>
+    <string name="currency_xof">Batı Afrika CFA Frangı</string>
+    <string name="currency_xpf">CFP Frangı</string>
+    <string name="currency_yer">Yemen Riyali</string>
+    <string name="currency_zar">Güney Afrika Randı</string>
+    <string name="currency_zmk">Zambiya kvaçası</string>
+    <string name="currency_zmw">Zambiya Kvaçası</string>
+    <string name="currency_zwl">Zimbabve doları</string>
+
+    <!-- Groups -->
+    <string name="length">Uzunluk</string>
+    <string name="time">Zaman</string>
+    <string name="volume">Hacim</string>
+    <string name="area">Alan</string>
+    <string name="temperature">Sıcaklık</string>
+    <string name="speed">Hız</string>
+    <string name="mass">Kütle</string>
+    <string name="data">Veri</string>
+    <string name="energy">Enerji</string>
+    <string name="power">Güç</string>
+    <string name="angle">Açı</string>
+    <string name="data_transfer">Veri transferi</string>
+    <string name="pressure">Basınç</string>
+    <string name="acceleration">İvme</string>
+    <string name="currency">Para birimi</string>
+
+    <!-- Screen names -->
+    <string name="units_screen_from">Şundan çevir</string>
+    <string name="units_screen_to">Şuna çevir</string>
+    <string name="settings_screen">Ayarlar</string>
+
+    <!-- Settings items -->
+    <string name="theme_setting">Temalar</string>
+    <string name="precision_setting">Hassasiyet</string>
+    <string name="separator_setting">Ayırıcı</string>
+    <string name="exponential_notation_setting">Üstel gösterim</string>
+    <string name="unit_groups_setting">Birim grupları</string>
+    <string name="currency_rates_note_setting">Döviz kurları yanlış mı?</string>
+    <string name="currency_rates_note_title">Not</string>
+    <string name="currency_rates_note_text">Döviz kurları günlük olarak güncellenmektedir. Uygulamada gerçek zamanlı piyasa izleme yoktur</string>
+    <string name="terms_and_conditions">Şartlar ve Koşullar</string>
+    <string name="privacy_policy">Gizlilik Politikası</string>
+    <string name="third_party_licenses">Üçüncü taraf lisansları</string>
+    <string name="rate_this_app">Bu uygulamayı oyla</string>
+    <string name="formatting_setting">Biçimlendirme</string>
+    <string name="additional_settings_group">Diğer ayarlar</string>
+
+    <!-- Precision -->
+    <string name="precision_setting_support">Ondalık basamak sayısı</string>
+    <string name="precision_setting_info">Dönüştürülen değerler tercih edilen değerden daha yüksek bir kesinliğe sahip olabilir.</string>
+    <string name="max_precision">%1$s (Maks)</string>
+
+    <!-- Separator -->
+    <string name="separator_setting_support">Grup ayırıcı sembol</string>
+    <string name="period">Nokta</string>
+    <string name="comma">Virgül</string>
+    <string name="space">Boşluk</string>
+
+    <!-- Output format -->
+    <string name="exponential_notation_setting_support">Sayının bir kısmını E ile değiştir</string>
+
+    <!-- Theme -->
+    <string name="theme_setting_support">Uygulama görünümü</string>
+    <string name="auto_label">Oto.</string>
+    <string name="force_light_mode">Açık</string>
+    <string name="force_dark_mode">Koyu</string>
+    <string name="color_theme">Renk teması</string>
+    <string name="force_amoled_mode">AMOLED Koyu</string>
+    <string name="force_amoled_mode_support">Koyu temalarda siyah arkaplan rengi kullan</string>
+    <string name="enable_dynamic_colors">Dinamik renkler</string>
+    <string name="enable_dynamic_colors_support">Duvar kağıdındaki renkleri kullan</string>
+
+    <!-- MISC. -->
+    <string name="loading_label">Yükleniyor…</string>
+    <string name="error_label">Hata</string>
+    <string name="copied">%1$s kopyalandı!</string>
+    <string name="cancel_label">İptal</string>
+    <string name="search_bar_placeholder">Birim ara</string>
+    <string name="search_placeholder">Sonuç bulunamadı</string>
+    <string name="search_placeholder_button_label">Ayarları aç</string>
+    <string name="search_placeholder_secondary">Yazım hatası olmadığından emin olun, farklı filtreler deneyin veya devre dışı bırakılan birim gruplarını kontrol edin.</string>
+    <string name="hello_label">Merhaba!</string>
+    <string name="enabled_label">Etkin</string>
+    <string name="disabled_label">Devre dışı</string>
+
+    <!-- Content descriptions -->
+    <string name="navigate_up_description">Yukarı git</string>
+    <string name="checked_filter_description">İşaretli filtre</string>
+    <string name="open_settings_description">Ayarları aç</string>
+    <string name="swap_units_description">Birimleri değiştir</string>
+    <string name="search_button_description">Arama düğmesi</string>
+    <string name="clear_input_description">Girdiyi temizle</string>
+    <string name="favorite_button_description">Birimi favorilere ekleyin veya favorilerden çıkarın</string>
+    <string name="empty_search_result_description">Arama sonucunu temizle</string>
+    <string name="drop_down_description">Açılır menüyü aç veya kapat</string>
+    <string name="enable_unit_group_description">Birim grubunu etkinleştir</string>
+    <string name="reorder_unit_group_description">Birim grubunu yeniden sırala</string>
+    <string name="disable_unit_group_description">Birim grubunu devre dışı bırak</string>
+    <string name="app_version_name_setting">Versiyon adı</string>
+    <string name="about_unitto">Unitto hakkında</string>
+    <string name="about_unitto_support">Uygulama hakkında bilgi edinin</string>
+    <string name="unit_groups_support">Birimleri devre dışı bırakın ve yeniden düzenleyin</string>
+    <string name="open_source">Kaynak kodunu görüntüle</string>
+    <string name="translate_app">Bu uygulamayı çevir</string>
+    <string name="translate_app_support">Yardım etmek için POEditor projesine katılın</string>
+    <string name="enable_vibrations">Titreşimler</string>
+    <string name="enable_vibrations_support">Klavye düğmelerini tıklattığınızda dokunsal geri bildirim</string>
+    <string name="kilopascal">Kilopaskal</string>
+    <string name="micron_of_mercury">Mikron cıva</string>
+
+    <!-- Calculator -->
+    <string name="calculator">Hesap Makinesi</string>
+    <string name="nautical_mile">Deniz mili</string>
+    <string name="starting_screen_setting">Başlangıç ekranı</string>
+    <string name="starting_screen_setting_support">Uygulamayı başlattığınızda hangi ekranın gösterileceğini seçin</string>
+
+    <!-- Tools -->
+    <string name="unit_converter">Birim dönüştürücü</string>
+    <string name="calculator_clear_history_label">Temizle</string>
+    <string name="calculator_clear_history_title">Geçmişi temizle</string>
+    <string name="calculator_clear_history_support">Geçmişteki tüm ifadeler tamamen silinecek. Bu işlem geri alınamaz!</string>
+    <string name="calculator_no_history">Geçmiş yok</string>
+    <string name="open_menu_description">Menüyü aç</string>
+    <string name="microgram">Mikrogram</string>
+    <string name="picofarad">Pikofarad</string>
+    <string name="microfarad">Mikrofarad</string>
+    <string name="prefix_hecto">Hekto</string>
+    <string name="prefix_deca">Deka</string>
+    <string name="prefix_deci">Desi</string>
+    <string name="prefix_centi">Santi</string>
+    <string name="prefix_micro">Mikro</string>
+    <string name="prefix_pico">Piko</string>
+    <string name="prefix_yocto">Yokto</string>
+    <string name="gram_force">Gram-kuvvet</string>
+    <string name="kilogram_force">Kilogram-kuvvet</string>
+    <string name="ton_force">Ton-kuvvet</string>
+    <string name="joule_per_meter">Joule/metre</string>
+    <string name="joule_per_centimeter">Joule/santimetre</string>
+    <string name="kilopound_force">Kilopound-kuvvet</string>
+    <string name="pound_force">Pound-kuvvet</string>
+    <string name="ounce_force">Ons kuvvet</string>
+
+    <!-- Torque -->
+    <string name="newton_meter">Newton metre</string>
+    <string name="newton_centimeter">Newton santimetre</string>
+    <string name="newton_millimeter">Newton milimetre</string>
+    <string name="kilonewton_meter">Kilonewton metre</string>
+    <string name="dyne_meter">Dyne metre</string>
+    <string name="dyne_centimeter">Dyne santimetre</string>
+    <string name="dyne_millimeter">Dyne milimetre</string>
+    <string name="kilogram_force_meter">Kilogram-kuvvet metre</string>
+    <string name="kilogram_force_centimeter">Kilogram-kuvvet santimetre</string>
+    <string name="kilogram_force_millimeter">Kilogram-kuvvet milimetre</string>
+    <string name="gram_force_meter">Gram-kuvvet metre</string>
+    <string name="gram_force_centimeter">Gram-kuvvet santimetre</string>
+    <string name="gram_force_millimeter">Gram-kuvvet milimetre</string>
+    <string name="ounce_force_foot">Ons-kuvvet fit</string>
+    <string name="ounce_force_inch">Ons-kuvvet inç</string>
+    <string name="pound_force_foot">Pound-kuvvet fit</string>
+    <string name="pound_force_inch">Pound-kuvvet inç</string>
+
+    <!-- Flow rate -->
+    <string name="liter_per_hour">Litre/saat</string>
+    <string name="liter_per_hour_short">L/sa</string>
+    <string name="liter_per_minute">Litre/dakika</string>
+    <string name="liter_per_minute_short">L/dk</string>
+    <string name="liter_per_second">Litre/saniye</string>
+    <string name="liter_per_second_short">L/sn</string>
+    <string name="milliliter_per_hour">Mililitre/saat</string>
+    <string name="milliliter_per_hour_short">mL/sa</string>
+    <string name="milliliter_per_minute">Mililitre/dakika</string>
+    <string name="milliliter_per_minute_short">mL/dk</string>
+    <string name="milliliter_per_second">Mililitre/saniye</string>
+    <string name="milliliter_per_second_short">mL/sn</string>
+    <string name="cubic_meter_per_hour">Metreküp/saat</string>
+    <string name="cubic_meter_per_hour_short">m3/sa</string>
+    <string name="cubic_meter_per_minute">Metreküp/dakika</string>
+    <string name="cubic_meter_per_minute_short">m3/dk</string>
+    <string name="cubic_meter_per_second">Metreküp/saniye</string>
+    <string name="cubic_meter_per_second_short">m3/sn</string>
+    <string name="cubic_millimeter_per_hour">Milimetreküp/saat</string>
+    <string name="cubic_millimeter_per_hour_short">mm3/sa</string>
+    <string name="cubic_millimeter_per_minute">Milimetreküp/dakika</string>
+    <string name="cubic_millimeter_per_minute_short">mm3/dk</string>
+    <string name="cubic_millimeter_per_second">Milimetreküp/saniye</string>
+    <string name="cubic_millimeter_per_second_short">mm3/sn</string>
+    <string name="cubic_foot_per_hour">Fitküp/saat</string>
+    <string name="cubic_foot_per_hour_short">ft/sa</string>
+    <string name="cubic_foot_per_minute">Fitküp/dakika</string>
+    <string name="cubic_foot_per_minute_short">ft/dk</string>
+    <string name="cubic_foot_per_second">Fitküp/saniye</string>
+    <string name="cubic_foot_per_second_short">ft/sn</string>
+    <string name="gallon_per_hour_us">Galon/saat (ABD)</string>
+    <string name="gallon_per_minute_us">Galon/dakika (ABD)</string>
+    <string name="gallon_per_second_us">Galon/saniye (ABD)</string>
+    <string name="gallon_per_hour_imperial">Galon/saat (İngiliz)</string>
+    <string name="gallon_per_minute_imperial">Galon/dakika (İngiliz)</string>
+    <string name="gallon_per_second_imperial">Galon/saniye (İngiliz)</string>
+
+    <!-- Luminance -->
+    <string name="candela_per_square_meter">Kandela/metrekare</string>
+    <string name="candela_per_square_centimeter">Kandela/santimetrekare</string>
+    <string name="candela_per_square_foot">Kandela/fitkare</string>
+    <string name="candela_per_square_inch">Kandela/inçkare</string>
+    <string name="kilocandela_per_square_meter">Kilokandela/metrekare</string>
+    <string name="lumen_per_square_meter_per_steradian">Lümen/metrekare/steradyan</string>
+    <string name="lumen_per_square_centimeter_per_steradian">Lümen/santimetrekare/steradyan</string>
+    <string name="lumen_per_square_foot_per_steradian">Lümen/fitkare/steradyan</string>
+    <string name="watt_per_square_centimeter_per_steradian">Watt/santimetrekare/steradyan</string>
+    <string name="electrostatic_capacitance">Kapasitans</string>
+    <string name="prefix">Önek</string>
+    <string name="force">Kuvvet</string>
+    <string name="torque">Tork</string>
+    <string name="flow_rate">Akış hızı</string>
+    <string name="luminance">Luminans</string>
+    <string name="format_time">Zaman biçimi</string>
+    <string name="format_time_support">Örnek: 130 dakikayı 2sa 10dk olarak göster</string>
+    <string name="units_sorting">Birim listesi sıralaması</string>
+    <string name="units_sorting_support">Birim sırasını değiştir</string>
+
+    <!-- Units list sorting -->
+    <string name="sort_by_usage">Kullanım</string>
+    <string name="sort_by_alphabetical">Alfabetik</string>
+    <string name="sort_by_scale_desc">Ölçek (Azalan)</string>
+    <string name="sort_by_scale_asc">Ölçek (Artan)</string>
+    <string name="color_theme_support">Bir tema modu seçin</string>
+    <string name="color_scheme">Renk şeması</string>
+    <string name="selected_color">Seçilen renk</string>
+    <string name="monet_mode">Seçilen stil</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/Gj9ZCNPXIfKddDQgccvboVFz.jpg 
+https://s3.eu-west-1.amazonaws.com/po-pub/i/prtM85P6x1fMuLg1I0zbkceo.png 
+
+Maybe this can be labeled better? Let me know. It should be something that can describe content of the Formatting screen. -->
+    <string name="formatting_setting_support">Kesinlik ve sayıların görünümü</string>
+    <string name="divide_by_zero_error">0\'a bölünemez</string>
+    <string name="date_difference">Tarih farkı</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/uWOHJmIq9riqsq7PO82ZQp3a.png -->
+    <string name="select_time">Zaman seçin</string>
+    <string name="date_difference_start">Başlangıç</string>
+    <string name="date_difference_end">Bitiş</string>
+    <string name="date_difference_result">Fark</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
+    <string name="date_difference_years">Yıl</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
+    <string name="date_difference_months">Ay</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
+    <string name="date_difference_days">Gün</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
+    <string name="date_difference_hours">Saat</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
+    <string name="date_difference_minutes">Dakika</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/9lSfdkfKShwyQFEF4nvbVaIb.jpg 
+
+Used in this dialog window. Should be short -->
+    <string name="next_label">Sonraki</string>
+    <string name="formatting_setting_preview_box_label">Önizleme (geçiş yapmak için tıklayın)</string>
+</resources>
\ No newline at end of file
diff --git a/core/base/src/main/res/values/strings.xml b/core/base/src/main/res/values/strings.xml
index 8a62710f..dd118b78 100644
--- a/core/base/src/main/res/values/strings.xml
+++ b/core/base/src/main/res/values/strings.xml
@@ -175,8 +175,6 @@
     <string name="mebibit_short">Mib</string>
     <string name="gigabit">Gigabit</string>
     <string name="gigabit_short">Gb</string>
-    <string name="gibibit">Gibibit</string>
-    <string name="gibibit_short">Gib</string>
     <string name="terabit">Terabit</string>
     <string name="terabit_short">Tb</string>
     <string name="petabit">Petabit</string>
@@ -195,8 +193,6 @@
     <string name="mebibyte_short">MiB</string>
     <string name="gigabyte">Gigabyte</string>
     <string name="gigabyte_short">GB</string>
-    <string name="gibibyte">Gibibyte</string>
-    <string name="gibibyte_short">GiB</string>
     <string name="terabyte">Terabyte</string>
     <string name="terabyte_short">TB</string>
     <string name="petabyte">Petabyte</string>
@@ -217,8 +213,6 @@
     <string name="mebibit_per_second_short">Mib/s</string>
     <string name="gigabit_per_second">Gigabit/second</string>
     <string name="gigabit_per_second_short">Gb/s</string>
-    <string name="gibibit_per_second">Gibibit/second</string>
-    <string name="gibibit_per_second_short">Gib/s</string>
     <string name="terabit_per_second">Terabit/second</string>
     <string name="terabit_per_second_short">Tb/s</string>
     <string name="petabit_per_second">Petabit/second</string>
@@ -237,8 +231,6 @@
     <string name="mebibyte_per_second_short">MiB/s</string>
     <string name="gigabyte_per_second">Gigabyte/second</string>
     <string name="gigabyte_per_second_short">GB/s</string>
-    <string name="gibibyte_per_second">Gibibyte/second</string>
-    <string name="gibibyte_per_second_short">GiB/s</string>
     <string name="terabyte_per_second">Terabyte/second</string>
     <string name="terabyte_per_second_short">TB/s</string>
     <string name="petabyte_per_second">Petabyte/second</string>
@@ -422,7 +414,7 @@
     <string name="megapascal">Megapascal</string>
     <string name="megapascal_short">MPa</string>
     <string name="gigapascal">Gigapascal</string>
-    <string name="gigapascal_short">GPA</string>
+    <string name="gigapascal_short">GPa</string>
     <string name="terapascal">Terapascal</string>
     <string name="terapascal_short">TPa</string>
     <string name="petapascal">Petapascal</string>
@@ -925,7 +917,6 @@
     <string name="units_screen_from">Convert from</string>
     <string name="units_screen_to">Convert to</string>
     <string name="settings_screen">Settings</string>
-    <string name="time_zone_screen">Time zones</string>
 
     <!-- Settings items -->
     <string name="theme_setting">Themes</string>
@@ -971,7 +962,6 @@
     <!-- MISC. -->
     <string name="loading_label">Loading…</string>
     <string name="error_label">Error</string>
-    <string name="try_again_label">Click to try again</string>
     <string name="copied">Copied %1$s!</string>
     <string name="cancel_label">Cancel</string>
     <string name="ok_label" translatable="false">OK</string>
@@ -1265,11 +1255,11 @@
     <string name="cubic_foot_per_minute_short">ft3/m</string>
     <string name="cubic_foot_per_second">Cubic Foot/second</string>
     <string name="cubic_foot_per_second_short">ft3/s</string>
-    <string name="gallon_per_hour_us">Gallon/hour (U.S.)</string>
+    <string name="gallon_per_hour_us">Gallon/hour (US)</string>
     <string name="gallon_per_hour_us_short">gal/h</string>
-    <string name="gallon_per_minute_us">Gallon/minute (U.S.)</string>
+    <string name="gallon_per_minute_us">Gallon/minute (US)</string>
     <string name="gallon_per_minute_us_short">gal/m</string>
-    <string name="gallon_per_second_us">Gallon/second (U.S.)</string>
+    <string name="gallon_per_second_us">Gallon/second (US)</string>
     <string name="gallon_per_second_us_short">gal/s</string>
     <string name="gallon_per_hour_imperial">Gallon/hour (Imperial)</string>
     <string name="gallon_per_hour_imperial_short">gal/h</string>
@@ -1372,6 +1362,16 @@ Maybe this can be labeled better? Let me know. It should be something that can d
 Used in this dialog window. Should be short -->
     <string name="next_label">Next</string>
     <string name="formatting_setting_preview_box_label">Preview (click to switch)</string>
+    <string name="gibibit">Gibibit</string>
+    <string name="gibibit_short">Gib</string>
+    <string name="gibibyte">Gibibyte</string>
+    <string name="gibibyte_short">GiB</string>
+    <string name="gibibit_per_second">Gibibit/second</string>
+    <string name="gibibit_per_second_short">Gib/s</string>
+    <string name="gibibyte_per_second">Gibibyte/second</string>
+    <string name="gibibyte_per_second_short">GiB/s</string>
+    <string name="time_zone_screen">Time zones</string>
+    <string name="try_again_label">Click to try again</string>
     <string name="tomorrow">Tomorrow</string>
     <string name="yesterday">Yesterday</string>
     <string name="search_text_field_placeholder">Search…</string>
@@ -1382,4 +1382,49 @@ Used in this dialog window. Should be short -->
     <string name="add">Add</string>
     <string name="subtract">Subtract</string>
     <string name="date_calculator">Date calculator</string>
+    <string name="locale_en" translatable="false">English</string>
+    <string name="locale_de" translatable="false">Deutsch</string>
+    <string name="locale_en_rGB" translatable="false">English (UK)</string>
+    <string name="locale_fr" translatable="false">Français</string>
+    <string name="locale_it" translatable="false">Italiano</string>
+    <string name="locale_ru" translatable="false">Русский</string>
+    <string name="language_setting">Language</string>
+    <string name="language_setting_support">Change the app language</string>
+    <string name="system_font_setting">System font</string>
+    <string name="system_font_setting_support">Use system font for texts in app</string>
+    <string name="fuel_consumption">Fuel</string>
+    <string name="km_per_l">Kilometer/liter</string>
+    <string name="km_per_l_short">km/L</string>
+    <string name="l_per_km">Liter/kilometer</string>
+    <string name="l_per_km_short">L/km</string>
+    <string name="l_per_100_km">Liter/100 Kilometer</string>
+    <string name="l_per_100_km_short">L/100 km</string>
+    <string name="mi_per_gallon_uk">Mile/gallon (UK)</string>
+    <string name="mi_per_gallon_uk_short">mpg (UK)</string>
+    <string name="mi_per_gallon_us">Mile/gallon (US)</string>
+    <string name="mi_per_gallon_us_short">mpg (US)</string>
+    <string name="mi_us_per_l">Mile/liter (US)</string>
+    <string name="mi_us_per_l_short">mi/L (US)</string>
+    <string name="gallon_us_per_mile">Gallon/mile (US)</string>
+    <string name="gallon_us_per_mile_short">gal/mi (US)</string>
+    <string name="gallon_uk_per_mile">Gallon/mile (UK)</string>
+    <string name="gallon_uk_per_mile_short">gal/mi (UK)</string>
+    <string name="gallon_us_per_100_mile">Gallon/100 mile (US)</string>
+    <string name="gallon_us_per_100_mile_short">gal/100 mi (US)</string>
+    <string name="gallon_uk_per_100_mile">Gallon/100 mile (UK)</string>
+    <string name="gallon_uk_per_100_mile_short">gal/100 mi (UK)</string>
+    <string name="partial_history_view_setting">Partial history view</string>
+    <string name="partial_history_view_setting_support">Peek latest entrance in history</string>
+    <string name="calculator_settings_support">History view</string>
+    <string name="converter_settings_support">Unit groups, sorting, formatting</string>
+    <string name="display_settings">Display</string>
+    <string name="clear_cache">Clear cache</string>
+    <string name="locale_es" translatable="false">Español</string>
+    <string name="locale_hu" translatable="false">Magyar</string>
+    <string name="locale_in" translatable="false">Indonesia</string>
+    <string name="locale_nl" translatable="false">Dutch</string>
+    <string name="locale_tr" translatable="false">Türkçe</string>
+
+    <!-- Option name to use system default setting -->
+    <string name="system">System</string>
 </resources>
\ No newline at end of file
diff --git a/feature/unitslist/src/main/AndroidManifest.xml b/core/base/src/main/res/xml/locales_config.xml
similarity index 60%
rename from feature/unitslist/src/main/AndroidManifest.xml
rename to core/base/src/main/res/xml/locales_config.xml
index 7bdbce91..f14cc7d7 100644
--- a/feature/unitslist/src/main/AndroidManifest.xml
+++ b/core/base/src/main/res/xml/locales_config.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Unitto is a unit converter for Android
   ~ Copyright (c) 2023 Elshan Agaev
   ~
@@ -17,6 +16,16 @@
   ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
   -->
 
-<manifest>
-
-</manifest>
\ No newline at end of file
+<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
+    <locale android:name="en"/>
+    <locale android:name="en-rGB"/>
+    <locale android:name="de"/>
+    <locale android:name="es"/>
+    <locale android:name="fr"/>
+    <locale android:name="hu"/>
+    <locale android:name="in"/>
+    <locale android:name="it"/>
+    <locale android:name="nl"/>
+    <locale android:name="ru"/>
+    <locale android:name="tr"/>
+</locale-config>
diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
index 681bdca9..e126ca56 100644
--- a/core/ui/build.gradle.kts
+++ b/core/ui/build.gradle.kts
@@ -36,10 +36,12 @@ android {
 }
 
 dependencies {
-    testImplementation(libs.junit)
-    testImplementation(libs.org.robolectric)
+    testImplementation(libs.junit.junit)
+    testImplementation(libs.org.robolectric.robolectric)
     testImplementation(libs.androidx.compose.ui.test.junit4)
     debugImplementation(libs.androidx.compose.ui.test.manifest)
 
-    implementation(project(mapOf("path" to ":core:base")))
+    implementation(libs.androidx.navigation.navigation.compose)
+
+    implementation(project(":core:base"))
 }
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/NavGraphBuilderExtensions.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/NavGraphBuilderExtensions.kt
new file mode 100644
index 00000000..de4953d0
--- /dev/null
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/NavGraphBuilderExtensions.kt
@@ -0,0 +1,93 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.core.ui
+
+import androidx.compose.animation.AnimatedContentScope
+import androidx.compose.animation.AnimatedContentTransitionScope
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.runtime.Composable
+import androidx.navigation.NamedNavArgument
+import androidx.navigation.NavBackStackEntry
+import androidx.navigation.NavDeepLink
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.navigation
+
+/**
+ * @see NavGraphBuilder.composable
+ */
+fun NavGraphBuilder.unittoComposable(
+    route: String,
+    arguments: List<NamedNavArgument> = emptyList(),
+    deepLinks: List<NavDeepLink> = emptyList(),
+    enterTransition: (@JvmSuppressWildcards
+    AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition?)? = { fadeIn() },
+    exitTransition: (@JvmSuppressWildcards
+    AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition?)? = { fadeOut() },
+    popEnterTransition: (@JvmSuppressWildcards
+    AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition?)? =
+        enterTransition,
+    popExitTransition: (@JvmSuppressWildcards
+    AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition?)? =
+        exitTransition,
+    content: @Composable AnimatedContentScope.(NavBackStackEntry) -> Unit
+): Unit = composable(
+    route = route,
+    arguments = arguments,
+    deepLinks = deepLinks,
+    enterTransition = enterTransition,
+    exitTransition = exitTransition,
+    popEnterTransition = popEnterTransition,
+    popExitTransition = popExitTransition,
+    content = content,
+)
+
+/**
+ * @see NavGraphBuilder.navigation
+ */
+fun NavGraphBuilder.unittoNavigation(
+    startDestination: String,
+    route: String,
+    arguments: List<NamedNavArgument> = emptyList(),
+    deepLinks: List<NavDeepLink> = emptyList(),
+    enterTransition: (AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition?)? =
+        null,
+    exitTransition: (AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition?)? =
+        null,
+    popEnterTransition: (
+    AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition?
+    )? = enterTransition,
+    popExitTransition: (
+    AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition?
+    )? = exitTransition,
+    builder: NavGraphBuilder.() -> Unit
+): Unit = navigation(
+    startDestination = startDestination,
+    route = route,
+    arguments = arguments,
+    deepLinks = deepLinks,
+    enterTransition = enterTransition,
+    exitTransition = exitTransition,
+    popEnterTransition = popEnterTransition,
+    popExitTransition = popExitTransition,
+    builder = builder
+)
diff --git a/app/src/main/java/com/sadellie/unitto/PushDynamicShortcut.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/Shortcuts.kt
similarity index 57%
rename from app/src/main/java/com/sadellie/unitto/PushDynamicShortcut.kt
rename to core/ui/src/main/java/com/sadellie/unitto/core/ui/Shortcuts.kt
index 6a6a7bf5..07cb0ed9 100644
--- a/app/src/main/java/com/sadellie/unitto/PushDynamicShortcut.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/Shortcuts.kt
@@ -16,8 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto
+package com.sadellie.unitto.core.ui
 
+import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_IMMUTABLE
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -41,7 +43,56 @@ suspend fun Context.pushDynamicShortcut(
 
     val context = this@pushDynamicShortcut
 
-    val shortcut = ShortcutInfoCompat.Builder(context, route)
+    val shortcut = shortcutInfoCompat(
+        context = context,
+        route = route,
+        shortLabel = shortLabel,
+        longLabel = longLabel,
+        drawable = drawable
+    )
+
+    kotlin.runCatching {
+        ShortcutManagerCompat.pushDynamicShortcut(context, shortcut)
+    }
+}
+
+fun Context.addShortcut(
+    route: String,
+    @StringRes shortLabel: Int,
+    @StringRes longLabel: Int,
+    @DrawableRes drawable: Int,
+) {
+    val context = this@addShortcut
+
+    val shortcut = shortcutInfoCompat(
+        context = context,
+        route = route,
+        shortLabel = shortLabel,
+        longLabel = longLabel,
+        drawable = drawable
+    )
+
+    val shortCutIntent = ShortcutManagerCompat.createShortcutResultIntent(context, shortcut)
+
+    try {
+        ShortcutManagerCompat.requestPinShortcut(
+            context,
+            shortcut,
+            PendingIntent.getBroadcast(context, 0, shortCutIntent, FLAG_IMMUTABLE).intentSender
+        )
+    } catch (e: Exception) {
+        showToast(context, e.message ?: "Error")
+    }
+}
+
+private fun Context.shortcutInfoCompat(
+    context: Context,
+    route: String,
+    shortLabel: Int,
+    longLabel: Int,
+    drawable: Int,
+): ShortcutInfoCompat {
+    return ShortcutInfoCompat.Builder(context, route)
         .setShortLabel(getString(shortLabel))
         .setLongLabel(getString(longLabel))
         .setIcon(IconCompat.createWithResource(context, drawable))
@@ -54,6 +105,4 @@ suspend fun Context.pushDynamicShortcut(
             )
         )
         .build()
-
-    ShortcutManagerCompat.pushDynamicShortcut(context, shortcut)
 }
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/UIUtils.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/UIUtils.kt
index b055c7af..42ddf9af 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/UIUtils.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/UIUtils.kt
@@ -21,8 +21,11 @@ package com.sadellie.unitto.core.ui
 import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
+import android.content.res.Configuration
 import android.net.Uri
 import android.widget.Toast
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalConfiguration
 import com.sadellie.unitto.core.base.R
 
 /**
@@ -32,6 +35,17 @@ fun openLink(mContext: Context, url: String) {
     try {
         mContext.startActivity(Intent(Intent.ACTION_VIEW).setData(Uri.parse(url)))
     } catch (e: ActivityNotFoundException) {
-        Toast.makeText(mContext, R.string.error_label, Toast.LENGTH_SHORT).show()
+        showToast(mContext, mContext.getString(R.string.error_label))
     }
 }
+
+fun showToast(
+    mContext: Context,
+    text: String,
+    duration: Int = Toast.LENGTH_SHORT
+) {
+    Toast.makeText(mContext, text, duration).show()
+}
+
+@Composable
+fun isPortrait() = LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/KeyboardButton.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/KeyboardButton.kt
index aa4493b4..42997223 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/KeyboardButton.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/KeyboardButton.kt
@@ -18,48 +18,56 @@
 
 package com.sadellie.unitto.core.ui.common
 
-import android.content.res.Configuration
 import android.view.HapticFeedbackConstants
-import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.background
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalView
+import com.sadellie.unitto.core.ui.isPortrait
 import kotlinx.coroutines.launch
 
 @Composable
 fun BasicKeyboardButton(
     modifier: Modifier,
+    contentHeight: Float,
     onClick: () -> Unit,
     onLongClick: (() -> Unit)?,
     containerColor: Color,
     icon: ImageVector,
     iconColor: Color,
     allowVibration: Boolean,
-    contentHeight: Float
 ) {
     val view = LocalView.current
     val coroutineScope = rememberCoroutineScope()
-
-    UnittoButton(
-        modifier = modifier,
-        onClick = {
-            onClick()
-            if (allowVibration) {
-                coroutineScope.launch {
-                    view.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP)
-                }
+    fun vibrate() {
+        if (allowVibration) {
+            coroutineScope.launch {
+                view.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP)
             }
-                  },
-        onLongClick = onLongClick,
-        containerColor = containerColor,
-        contentPadding = PaddingValues()
+        }
+    }
+
+    Box(
+        modifier = modifier
+            .squashable(
+                onClick = { onClick(); vibrate() },
+                onLongClick = if (onLongClick != null) { { onLongClick(); vibrate() } } else null,
+                interactionSource = remember { MutableInteractionSource() },
+                cornerRadiusRange = 30..50,
+            )
+            .background(containerColor)
+        ,
+        contentAlignment = Alignment.Center
     ) {
         Icon(
             imageVector = icon,
@@ -75,18 +83,19 @@ fun KeyboardButtonLight(
     modifier: Modifier,
     icon: ImageVector,
     allowVibration: Boolean,
+    contentHeight: Float = if (isPortrait()) 0.51f else 0.7f,
     onLongClick: (() -> Unit)? = null,
     onClick: () -> Unit,
 ) {
     BasicKeyboardButton(
         modifier = modifier,
+        contentHeight = contentHeight,
         onClick = onClick,
         onLongClick = onLongClick,
         containerColor = MaterialTheme.colorScheme.inverseOnSurface,
         icon = icon,
         iconColor = MaterialTheme.colorScheme.onSurfaceVariant,
         allowVibration = allowVibration,
-        contentHeight = if (isPortrait()) 0.51f else 0.7f
     )
 }
 
@@ -95,18 +104,19 @@ fun KeyboardButtonFilled(
     modifier: Modifier,
     icon: ImageVector,
     allowVibration: Boolean,
+    contentHeight: Float = if (isPortrait()) 0.51f else 0.7f,
     onLongClick: (() -> Unit)? = null,
     onClick: () -> Unit,
 ) {
     BasicKeyboardButton(
         modifier = modifier,
+        contentHeight = contentHeight,
         onClick = onClick,
         onLongClick = onLongClick,
         containerColor = MaterialTheme.colorScheme.primaryContainer,
         icon = icon,
-        iconColor = MaterialTheme.colorScheme.onSecondaryContainer,
+        iconColor = MaterialTheme.colorScheme.onPrimaryContainer,
         allowVibration = allowVibration,
-        contentHeight = if (isPortrait()) 0.51f else 0.7f
     )
 }
 
@@ -115,20 +125,18 @@ fun KeyboardButtonAdditional(
     modifier: Modifier,
     icon: ImageVector,
     allowVibration: Boolean,
+    contentHeight: Float = 0.8f,
     onLongClick: (() -> Unit)? = null,
-    onClick: () -> Unit
+    onClick: () -> Unit,
 ) {
     BasicKeyboardButton(
         modifier = modifier,
+        contentHeight = contentHeight,
         onClick = onClick,
         onLongClick = onLongClick,
         containerColor = Color.Transparent,
         icon = icon,
         iconColor = MaterialTheme.colorScheme.onSurfaceVariant,
         allowVibration = allowVibration,
-        contentHeight = if (isPortrait()) 0.8f else 0.8f
     )
 }
-
-@Composable
-private fun isPortrait() = LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/MenuButton.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/MenuButton.kt
index 7d1d1202..9fbfae3a 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/MenuButton.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/MenuButton.kt
@@ -19,7 +19,7 @@
 package com.sadellie.unitto.core.ui.common
 
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.MenuOpen
+import androidx.compose.material.icons.automirrored.outlined.MenuOpen
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.runtime.Composable
@@ -35,7 +35,7 @@ import com.sadellie.unitto.core.base.R
 fun MenuButton(onClick: () -> Unit) {
     IconButton(onClick = onClick) {
         Icon(
-            Icons.Outlined.MenuOpen,
+            Icons.AutoMirrored.Outlined.MenuOpen,
             contentDescription = stringResource(R.string.open_menu_description)
         )
     }
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/NavigateUpButton.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/NavigateUpButton.kt
index aa480982..ab7eb96d 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/NavigateUpButton.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/NavigateUpButton.kt
@@ -19,7 +19,7 @@
 package com.sadellie.unitto.core.ui.common
 
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.runtime.Composable
@@ -35,7 +35,7 @@ import com.sadellie.unitto.core.base.R
 fun NavigateUpButton(onClick: () -> Unit) {
     IconButton(onClick = onClick) {
         Icon(
-            Icons.Outlined.ArrowBack,
+            Icons.AutoMirrored.Outlined.ArrowBack,
             contentDescription = stringResource(R.string.navigate_up_description)
         )
     }
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/SegmentedButton.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/SegmentedButton.kt
index 58195781..37d8fbe7 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/SegmentedButton.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/SegmentedButton.kt
@@ -82,7 +82,7 @@ fun RowScope.SegmentedButton(
         contentPadding = PaddingValues(horizontal = 12.dp)
     ) {
         if (icon != null) {
-            Crossfade(targetState = selected) {
+            Crossfade(selected, label = "Selected state") {
                 if (it) {
                     Icon(Icons.Default.Check, null, Modifier.size(18.dp))
                 } else {
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoChip.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoChip.kt
new file mode 100644
index 00000000..2906700c
--- /dev/null
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoChip.kt
@@ -0,0 +1,144 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.core.ui.common
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.material.icons.filled.Settings
+import androidx.compose.material3.AssistChipDefaults
+import androidx.compose.material3.FilterChipDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+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.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun FilterChip(
+    modifier: Modifier = Modifier,
+    selected: Boolean,
+    onClick: () -> Unit,
+    label: String,
+    imageVector: ImageVector,
+    contentDescription: String,
+) {
+    Row(
+        modifier = modifier
+            .background(
+                color = if (selected) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surface,
+                shape = FilterChipDefaults.shape
+            )
+            .border(
+                width = 1.dp,
+                color = if (selected) Color.Transparent else MaterialTheme.colorScheme.outline,
+                shape = FilterChipDefaults.shape
+            )
+            .height(FilterChipDefaults.Height)
+            .clickable { onClick() }
+            .padding(start = 8.dp, end = 16.dp),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        AnimatedVisibility(visible = selected) {
+            Icon(
+                modifier = Modifier.height(FilterChipDefaults.IconSize),
+                imageVector = imageVector,
+                contentDescription = contentDescription,
+                tint = MaterialTheme.colorScheme.onPrimaryContainer
+            )
+        }
+        Text(
+            modifier = Modifier.padding(start = 8.dp),
+            text = label,
+            style = MaterialTheme.typography.labelLarge,
+            color = if (selected) MaterialTheme.colorScheme.onPrimaryContainer else MaterialTheme.colorScheme.onSurfaceVariant
+        )
+    }
+}
+
+@Composable
+fun AssistChip(
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
+    imageVector: ImageVector,
+    contentDescription: String,
+) {
+    Row(
+        modifier = modifier
+            .background(
+                color = MaterialTheme.colorScheme.surface,
+                shape = AssistChipDefaults.shape
+            )
+            .border(
+                width = 1.dp,
+                color = MaterialTheme.colorScheme.outline,
+                shape = AssistChipDefaults.shape
+            )
+            .height(32.dp)
+            .clickable { onClick() }
+            .padding(horizontal = 8.dp),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Icon(
+            modifier = Modifier.height(AssistChipDefaults.IconSize),
+            imageVector = imageVector,
+            contentDescription = contentDescription,
+            tint = MaterialTheme.colorScheme.onPrimaryContainer
+        )
+    }
+}
+
+@Preview
+@Composable
+fun PreviewAssistChip() {
+    AssistChip(
+        onClick = {},
+        imageVector = Icons.Default.Settings,
+        contentDescription = ""
+    )
+}
+
+@Preview
+@Composable
+fun PreviewFilterChip() {
+    var isSelected by remember { mutableStateOf(true) }
+
+    FilterChip(
+        selected = isSelected,
+        onClick = { isSelected = !isSelected },
+        label = "Label",
+        imageVector = Icons.Default.Check,
+        contentDescription = ""
+    )
+}
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoListItem.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoListItem.kt
index 9d20f730..1da7144d 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoListItem.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoListItem.kt
@@ -18,48 +18,191 @@
 
 package com.sadellie.unitto.core.ui.common
 
+import androidx.compose.foundation.background
 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.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Home
 import androidx.compose.material.ripple.rememberRipple
-import androidx.compose.material3.ListItem
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ProvideTextStyle
+import androidx.compose.material3.RadioButton
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 
-/**
- * Represents one item in list on Settings screen.
- *
- * @param label Main text.
- * @param supportContent Text that is located below label.
- * @param switchState Current switch state.
- * @param onSwitchChange Action to perform when user clicks on this component or just switch. Gives
- * you new value.
- */
 @Composable
 fun UnittoListItem(
-    label: String,
-    leadingContent: @Composable (() -> Unit)?,
-    supportContent: String? = null,
-    switchState: Boolean,
-    onSwitchChange: (Boolean) -> Unit
+    modifier: Modifier = Modifier,
+    headlineContent: @Composable () -> Unit,
+    supportingContent: @Composable (() -> Unit)? = null,
+    leadingContent: @Composable (() -> Unit)? = null,
+    trailingContent: @Composable (() -> Unit)? = null,
 ) {
-    ListItem(
-        modifier = Modifier
-            .clickable(
-                interactionSource = remember { MutableInteractionSource() },
-                indication = rememberRipple(),
-                onClick = { onSwitchChange(!switchState) }
-            ),
-        headlineContent = { Text(label) },
-        supportingContent = { supportContent?.let { Text(text = it) } },
-        leadingContent = leadingContent,
-        trailingContent = {
-            Switch(
-                checked = switchState,
-                onCheckedChange = { onSwitchChange(it) }
+    Row(
+        modifier = modifier
+            .background(MaterialTheme.colorScheme.surface)
+            .padding(start = 16.dp, end = 24.dp)
+            .heightIn(min = if (supportingContent == null) 56.dp else 72.dp),
+        horizontalArrangement = Arrangement.spacedBy(16.dp),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        leadingContent?.let {
+            ProvideColor(
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                content = it
             )
         }
-    )
+
+        Column(Modifier.weight(1f).padding(vertical = 8.dp)) {
+            ProvideTextStyle(
+                color = MaterialTheme.colorScheme.onSurface,
+                textStyle = MaterialTheme.typography.bodyLarge,
+                content = headlineContent
+            )
+            supportingContent?.let {
+                ProvideTextStyle(
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    textStyle = MaterialTheme.typography.bodyMedium,
+                    content = it
+                )
+            }
+        }
+        trailingContent?.let {
+            ProvideColor(
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                content = it
+            )
+        }
+    }
+}
+
+@Composable
+fun UnittoListItem(
+    modifier: Modifier = Modifier,
+    headlineText: String,
+    supportingText: String? = null,
+    icon: ImageVector,
+    iconDescription: String,
+    trailing: @Composable (() -> Unit)? = null,
+) = UnittoListItem(
+    modifier = modifier,
+    headlineContent = { Text(headlineText) },
+    supportingContent = supportingText?.let { { Text(it) } },
+    leadingContent = {
+        Icon(
+            imageVector = icon,
+            contentDescription = iconDescription,
+            modifier = Modifier.size(24.dp),
+            tint = MaterialTheme.colorScheme.onSurfaceVariant
+        )
+    },
+    trailingContent = trailing
+)
+
+@Composable
+fun UnittoListItem(
+    modifier: Modifier = Modifier,
+    headlineText: String,
+    icon: ImageVector,
+    iconDescription: String,
+    supportingText: String? = null,
+    switchState: Boolean,
+    onSwitchChange: (Boolean) -> Unit
+) = UnittoListItem(
+    modifier = modifier
+        .clickable(
+            interactionSource = remember { MutableInteractionSource() },
+            indication = rememberRipple(),
+            onClick = { onSwitchChange(!switchState) }
+        ),
+    headlineText = headlineText,
+    supportingText = supportingText,
+    icon = icon,
+    iconDescription = iconDescription,
+    trailing = {
+        Switch(
+            checked = switchState,
+            onCheckedChange = { onSwitchChange(it) }
+        )
+    }
+)
+
+@Composable
+private fun ProvideTextStyle(
+    color: Color,
+    textStyle: TextStyle,
+    content: @Composable () -> Unit,
+) = CompositionLocalProvider(LocalContentColor provides color) {
+    ProvideTextStyle(textStyle, content)
+}
+
+@Composable
+private fun ProvideColor(
+    color: Color,
+    content: @Composable () -> Unit,
+) = CompositionLocalProvider(LocalContentColor provides color) {
+    content()
+}
+
+@Preview
+@Composable
+fun PreviewUnittoListItem1() {
+    Column {
+        UnittoListItem(
+            modifier = Modifier,
+            headlineContent = { Text("Headline") },
+            supportingContent = { Text("Support") },
+            leadingContent = {
+                Icon(
+                    imageVector = Icons.Default.Home,
+                    contentDescription = null
+                )
+            },
+        )
+
+        UnittoListItem(
+            modifier = Modifier,
+            headlineContent = { Text("Headline") },
+            leadingContent = {
+                RadioButton(selected = false, onClick = {})
+            },
+        )
+
+        UnittoListItem(
+            icon = Icons.Default.Home,
+            headlineText = "Text text",
+            supportingText = "Support text support text support text support text",
+            modifier = Modifier,
+            trailing = {},
+            iconDescription = ""
+        )
+
+        UnittoListItem(
+            icon = Icons.Default.Home,
+            headlineText = "Text text",
+            supportingText = "Support text support text support text support text",
+            modifier = Modifier,
+            onSwitchChange = {},
+            iconDescription = "",
+            switchState = true,
+        )
+    }
 }
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoNavigationDrawer.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoNavigationDrawer.kt
index c3a0fcd1..4dc68847 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoNavigationDrawer.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoNavigationDrawer.kt
@@ -85,7 +85,7 @@ fun UnittoModalNavigationDrawer(
                 orientation = Orientation.Horizontal,
                 enabled = gesturesEnabled or state.isOpen,
             )
-            .padding(end = 18.dp) // Draggable when closed
+            .padding(end = if (state.isOpen) 0.dp else 18.dp) // Draggable when closed
         ) {
             drawer()
         }
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoScreenWithTopBar.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoScreenWithTopBar.kt
index e87eedc2..8e508963 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoScreenWithTopBar.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoScreenWithTopBar.kt
@@ -18,6 +18,11 @@
 
 package com.sadellie.unitto.core.ui.common
 
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.material3.CenterAlignedTopAppBar
@@ -51,18 +56,25 @@ fun UnittoScreenWithTopBar(
     floatingActionButton: @Composable () -> Unit = {},
     floatingActionButtonPosition: FabPosition = FabPosition.End,
     scrollBehavior: TopAppBarScrollBehavior? = null,
+    showTopBar: Boolean = true,
     content: @Composable (PaddingValues) -> Unit
 ) {
     Scaffold(
         modifier = modifier,
         topBar = {
-            CenterAlignedTopAppBar(
-                title = title,
-                navigationIcon = navigationIcon,
-                actions = actions,
-                colors = colors,
-                scrollBehavior = scrollBehavior,
-            )
+            AnimatedVisibility(
+                visible = showTopBar,
+                enter = slideInVertically() + fadeIn(),
+                exit = slideOutVertically() + fadeOut()
+            ) {
+                CenterAlignedTopAppBar(
+                    title = title,
+                    navigationIcon = navigationIcon,
+                    actions = actions,
+                    colors = colors,
+                    scrollBehavior = scrollBehavior,
+                )
+            }
         },
         floatingActionButton = floatingActionButton,
         floatingActionButtonPosition = floatingActionButtonPosition,
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoSearchBar.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoSearchBar.kt
index f269649f..2b30f920 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoSearchBar.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoSearchBar.kt
@@ -55,13 +55,15 @@ import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.tooling.preview.Preview
 import com.sadellie.unitto.core.base.R
 
 @Composable
 fun UnittoSearchBar(
     modifier: Modifier = Modifier,
-    query: String,
-    onQueryChange: (String) -> Unit,
+    query: TextFieldValue,
+    onQueryChange: (TextFieldValue) -> Unit,
     navigateUp: () -> Unit,
     title: String,
     searchActions: @Composable (RowScope.() -> Unit) = {},
@@ -73,71 +75,73 @@ fun UnittoSearchBar(
     var showSearchInput by remember { mutableStateOf(false) }
     val focusRequester = remember { FocusRequester() }
 
-    fun stagedNavigateUp() {
-        if (showSearchInput) {
-            // Search text field is open, need to close it and clear search query
-            showSearchInput = false
-            // focusManager.clearFocus()
-            onQueryChange("")
-        } else {
-            // No search text field is shown, can go back as usual
-            navigateUp()
-        }
-    }
+     LaunchedEffect(showSearchInput) {
+         if (showSearchInput) focusRequester.requestFocus() else onQueryChange(TextFieldValue())
+     }
 
-    TopAppBar(
+    BackHandler(showSearchInput) { showSearchInput = false }
+
+    Crossfade(
         modifier = modifier,
-        title = {
-            Crossfade(showSearchInput) { showSearch ->
-                if (showSearch) {
-                    LaunchedEffect(Unit) { focusRequester.requestFocus() }
-
+        targetState = showSearchInput,
+        label = "Search input"
+    ) { showSearch ->
+        if (showSearch) {
+            TopAppBar(
+                title = {
                     SearchTextField(
                         modifier = Modifier
-                            .focusRequester(focusRequester),
+                            .focusRequester(focusRequester)
+                            .fillMaxWidth(),
                         value = query,
                         placeholder = placeholder,
                         onValueChange = onQueryChange,
                         onSearch = {}
                     )
-                } else {
+                },
+                navigationIcon = {
+                    NavigateUpButton { showSearchInput = false }
+                },
+                actions = {
+                    Row(verticalAlignment = Alignment.CenterVertically) {
+                        ClearButton(visible = query.text.isNotEmpty()) { onQueryChange(TextFieldValue()) }
+                        searchActions()
+                    }
+                },
+                scrollBehavior = scrollBehavior,
+                colors = colors,
+            )
+        } else {
+            TopAppBar(
+                title = {
                     Text(
                         text = title,
                         modifier = Modifier.fillMaxWidth(),
                         style = MaterialTheme.typography.titleLarge
                     )
-                }
-            }
-        },
-        navigationIcon = {
-            NavigateUpButton { stagedNavigateUp() }
-        },
-        actions = {
-            Crossfade(showSearchInput) { showSearch ->
-                Row(verticalAlignment = Alignment.CenterVertically) {
-                    if (showSearch) {
-                        ClearButton(visible = query.isNotEmpty()) { onQueryChange("") }
-                        searchActions()
-                    } else {
+                },
+                navigationIcon = {
+                    NavigateUpButton { navigateUp() }
+                },
+                actions = {
+                    Row(verticalAlignment = Alignment.CenterVertically) {
                         SearchButton { showSearchInput = true }
                         noSearchActions()
                     }
-                }
-            }
-        },
-        scrollBehavior = scrollBehavior,
-        colors = colors,
-    )
-
-    BackHandler { stagedNavigateUp() }
+                },
+                scrollBehavior = scrollBehavior,
+                colors = colors,
+            )
+        }
+    }
 }
 
 @Composable
 private fun SearchTextField(
     modifier: Modifier,
-    value: String,
+    value: TextFieldValue,
     placeholder: String,
-    onValueChange: (String) -> Unit,
+    onValueChange: (TextFieldValue) -> Unit,
     onSearch: KeyboardActionScope.() -> Unit
 ) {
     BasicTextField(
@@ -152,7 +156,7 @@ private fun SearchTextField(
         decorationBox = { innerTextField ->
             innerTextField()
             // Showing placeholder only when there is query is empty
-            value.ifEmpty {
+            value.text.ifEmpty {
                 Text(
                     modifier = Modifier.alpha(0.7f),
                     text = placeholder,
@@ -194,3 +198,15 @@ private fun ClearButton(
         }
     }
 }
+
+@Preview
+@Composable
+fun UnittoSearchBarPreview() {
+    UnittoSearchBar(
+        query = TextFieldValue("test"),
+        onQueryChange = {},
+        navigateUp = {},
+        title = "Title",
+        placeholder = "placeholder"
+    )
+}
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/10x.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/10x.kt
new file mode 100644
index 00000000..e55a51d2
--- /dev/null
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/10x.kt
@@ -0,0 +1,117 @@
+package com.sadellie.unitto.core.ui.common.key.unittoicons
+
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.PathFillType.Companion.NonZero
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.graphics.StrokeCap.Companion.Butt
+import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.graphics.vector.ImageVector.Builder
+import androidx.compose.ui.graphics.vector.path
+import androidx.compose.ui.unit.dp
+import com.sadellie.unitto.core.ui.common.key.UnittoIcons
+
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Power10: ImageVector
+    get() {
+        if (_power10 != null) {
+            return _power10!!
+        }
+        _power10 = Builder(name = "_10x", defaultWidth = 274.0.dp, defaultHeight = 150.0.dp,
+                viewportWidth = 274.0f, viewportHeight = 150.0f).apply {
+            path(fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = 0.0f,
+                    strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f,
+                    pathFillType = NonZero) {
+                moveTo(106.364f, 113.658f)
+                verticalLineTo(122.634f)
+                horizontalLineTo(55.676f)
+                verticalLineTo(113.658f)
+                horizontalLineTo(75.938f)
+                verticalLineTo(49.176f)
+                curveTo(75.938f, 47.24f, 76.004f, 45.282f, 76.136f, 43.302f)
+                lineTo(59.306f, 57.756f)
+                curveTo(58.734f, 58.24f, 58.162f, 58.548f, 57.59f, 58.68f)
+                curveTo(57.018f, 58.768f, 56.49f, 58.768f, 56.006f, 58.68f)
+                curveTo(55.522f, 58.592f, 55.06f, 58.416f, 54.62f, 58.152f)
+                curveTo(54.224f, 57.888f, 53.916f, 57.602f, 53.696f, 57.294f)
+                lineTo(50.0f, 52.212f)
+                lineTo(78.182f, 27.858f)
+                horizontalLineTo(87.752f)
+                verticalLineTo(113.658f)
+                horizontalLineTo(106.364f)
+                close()
+            }
+            path(fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = 0.0f,
+                    strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f,
+                    pathFillType = NonZero) {
+                moveTo(185.706f, 75.378f)
+                curveTo(185.706f, 83.65f, 184.804f, 90.822f, 183.0f, 96.894f)
+                curveTo(181.24f, 102.922f, 178.82f, 107.916f, 175.74f, 111.876f)
+                curveTo(172.66f, 115.836f, 169.008f, 118.784f, 164.784f, 120.72f)
+                curveTo(160.604f, 122.656f, 156.116f, 123.624f, 151.32f, 123.624f)
+                curveTo(146.48f, 123.624f, 141.97f, 122.656f, 137.79f, 120.72f)
+                curveTo(133.654f, 118.784f, 130.046f, 115.836f, 126.966f, 111.876f)
+                curveTo(123.886f, 107.916f, 121.466f, 102.922f, 119.706f, 96.894f)
+                curveTo(117.946f, 90.822f, 117.066f, 83.65f, 117.066f, 75.378f)
+                curveTo(117.066f, 67.106f, 117.946f, 59.934f, 119.706f, 53.862f)
+                curveTo(121.466f, 47.79f, 123.886f, 42.774f, 126.966f, 38.814f)
+                curveTo(130.046f, 34.81f, 133.654f, 31.84f, 137.79f, 29.904f)
+                curveTo(141.97f, 27.968f, 146.48f, 27.0f, 151.32f, 27.0f)
+                curveTo(156.116f, 27.0f, 160.604f, 27.968f, 164.784f, 29.904f)
+                curveTo(169.008f, 31.84f, 172.66f, 34.81f, 175.74f, 38.814f)
+                curveTo(178.82f, 42.774f, 181.24f, 47.79f, 183.0f, 53.862f)
+                curveTo(184.804f, 59.934f, 185.706f, 67.106f, 185.706f, 75.378f)
+                close()
+                moveTo(173.496f, 75.378f)
+                curveTo(173.496f, 68.162f, 172.88f, 62.112f, 171.648f, 57.228f)
+                curveTo(170.46f, 52.3f, 168.832f, 48.34f, 166.764f, 45.348f)
+                curveTo(164.74f, 42.356f, 162.386f, 40.222f, 159.702f, 38.946f)
+                curveTo(157.018f, 37.626f, 154.224f, 36.966f, 151.32f, 36.966f)
+                curveTo(148.416f, 36.966f, 145.622f, 37.626f, 142.938f, 38.946f)
+                curveTo(140.254f, 40.222f, 137.9f, 42.356f, 135.876f, 45.348f)
+                curveTo(133.852f, 48.34f, 132.224f, 52.3f, 130.992f, 57.228f)
+                curveTo(129.804f, 62.112f, 129.21f, 68.162f, 129.21f, 75.378f)
+                curveTo(129.21f, 82.594f, 129.804f, 88.644f, 130.992f, 93.528f)
+                curveTo(132.224f, 98.412f, 133.852f, 102.35f, 135.876f, 105.342f)
+                curveTo(137.9f, 108.334f, 140.254f, 110.49f, 142.938f, 111.81f)
+                curveTo(145.622f, 113.086f, 148.416f, 113.724f, 151.32f, 113.724f)
+                curveTo(154.224f, 113.724f, 157.018f, 113.086f, 159.702f, 111.81f)
+                curveTo(162.386f, 110.49f, 164.74f, 108.334f, 166.764f, 105.342f)
+                curveTo(168.832f, 102.35f, 170.46f, 98.412f, 171.648f, 93.528f)
+                curveTo(172.88f, 88.644f, 173.496f, 82.594f, 173.496f, 75.378f)
+                close()
+            }
+            path(fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = 0.0f,
+                    strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f,
+                    pathFillType = NonZero) {
+                moveTo(223.073f, 62.244f)
+                horizontalLineTo(215.087f)
+                curveTo(214.471f, 62.244f, 213.965f, 62.09f, 213.569f, 61.782f)
+                curveTo(213.217f, 61.474f, 212.931f, 61.122f, 212.711f, 60.726f)
+                lineTo(205.451f, 48.78f)
+                curveTo(205.231f, 49.66f, 204.967f, 50.408f, 204.659f, 51.024f)
+                lineTo(198.389f, 60.726f)
+                curveTo(198.169f, 61.122f, 197.861f, 61.474f, 197.465f, 61.782f)
+                curveTo(197.113f, 62.09f, 196.651f, 62.244f, 196.079f, 62.244f)
+                horizontalLineTo(188.621f)
+                lineTo(200.237f, 44.622f)
+                lineTo(189.083f, 28.056f)
+                horizontalLineTo(197.135f)
+                curveTo(197.751f, 28.056f, 198.191f, 28.144f, 198.455f, 28.32f)
+                curveTo(198.763f, 28.496f, 199.027f, 28.782f, 199.247f, 29.178f)
+                lineTo(206.441f, 40.662f)
+                curveTo(206.573f, 40.222f, 206.705f, 39.804f, 206.837f, 39.408f)
+                curveTo(206.969f, 39.012f, 207.145f, 38.594f, 207.365f, 38.154f)
+                lineTo(213.041f, 29.31f)
+                curveTo(213.437f, 28.474f, 214.075f, 28.056f, 214.955f, 28.056f)
+                horizontalLineTo(222.611f)
+                lineTo(211.457f, 44.292f)
+                lineTo(223.073f, 62.244f)
+                close()
+            }
+        }
+        .build()
+        return _power10!!
+    }
+
+private var _power10: ImageVector? = null
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/AcTan.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/AcTan.kt
index c9bbb59e..4e1c536d 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/AcTan.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/AcTan.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.AcTan: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.AcTan: ImageVector
     get() {
         if (_acTan != null) {
             return _acTan!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/ArCos.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/ArCos.kt
index 1123a870..518a83c2 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/ArCos.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/ArCos.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.ArCos: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.ArCos: ImageVector
     get() {
         if (_arCos != null) {
             return _arCos!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/ArSin.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/ArSin.kt
index 106ce68d..025ef623 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/ArSin.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/ArSin.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.ArSin: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.ArSin: ImageVector
     get() {
         if (_arSin != null) {
             return _arSin!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Backspace.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Backspace.kt
index 021d4bf4..2a92c899 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Backspace.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Backspace.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Backspace: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Backspace: ImageVector
     get() {
         if (_backspace != null) {
             return _backspace!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Check.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Check.kt
new file mode 100644
index 00000000..800e1d14
--- /dev/null
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Check.kt
@@ -0,0 +1,57 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.core.ui.common.key.unittoicons
+
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.PathFillType.Companion.NonZero
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.graphics.StrokeCap.Companion.Butt
+import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.graphics.vector.ImageVector.Builder
+import androidx.compose.ui.graphics.vector.path
+import androidx.compose.ui.unit.dp
+import com.sadellie.unitto.core.ui.common.key.UnittoIcons
+
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Check: ImageVector
+    get() {
+        if (_check != null) {
+            return _check!!
+        }
+        _check = Builder(name = "Check", defaultWidth = 150.0.dp, defaultHeight = 150.0.dp,
+                viewportWidth = 150.0f, viewportHeight = 150.0f).apply {
+            path(fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = 0.0f,
+                    strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f,
+                    pathFillType = NonZero) {
+                moveTo(59.625f, 112.156f)
+                lineTo(24.0f, 76.531f)
+                lineTo(32.906f, 67.625f)
+                lineTo(59.625f, 94.344f)
+                lineTo(116.969f, 37.0f)
+                lineTo(125.875f, 45.906f)
+                lineTo(59.625f, 112.156f)
+                close()
+            }
+        }
+        .build()
+        return _check!!
+    }
+
+private var _check: ImageVector? = null
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Comma.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Comma.kt
index 13322bbd..dcac53dd 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Comma.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Comma.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Comma: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Comma: ImageVector
     get() {
         if (_comma != null) {
             return _comma!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Cos.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Cos.kt
index 8ddd4246..4abe36e3 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Cos.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Cos.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Cos: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Cos: ImageVector
     get() {
         if (_cos != null) {
             return _cos!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Deg.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Deg.kt
index e8d2bdc2..5ea8dd5f 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Deg.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Deg.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Deg: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Deg: ImageVector
     get() {
         if (_deg != null) {
             return _deg!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Divide.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Divide.kt
index f3f2ab8c..58c8a470 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Divide.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Divide.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Divide: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Divide: ImageVector
     get() {
         if (_divide != null) {
             return _divide!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Dot.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Dot.kt
index bc90e2cf..c6f417c4 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Dot.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Dot.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Dot: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Dot: ImageVector
     get() {
         if (_dot != null) {
             return _dot!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/E.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/E.kt
index 79d75699..2b38aa21 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/E.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/E.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.E: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.E: ImageVector
     get() {
         if (_e != null) {
             return _e!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Equal.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Equal.kt
index c06421aa..ed163936 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Equal.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Equal.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Equal: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Equal: ImageVector
     get() {
         if (_equal != null) {
             return _equal!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Exp.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Exp.kt
index 0d068202..5642e63e 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Exp.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Exp.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Exp: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Exp: ImageVector
     get() {
         if (_exp != null) {
             return _exp!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Exponent.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Exponent.kt
index 2dea4da7..fb6a1fdc 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Exponent.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Exponent.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Exponent: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Exponent: ImageVector
     get() {
         if (_exponent != null) {
             return _exponent!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/ExponentWide.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/ExponentWide.kt
index 6a728827..386b1bd1 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/ExponentWide.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/ExponentWide.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.ExponentWide: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.ExponentWide: ImageVector
     get() {
         if (_exponent != null) {
             return _exponent!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Factorial.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Factorial.kt
index 88f2f1f1..fa34b89e 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Factorial.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Factorial.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Factorial: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Factorial: ImageVector
     get() {
         if (_factorial != null) {
             return _factorial!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Inv.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Inv.kt
index f2f52901..9099a3a4 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Inv.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Inv.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Inv: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Inv: ImageVector
     get() {
         if (_inv != null) {
             return _inv!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key0.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key0.kt
index a280f0cd..cb6944c8 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key0.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key0.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Key0: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Key0: ImageVector
     get() {
         if (_key0 != null) {
             return _key0!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key1.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key1.kt
index df4e08e4..981aad2d 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key1.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key1.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Key1: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Key1: ImageVector
     get() {
         if (_key1 != null) {
             return _key1!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key2.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key2.kt
index 643de3e6..207ab5b3 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key2.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key2.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Key2: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Key2: ImageVector
     get() {
         if (_key2 != null) {
             return _key2!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key3.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key3.kt
index 7786ddf4..02e6b529 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key3.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key3.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Key3: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Key3: ImageVector
     get() {
         if (_key3 != null) {
             return _key3!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key4.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key4.kt
index 2218b0c6..5732e94c 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key4.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key4.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Key4: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Key4: ImageVector
     get() {
         if (_key4 != null) {
             return _key4!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key5.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key5.kt
index e070aba3..7bd81004 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key5.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key5.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Key5: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Key5: ImageVector
     get() {
         if (_key5 != null) {
             return _key5!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key6.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key6.kt
index c306a70c..6d33018c 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key6.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key6.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Key6: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Key6: ImageVector
     get() {
         if (_key6 != null) {
             return _key6!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key7.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key7.kt
index 2079fa00..ec6e947f 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key7.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key7.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Key7: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Key7: ImageVector
     get() {
         if (_key7 != null) {
             return _key7!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key8.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key8.kt
index 83273bd7..1ae122e7 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key8.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key8.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Key8: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Key8: ImageVector
     get() {
         if (_key8 != null) {
             return _key8!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key9.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key9.kt
index ee4251fd..7ee87269 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key9.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Key9.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Key9: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Key9: ImageVector
     get() {
         if (_key9 != null) {
             return _key9!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/KeyA.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/KeyA.kt
index 86b28b22..8944a99d 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/KeyA.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/KeyA.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.KeyA: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.KeyA: ImageVector
     get() {
         if (_keya != null) {
             return _keya!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/KeyB.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/KeyB.kt
index cf730e6c..b9c1260c 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/KeyB.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/KeyB.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.KeyB: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.KeyB: ImageVector
     get() {
         if (_keyb != null) {
             return _keyb!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/KeyC.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/KeyC.kt
index 5316c0e2..b5b02a76 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/KeyC.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/KeyC.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.KeyC: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.KeyC: ImageVector
     get() {
         if (_keyc != null) {
             return _keyc!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/KeyD.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/KeyD.kt
index e1d5ace3..186293ce 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/KeyD.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/KeyD.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.KeyD: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.KeyD: ImageVector
     get() {
         if (_keyd != null) {
             return _keyd!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/KeyE.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/KeyE.kt
index 797c3f35..7ae488bd 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/KeyE.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/KeyE.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.KeyE: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.KeyE: ImageVector
     get() {
         if (_keye != null) {
             return _keye!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/KeyF.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/KeyF.kt
index 5202ef4f..7bfcd35d 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/KeyF.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/KeyF.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.KeyF: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.KeyF: ImageVector
     get() {
         if (_keyf != null) {
             return _keyf!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/LeftBracket.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/LeftBracket.kt
index fdc2df2b..7571798e 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/LeftBracket.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/LeftBracket.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.LeftBracket: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.LeftBracket: ImageVector
     get() {
         if (_leftbracket != null) {
             return _leftbracket!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Ln.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Ln.kt
index 8a8c0b1b..f6af62e3 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Ln.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Ln.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Ln: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Ln: ImageVector
     get() {
         if (_ln != null) {
             return _ln!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Log.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Log.kt
index 96863a19..e2e40da0 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Log.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Log.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Log: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Log: ImageVector
     get() {
         if (_log != null) {
             return _log!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Minus.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Minus.kt
index 7b3e8392..bacb977b 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Minus.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Minus.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Minus: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Minus: ImageVector
     get() {
         if (_minus != null) {
             return _minus!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Modulo.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Modulo.kt
index afae09c7..20f5eaa7 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Modulo.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Modulo.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Modulo: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Modulo: ImageVector
     get() {
         if (_modulo != null) {
             return _modulo!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Multiply.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Multiply.kt
index b4291b96..e3b3fe1e 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Multiply.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Multiply.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Multiply: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Multiply: ImageVector
     get() {
         if (_multiply != null) {
             return _multiply!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Percent.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Percent.kt
index 815b5517..1d9c2f70 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Percent.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Percent.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Percent: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Percent: ImageVector
     get() {
         if (_percent != null) {
             return _percent!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Pi.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Pi.kt
index b9c5c95b..c7630a68 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Pi.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Pi.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Pi: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Pi: ImageVector
     get() {
         if (_pi != null) {
             return _pi!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Plus.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Plus.kt
index fe70abd3..6f76522d 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Plus.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Plus.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Plus: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Plus: ImageVector
     get() {
         if (_plus != null) {
             return _plus!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Rad.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Rad.kt
index fd7749ad..8dd0f86c 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Rad.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Rad.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Rad: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Rad: ImageVector
     get() {
         if (_rad != null) {
             return _rad!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/RightBracket.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/RightBracket.kt
index fa4ea86d..9669c366 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/RightBracket.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/RightBracket.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.RightBracket: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.RightBracket: ImageVector
     get() {
         if (_rightbracket != null) {
             return _rightbracket!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Sin.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Sin.kt
index ba087c87..51ebb5e8 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Sin.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Sin.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Sin: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Sin: ImageVector
     get() {
         if (_sin != null) {
             return _sin!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/SquareRoot.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/SquareRoot.kt
index 4f816a3c..da2c2139 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/SquareRoot.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/SquareRoot.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.SquareRoot: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.SquareRoot: ImageVector
     get() {
         if (_squareRoot != null) {
             return _squareRoot!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/SquareRootWide.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/SquareRootWide.kt
index bd24c3f3..87e8987f 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/SquareRootWide.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/SquareRootWide.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.SquareRootWide: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.SquareRootWide: ImageVector
     get() {
         if (_squareRoot != null) {
             return _squareRoot!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Tab.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Tab.kt
new file mode 100644
index 00000000..581c87d6
--- /dev/null
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Tab.kt
@@ -0,0 +1,66 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.core.ui.common.key.unittoicons
+
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.PathFillType.Companion.NonZero
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.graphics.StrokeCap.Companion.Butt
+import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.graphics.vector.ImageVector.Builder
+import androidx.compose.ui.graphics.vector.path
+import androidx.compose.ui.unit.dp
+import com.sadellie.unitto.core.ui.common.key.UnittoIcons
+
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Tab: ImageVector
+    get() {
+        if (_tab != null) {
+            return _tab!!
+        }
+        _tab = Builder(name = "Tab", defaultWidth = 150.0.dp, defaultHeight = 150.0.dp,
+                viewportWidth = 150.0f, viewportHeight = 150.0f).apply {
+            path(fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = 0.0f,
+                    strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f,
+                    pathFillType = NonZero) {
+                moveTo(125.0f, 112.5f)
+                verticalLineTo(37.5f)
+                horizontalLineTo(137.5f)
+                verticalLineTo(112.5f)
+                horizontalLineTo(125.0f)
+                close()
+                moveTo(75.0f, 112.5f)
+                lineTo(66.094f, 103.75f)
+                lineTo(88.594f, 81.25f)
+                horizontalLineTo(12.5f)
+                verticalLineTo(68.75f)
+                horizontalLineTo(88.594f)
+                lineTo(66.25f, 46.25f)
+                lineTo(75.0f, 37.5f)
+                lineTo(112.5f, 75.0f)
+                lineTo(75.0f, 112.5f)
+                close()
+            }
+        }
+        .build()
+        return _tab!!
+    }
+
+private var _tab: ImageVector? = null
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Tan.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Tan.kt
index 18355356..90fdcc27 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Tan.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/key/unittoicons/Tan.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.ui.common.key.UnittoIcons
 
-val @receiver:Suppress("UNUSED") UnittoIcons.Tan: ImageVector
+@Suppress("UnusedReceiverParameter")
+val UnittoIcons.Tan: ImageVector
     get() {
         if (_tan != null) {
             return _tan!!
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/textfield/CursorFixer.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/textfield/CursorFixer.kt
index 723cbb6b..acbd5134 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/textfield/CursorFixer.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/textfield/CursorFixer.kt
@@ -36,6 +36,10 @@ fun String.fixCursor(pos: Int, grouping: String): Int {
     return listOf(leftCursor, rightCursor).minBy { abs(it - pos) }
 }
 
+/**
+ * Same as [String.tokenAhead], but more efficient. We only need a number, not string.
+ * Don't replace!
+ */
 fun String.tokenLengthAhead(pos: Int): Int {
     Token.Func.allWithOpeningBracket.forEach {
         if (pos.isAfterToken(this, it)) return it.length
@@ -44,6 +48,14 @@ fun String.tokenLengthAhead(pos: Int): Int {
     return 1
 }
 
+fun String.tokenAhead(pos: Int): String {
+    Token.Func.allWithOpeningBracket.forEach {
+        if (pos.isAfterToken(this, it)) return it
+    }
+
+    return substring((pos - 1).coerceAtLeast(0), pos)
+}
+
 private fun String.isPlacedIllegallyAt(pos: Int, grouping: String): Boolean {
     // For things like "123,|456" - this is illegal
     if (pos.isAfterToken(this, grouping)) return true
@@ -71,3 +83,36 @@ private fun Int.isAfterToken(str: String, token: String): Boolean {
         .substring((this - token.length).coerceAtLeast(0), this)
         .contains(token)
 }
+
+
+// This can make [TextFieldValue.addTokens] better by checking tokens both ways. Needs more tests
+//fun String.tokenAfter(pos: Int): String {
+//    Token.Func.allWithOpeningBracket.forEach {
+//        if (pos.isBeforeToken(this, it)) return it
+//    }
+//
+//    return substring(pos, (pos + 1).coerceAtMost(this.length))
+//}
+
+//private fun String.numberNearby(cursor: Int): String {
+//    val text = this
+//
+//    var aheadCursor = cursor
+//    var afterCursor = cursor
+//
+//    while (text.tokenAhead(aheadCursor) in Token.Digit.allWithDot) {
+//        aheadCursor--
+//    }
+//
+//    while (text.tokenAfter(afterCursor) in Token.Digit.allWithDot) {
+//        afterCursor++
+//    }
+//
+//    return text.substring(aheadCursor, afterCursor)
+//}
+
+//private fun Int.isBeforeToken(str: String, token: String): Boolean {
+//    return str
+//        .substring(this, (this + token.length).coerceAtMost(str.length))
+//        .contains(token)
+//}
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/textfield/FormatterExtensions.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/textfield/FormatterExtensions.kt
index b9843698..3a775d58 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/textfield/FormatterExtensions.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/textfield/FormatterExtensions.kt
@@ -18,27 +18,10 @@
 
 package com.sadellie.unitto.core.ui.common.textfield
 
-import android.content.Context
-import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.core.base.Token
-import java.math.BigDecimal
-import java.math.RoundingMode
 
 private val numbersRegex by lazy { Regex("[\\d.]+") }
 
-private val timeDivisions by lazy {
-    mapOf(
-        R.string.day_short to BigDecimal("86400000000000000000000"),
-        R.string.hour_short to BigDecimal("3600000000000000000000"),
-        R.string.minute_short to BigDecimal("60000000000000000000"),
-        R.string.second_short to BigDecimal("1000000000000000000"),
-        R.string.millisecond_short to BigDecimal("1000000000000000"),
-        R.string.microsecond_short to BigDecimal("1000000000000"),
-        R.string.nanosecond_short to BigDecimal("1000000000"),
-        R.string.attosecond_short to BigDecimal("1"),
-    )
-}
-
 fun String.clearAndFilterExpression(formatterSymbols: FormatterSymbols): String {
     var clean = this
         .replace(formatterSymbols.grouping, "")
@@ -58,51 +41,6 @@ internal fun String.clearAndFilterNumberBase(): String {
     return uppercase().cleanIt(Token.numberBaseTokens)
 }
 
-/**
- * Format string time conversion result into a more readable format.
- *
- * @param basicUnit Basic unit of the unit we convert to
- * @return String like "1d 12h 12s".
- */
-fun String.formatTime(
-    context: Context,
-    basicUnit: BigDecimal?,
-    formatterSymbols: FormatterSymbols
-): String {
-    // We get ugly version of input (non-fancy minus)
-    val input = this
-
-    if (basicUnit == null) return Token.Digit._0
-
-    try {
-        // Don't need magic if the input is zero
-        if (BigDecimal(input).compareTo(BigDecimal.ZERO) == 0) return Token.Digit._0
-    } catch (e: NumberFormatException) {
-        // For case such as "10-" and "("
-        return Token.Digit._0
-    }
-    // Attoseconds don't need "magic"
-    if (basicUnit.compareTo(BigDecimal.ONE) == 0) return input.formatExpression(formatterSymbols)
-
-    var result = if (input.startsWith("-")) Token.Operator.minus else ""
-    var remainingSeconds = BigDecimal(input)
-        .abs()
-        .multiply(basicUnit)
-        .setScale(0, RoundingMode.HALF_EVEN)
-
-    if (remainingSeconds.compareTo(BigDecimal.ZERO) == 0) return Token.Digit._0
-
-    timeDivisions.forEach { (timeStr, divider) ->
-        val division = remainingSeconds.divideAndRemainder(divider)
-        val time = division.component1()
-        remainingSeconds = division.component2()
-        if (time.compareTo(BigDecimal.ZERO) != 0) {
-            result += "${time.toPlainString().formatExpression(formatterSymbols)}${context.getString(timeStr)} "
-        }
-    }
-    return result.trimEnd()
-}
-
 fun String.formatExpression(
     formatterSymbols: FormatterSymbols
 ): String {
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/textfield/InputTextField.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/textfield/InputTextField.kt
index e07348c5..af6ac3ab 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/textfield/InputTextField.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/textfield/InputTextField.kt
@@ -59,7 +59,7 @@ import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.sp
-import com.sadellie.unitto.core.ui.theme.NumbersTextStyleDisplayLarge
+import com.sadellie.unitto.core.ui.theme.numbersDisplayLarge
 import kotlin.math.ceil
 import kotlin.math.roundToInt
 
@@ -105,7 +105,7 @@ fun ExpressionTextField(
         modifier = modifier,
         value = value,
         formattedValue = value.text.formatExpression(formatterSymbols),
-        textStyle = NumbersTextStyleDisplayLarge.copy(color = textColor),
+        textStyle = MaterialTheme.typography.numbersDisplayLarge.copy(color = textColor),
         minRatio = minRatio,
         onValueChange = { onCursorChange(it.selection) },
         readOnly = readOnly,
@@ -157,7 +157,7 @@ fun UnformattedTextField(
     AutoSizableTextField(
         modifier = modifier,
         value = value,
-        textStyle = NumbersTextStyleDisplayLarge.copy(color = textColor),
+        textStyle = MaterialTheme.typography.numbersDisplayLarge.copy(color = textColor),
         minRatio = minRatio,
         onValueChange = { onCursorChange(it.selection) },
         readOnly = readOnly,
@@ -197,7 +197,7 @@ private fun AutoSizableTextField(
     ) {
         with(density) {
             // Cursor handle is not visible without this, 0.836f is the minimum required factor here
-            nFontSize = maxHeight.toSp() * 0.835f
+            nFontSize = maxHeight.toSp() * 0.83f
             minFontSize = nFontSize * minRatio
         }
 
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/textfield/TextFieldValueExtensions.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/textfield/TextFieldValueExtensions.kt
index 5e48fd28..d97b1e8b 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/textfield/TextFieldValueExtensions.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/textfield/TextFieldValueExtensions.kt
@@ -20,14 +20,50 @@ package com.sadellie.unitto.core.ui.common.textfield
 
 import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.input.TextFieldValue
+import com.sadellie.unitto.core.base.Token
 
 fun TextFieldValue.addTokens(tokens: String): TextFieldValue {
+    val ahead by lazy { text.tokenAhead(selection.start) }
+
+    when (tokens) {
+        Token.Operator.plus,
+        Token.Operator.multiply,
+        Token.Operator.divide,
+        Token.Operator.power -> {
+            if (ahead == Token.Operator.plus) return deleteAheadAndAdd(tokens)
+            if (ahead == Token.Operator.minus) return deleteAheadAndAdd(tokens)
+            if (ahead == Token.Operator.multiply) return deleteAheadAndAdd(tokens)
+            if (ahead == Token.Operator.divide) return deleteAheadAndAdd(tokens)
+            if (ahead == Token.Operator.sqrt) return deleteAheadAndAdd(tokens)
+            if (ahead == Token.Operator.power) return deleteAheadAndAdd(tokens)
+            if (ahead == "") return deleteTokens()
+        }
+        Token.Operator.minus -> {
+            if (ahead == Token.Operator.plus) return deleteAheadAndAdd(tokens)
+            if (ahead == Token.Operator.minus) return deleteAheadAndAdd(tokens)
+        }
+        Token.Digit.dot -> {
+            if (ahead == Token.Digit.dot) return deleteAheadAndAdd(tokens)
+        }
+    }
+
     return this.copy(
         text = text.replaceRange(selection.start, selection.end, tokens),
         selection = TextRange(selection.start + tokens.length)
     )
 }
 
+/**
+ * <b>!!! Recursive !!!</b> (one wrong step and you are dead 💀)
+ */
+private fun TextFieldValue.deleteAheadAndAdd(tokens: String): TextFieldValue {
+    var newValue = this
+    if (!selection.collapsed) newValue = this.deleteTokens()
+    return newValue
+        .deleteTokens()
+        .addTokens(tokens)
+}
+
 fun TextFieldValue.deleteTokens(): TextFieldValue {
     val distanceFromEnd = text.length - selection.end
 
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/theme/Type.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/theme/Type.kt
index 9f81b829..a021bd49 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/theme/Type.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/theme/Type.kt
@@ -18,148 +18,200 @@
 
 package com.sadellie.unitto.core.ui.theme
 
+import androidx.compose.foundation.background
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.material3.Typography
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.Font
 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.em
 import androidx.compose.ui.unit.sp
 import com.sadellie.unitto.core.base.R
 
-val Montserrat = FontFamily(
-    Font(R.font.montserrat_light, weight = FontWeight.Light),
-    Font(R.font.montserrat_regular, weight = FontWeight.Normal),
-    Font(R.font.montserrat_medium, weight = FontWeight.Medium),
-    Font(R.font.montserrat_semibold, weight = FontWeight.SemiBold),
-)
-
-val Lato = FontFamily(
-    Font(R.font.lato_regular)
-)
-
 // This text style is used for text field
-val NumbersTextStyleDisplayLarge = TextStyle(
-    fontFamily = Lato,
-    fontWeight = FontWeight.W400,
-    fontSize = 57.sp,
-    lineHeight = (1.4).em,
-    letterSpacing = (-0.25).sp,
-)
+val Typography.numbersDisplayLarge by lazy {
+    TextStyle(
+        fontFamily = latoFamily,
+        fontWeight = FontWeight.W400,
+        fontSize = 57.sp,
+        lineHeight = (1.4).em,
+        letterSpacing = (-0.25).sp,
+    )
+}
 
 // This text style is used for secondary text field
-val NumbersTextStyleDisplayMedium = TextStyle(
-    fontFamily = Lato,
-    fontWeight = FontWeight.W400,
-    fontSize = 38.sp,
-    lineHeight = 42.sp,
-    letterSpacing = (-0.25).sp,
-)
-
-val AppTypography = Typography(
-    displayLarge = TextStyle(
-        fontFamily = Montserrat,
-        fontWeight = FontWeight.Normal,
-        fontSize = 57.sp,
-        lineHeight = 64.sp,
+val Typography.numbersDisplayMedium by lazy {
+    TextStyle(
+        fontFamily = latoFamily,
+        fontWeight = FontWeight.W400,
+        fontSize = 38.sp,
+        lineHeight = 42.sp,
         letterSpacing = (-0.25).sp,
-    ),
-    displayMedium = TextStyle(
-        fontFamily = Montserrat,
-        fontWeight = FontWeight.Normal,
-        fontSize = 45.sp,
-        lineHeight = 52.sp,
-        letterSpacing = 0.sp,
-    ),
-    displaySmall = TextStyle(
-        fontFamily = Montserrat,
-        fontWeight = FontWeight.Normal,
-        fontSize = 36.sp,
-        lineHeight = 44.sp,
-        letterSpacing = 0.sp,
-    ),
-    headlineLarge = TextStyle(
-        fontFamily = Montserrat,
-        fontWeight = FontWeight.Normal,
-        fontSize = 32.sp,
-        lineHeight = 40.sp,
-        letterSpacing = 0.sp,
-    ),
-    headlineMedium = TextStyle(
-        fontFamily = Montserrat,
-        fontWeight = FontWeight.Normal,
-        fontSize = 28.sp,
-        lineHeight = 36.sp,
-        letterSpacing = 0.sp,
-    ),
-    headlineSmall = TextStyle(
-        fontFamily = Montserrat,
-        fontWeight = FontWeight.Normal,
-        fontSize = 24.sp,
-        lineHeight = 32.sp,
-        letterSpacing = 0.sp,
-    ),
-    titleLarge = TextStyle(
-        fontFamily = Montserrat,
-        fontWeight = FontWeight.Medium,
-        fontSize = 22.sp,
-        lineHeight = 28.sp,
-        letterSpacing = 0.sp,
-    ),
-    titleMedium = TextStyle(
-        fontFamily = Montserrat,
-        fontWeight = FontWeight.Bold,
-        fontSize = 18.sp,
-        lineHeight = 24.sp,
-        letterSpacing = 0.1.sp,
-    ),
-    titleSmall = TextStyle(
-        fontFamily = Montserrat,
-        fontWeight = FontWeight.Medium,
-        fontSize = 14.sp,
-        lineHeight = 20.sp,
-        letterSpacing = 0.1.sp,
-    ),
-    bodyLarge = TextStyle(
-        fontFamily = Montserrat,
-        fontWeight = FontWeight.Normal,
-        fontSize = 16.sp,
-        lineHeight = 24.sp,
-        letterSpacing = 0.5.sp,
-    ),
-    bodyMedium = TextStyle(
-        fontFamily = Montserrat,
-        fontWeight = FontWeight.Normal,
-        fontSize = 14.sp,
-        lineHeight = 20.sp,
-        letterSpacing = 0.25.sp,
-    ),
-    bodySmall = TextStyle(
-        fontFamily = Montserrat,
-        fontWeight = FontWeight.Normal,
-        fontSize = 12.sp,
-        lineHeight = 16.sp,
-        letterSpacing = 0.4.sp,
-    ),
-    labelLarge = TextStyle(
-        fontFamily = Montserrat,
-        fontWeight = FontWeight.Medium,
-        fontSize = 14.sp,
-        lineHeight = 20.sp,
-        letterSpacing = 0.1.sp,
-    ),
-    labelMedium = TextStyle(
-        fontFamily = Montserrat,
-        fontWeight = FontWeight.Medium,
-        fontSize = 12.sp,
-        lineHeight = 16.sp,
-        letterSpacing = 0.5.sp,
-    ),
-    labelSmall = TextStyle(
-        fontFamily = Montserrat,
-        fontWeight = FontWeight.Medium,
-        fontSize = 10.sp,
-        lineHeight = 16.sp,
-        letterSpacing = 0.sp,
-    ),
-)
+    )
+}
+
+val TypographyUnitto by lazy {
+    Typography(
+        displayLarge = TextStyle(
+            fontFamily = montserratFamily,
+            fontWeight = FontWeight.Normal,
+            fontSize = 57.sp,
+            lineHeight = 64.sp,
+            letterSpacing = (-0.25).sp,
+        ),
+        displayMedium = TextStyle(
+            fontFamily = montserratFamily,
+            fontWeight = FontWeight.Normal,
+            fontSize = 45.sp,
+            lineHeight = 52.sp,
+            letterSpacing = 0.sp,
+        ),
+        displaySmall = TextStyle(
+            fontFamily = montserratFamily,
+            fontWeight = FontWeight.Normal,
+            fontSize = 36.sp,
+            lineHeight = 44.sp,
+            letterSpacing = 0.sp,
+        ),
+        headlineLarge = TextStyle(
+            fontFamily = montserratFamily,
+            fontWeight = FontWeight.Normal,
+            fontSize = 32.sp,
+            lineHeight = 40.sp,
+            letterSpacing = 0.sp,
+        ),
+        headlineMedium = TextStyle(
+            fontFamily = montserratFamily,
+            fontWeight = FontWeight.Normal,
+            fontSize = 28.sp,
+            lineHeight = 36.sp,
+            letterSpacing = 0.sp,
+        ),
+        headlineSmall = TextStyle(
+            fontFamily = montserratFamily,
+            fontWeight = FontWeight.Normal,
+            fontSize = 24.sp,
+            lineHeight = 32.sp,
+            letterSpacing = 0.sp,
+        ),
+        titleLarge = TextStyle(
+            fontFamily = montserratFamily,
+            fontWeight = FontWeight.Medium,
+            fontSize = 22.sp,
+            lineHeight = 28.sp,
+            letterSpacing = 0.sp,
+        ),
+        titleMedium = TextStyle(
+            fontFamily = montserratFamily,
+            fontWeight = FontWeight.Bold,
+            fontSize = 18.sp,
+            lineHeight = 24.sp,
+            letterSpacing = 0.1.sp,
+        ),
+        titleSmall = TextStyle(
+            fontFamily = montserratFamily,
+            fontWeight = FontWeight.Medium,
+            fontSize = 14.sp,
+            lineHeight = 20.sp,
+            letterSpacing = 0.1.sp,
+        ),
+        bodyLarge = TextStyle(
+            fontFamily = montserratFamily,
+            fontWeight = FontWeight.Normal,
+            fontSize = 16.sp,
+            lineHeight = 24.sp,
+            letterSpacing = 0.5.sp,
+        ),
+        bodyMedium = TextStyle(
+            fontFamily = montserratFamily,
+            fontWeight = FontWeight.Normal,
+            fontSize = 14.sp,
+            lineHeight = 20.sp,
+            letterSpacing = 0.25.sp,
+        ),
+        bodySmall = TextStyle(
+            fontFamily = montserratFamily,
+            fontWeight = FontWeight.Normal,
+            fontSize = 12.sp,
+            lineHeight = 16.sp,
+            letterSpacing = 0.4.sp,
+        ),
+        labelLarge = TextStyle(
+            fontFamily = montserratFamily,
+            fontWeight = FontWeight.Medium,
+            fontSize = 14.sp,
+            lineHeight = 20.sp,
+            letterSpacing = (-0.4).sp,
+        ),
+        labelMedium = TextStyle(
+            fontFamily = montserratFamily,
+            fontWeight = FontWeight.Medium,
+            fontSize = 12.sp,
+            lineHeight = 16.sp,
+            letterSpacing = (-0.3).sp,
+        ),
+        labelSmall = TextStyle(
+            fontFamily = montserratFamily,
+            fontWeight = FontWeight.Medium,
+            fontSize = 10.sp,
+            lineHeight = 16.sp,
+            letterSpacing = (-0.3).sp,
+        ),
+    )
+}
+
+val TypographySystem by lazy { Typography() }
+
+private val montserratFamily by lazy {
+    FontFamily(
+        Font(R.font.montserrat_light, weight = FontWeight.Light),
+        Font(R.font.montserrat_regular, weight = FontWeight.Normal),
+        Font(R.font.montserrat_medium, weight = FontWeight.Medium),
+        Font(R.font.montserrat_semibold, weight = FontWeight.SemiBold),
+    )
+}
+
+private val latoFamily by lazy {
+    FontFamily(Font(R.font.lato_regular))
+}
+
+@Preview(widthDp = 480)
+@Composable
+private fun PreviewTypography() {
+    MaterialTheme(
+        typography = TypographyUnitto
+    ) {
+        val textStyles = mapOf(
+            "displayLarge" to MaterialTheme.typography.displayLarge,
+            "displayMedium" to MaterialTheme.typography.displayMedium,
+            "displaySmall" to MaterialTheme.typography.displaySmall,
+            "headlineLarge" to MaterialTheme.typography.headlineLarge,
+            "headlineMedium" to MaterialTheme.typography.headlineMedium,
+            "headlineSmall" to MaterialTheme.typography.headlineSmall,
+            "titleLarge" to MaterialTheme.typography.titleLarge,
+            "titleMedium" to MaterialTheme.typography.titleMedium,
+            "titleSmall" to MaterialTheme.typography.titleSmall,
+            "bodyLarge" to MaterialTheme.typography.bodyLarge,
+            "bodyMedium" to MaterialTheme.typography.bodyMedium,
+            "bodySmall" to MaterialTheme.typography.bodySmall,
+            "labelLarge" to MaterialTheme.typography.labelLarge,
+            "labelMedium" to MaterialTheme.typography.labelMedium,
+            "labelSmall" to MaterialTheme.typography.labelSmall,
+        )
+
+        LazyColumn(Modifier.background(MaterialTheme.colorScheme.background)) {
+
+            textStyles.forEach { (label, style) ->
+                item {
+                    Text("$label 123", style = style, color = MaterialTheme.colorScheme.onBackground)
+                }
+            }
+        }
+    }
+}
diff --git a/core/ui/src/test/java/com/sadellie/unitto/core/ui/FormatterTest.kt b/core/ui/src/test/java/com/sadellie/unitto/core/ui/FormatterTest.kt
index 28c87f7c..d82866b1 100644
--- a/core/ui/src/test/java/com/sadellie/unitto/core/ui/FormatterTest.kt
+++ b/core/ui/src/test/java/com/sadellie/unitto/core/ui/FormatterTest.kt
@@ -18,18 +18,14 @@
 
 package com.sadellie.unitto.core.ui
 
-import android.content.Context
 import androidx.compose.ui.test.junit4.createComposeRule
 import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols
 import com.sadellie.unitto.core.ui.common.textfield.formatExpression
-import com.sadellie.unitto.core.ui.common.textfield.formatTime
 import org.junit.Assert.assertEquals
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import org.robolectric.RuntimeEnvironment
-import java.math.BigDecimal
 
 private const val ENG_VALUE = "123E+21"
 private const val ENG_VALUE_FRACTIONAL = "123.3E+21"
@@ -88,104 +84,4 @@ class FormatterTest {
         assertEquals("50+123.456÷89.078,,9×0,8−12+0−√9×4^9+2×(9+8×7)×sin(13sin123cos", LONG_HALF_COMPLETE_EXPR.format())
         assertEquals("((((((((", SOME_BRACKETS.format())
     }
-
-    @Test
-    fun formatTimeTest() {
-        val formatterSymbols = FormatterSymbols.Spaces
-        var basicValue = BigDecimal.valueOf(1)
-        val mContext: Context = RuntimeEnvironment.getApplication().applicationContext
-
-        fun String.formatTime() = this.formatTime(mContext, basicValue, formatterSymbols)
-
-        assertEquals("−28", "-28".formatTime())
-        assertEquals("−0.05", "-0.05".formatTime())
-        assertEquals("0", "0".formatTime())
-        assertEquals("0", "−0".formatTime())
-
-        basicValue = BigDecimal.valueOf(86_400_000_000_000_000_000_000.0)
-        assertEquals("−28d", "-28".formatTime())
-        assertEquals("−1h 12m", "-0.05".formatTime())
-        assertEquals("0", "0".formatTime())
-        assertEquals("0", "-0".formatTime())
-
-        // DAYS
-        basicValue = BigDecimal.valueOf(86_400_000_000_000_000_000_000.0)
-        assertEquals("12h","0.5".formatTime())
-        assertEquals("1h 12m","0.05".formatTime())
-        assertEquals("7m 12s","0.005".formatTime())
-        assertEquals("28d","28".formatTime())
-        assertEquals("90d","90".formatTime())
-        assertEquals("90d 12h","90.5".formatTime())
-        assertEquals("90d 7m 12s","90.005".formatTime())
-
-        // HOURS
-        basicValue = BigDecimal.valueOf(3_600_000_000_000_000_000_000.0)
-        assertEquals("30m", "0.5".formatTime())
-        assertEquals("3m", "0.05".formatTime())
-        assertEquals("18s", "0.005".formatTime())
-        assertEquals("1d 4h", "28".formatTime())
-        assertEquals("3d 18h", "90".formatTime())
-        assertEquals("3d 18h 30m", "90.5".formatTime())
-        assertEquals("3d 18h 18s", "90.005".formatTime())
-
-        // MINUTES
-        basicValue = BigDecimal.valueOf(60_000_000_000_000_000_000.0)
-        assertEquals("30s", "0.5".formatTime())
-        assertEquals("3s", "0.05".formatTime())
-        assertEquals("300ms", "0.005".formatTime())
-        assertEquals("28m", "28".formatTime())
-        assertEquals("1h 30m", "90".formatTime())
-        assertEquals("1h 30m 30s", "90.5".formatTime())
-        assertEquals("1h 30m 300ms", "90.005".formatTime())
-
-        // SECONDS
-        basicValue = BigDecimal.valueOf(1_000_000_000_000_000_000)
-        assertEquals("500ms", "0.5".formatTime())
-        assertEquals("50ms", "0.05".formatTime())
-        assertEquals("5ms", "0.005".formatTime())
-        assertEquals("28s", "28".formatTime())
-        assertEquals("1m 30s", "90".formatTime())
-        assertEquals("1m 30s 500ms", "90.5".formatTime())
-        assertEquals("1m 30s 5ms", "90.005".formatTime())
-
-        // MILLISECONDS
-        basicValue = BigDecimal.valueOf(1_000_000_000_000_000)
-        assertEquals("500µs", "0.5".formatTime())
-        assertEquals("50µs", "0.05".formatTime())
-        assertEquals("5µs", "0.005".formatTime())
-        assertEquals("28ms", "28".formatTime())
-        assertEquals("90ms", "90".formatTime())
-        assertEquals("90ms 500µs", "90.5".formatTime())
-        assertEquals("90ms 5µs", "90.005".formatTime())
-
-        // MICROSECONDS
-        basicValue = BigDecimal.valueOf(1_000_000_000_000)
-        assertEquals("500ns", "0.5".formatTime())
-        assertEquals("50ns", "0.05".formatTime())
-        assertEquals("5ns", "0.005".formatTime())
-        assertEquals("28µs", "28".formatTime())
-        assertEquals("90µs", "90".formatTime())
-        assertEquals("90µs 500ns", "90.5".formatTime())
-        assertEquals("90µs 5ns", "90.005".formatTime())
-
-        // NANOSECONDS
-        basicValue = BigDecimal.valueOf(1_000_000_000)
-        assertEquals("500 000 000as", "0.5".formatTime())
-        assertEquals("50 000 000as", "0.05".formatTime())
-        assertEquals("5 000 000as", "0.005".formatTime())
-        assertEquals("28ns", "28".formatTime())
-        assertEquals("90ns", "90".formatTime())
-        assertEquals("90ns 500 000 000as", "90.5".formatTime())
-        assertEquals("90ns 5 000 000as", "90.005".formatTime())
-
-        // ATTOSECONDS
-        basicValue = BigDecimal.valueOf(1)
-        assertEquals("0.5", "0.5".formatTime())
-        assertEquals("0.05", "0.05".formatTime())
-        assertEquals("0.005", "0.005".formatTime())
-        assertEquals("28", "28".formatTime())
-        assertEquals("90", "90".formatTime())
-        assertEquals("90.5", "90.5".formatTime())
-        assertEquals("90.005", "90.005".formatTime())
-    }
 }
\ No newline at end of file
diff --git a/core/ui/src/test/java/com/sadellie/unitto/core/ui/TextFieldValueExtensionsTest.kt b/core/ui/src/test/java/com/sadellie/unitto/core/ui/TextFieldValueExtensionsTest.kt
new file mode 100644
index 00000000..4c419be3
--- /dev/null
+++ b/core/ui/src/test/java/com/sadellie/unitto/core/ui/TextFieldValueExtensionsTest.kt
@@ -0,0 +1,280 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.core.ui
+
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.input.TextFieldValue
+import com.sadellie.unitto.core.base.Token
+import com.sadellie.unitto.core.ui.common.textfield.addTokens
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class TextFieldValueExtensionsTest {
+
+    @Test
+    fun addPlus() {
+        // EMPTY
+        assertEquals(tf("[]123+456"), tf("[]123+456").addTokens(Token.Operator.plus))
+        assertEquals(tf("[]+456"), tf("[123]+456").addTokens(Token.Operator.plus))
+        assertEquals(tf("[]"), tf("[123+456]").addTokens(Token.Operator.plus))
+
+        // PLUS
+        assertEquals(tf("123+[]"), tf("123+[]").addTokens(Token.Operator.plus))
+        assertEquals(tf("123+[]"), tf("123[+]").addTokens(Token.Operator.plus))
+        assertEquals(tf("123+[]56"), tf("123+[4]56").addTokens(Token.Operator.plus))
+        assertEquals(tf("123+[]"), tf("123+[456]").addTokens(Token.Operator.plus))
+
+        // MINUS
+        assertEquals(tf("123+[]"), tf("123-[]").addTokens(Token.Operator.plus))
+        assertEquals(tf("123+[]"), tf("123[-]").addTokens(Token.Operator.plus))
+        assertEquals(tf("123+[]56"), tf("123-[4]56").addTokens(Token.Operator.plus))
+        assertEquals(tf("123+[]"), tf("123-[456]").addTokens(Token.Operator.plus))
+
+        // MULTIPLY
+        assertEquals(tf("123+[]"), tf("123*[]").addTokens(Token.Operator.plus))
+        assertEquals(tf("123+[]"), tf("123[*]").addTokens(Token.Operator.plus))
+        assertEquals(tf("123+[]56"), tf("123*[4]56").addTokens(Token.Operator.plus))
+        assertEquals(tf("123+[]"), tf("123*[456]").addTokens(Token.Operator.plus))
+
+        // DIVIDE
+        assertEquals(tf("123+[]"), tf("123/[]").addTokens(Token.Operator.plus))
+        assertEquals(tf("123+[]"), tf("123[/]").addTokens(Token.Operator.plus))
+        assertEquals(tf("123+[]56"), tf("123/[4]56").addTokens(Token.Operator.plus))
+        assertEquals(tf("123+[]"), tf("123/[456]").addTokens(Token.Operator.plus))
+
+        // SQRT
+        assertEquals(tf("123+[]"), tf("123√[]").addTokens(Token.Operator.plus))
+        assertEquals(tf("123+[]"), tf("123[√]").addTokens(Token.Operator.plus))
+        assertEquals(tf("123+[]56"), tf("123√[4]56").addTokens(Token.Operator.plus))
+        assertEquals(tf("123+[]"), tf("123√[456]").addTokens(Token.Operator.plus))
+
+        // POWER
+        assertEquals(tf("123+[]"), tf("123^[]").addTokens(Token.Operator.plus))
+        assertEquals(tf("123+[]"), tf("123[^]").addTokens(Token.Operator.plus))
+        assertEquals(tf("123+[]56"), tf("123^[4]56").addTokens(Token.Operator.plus))
+        assertEquals(tf("123+[]"), tf("123^[456]").addTokens(Token.Operator.plus))
+    }
+
+    @Test
+    fun addMinus() {
+        // EMPTY
+        assertEquals(tf("-[]123+456"), tf("[]123+456").addTokens(Token.Operator.minus))
+        assertEquals(tf("-[]+456"), tf("[123]+456").addTokens(Token.Operator.minus))
+        assertEquals(tf("-[]"), tf("[123+456]").addTokens(Token.Operator.minus))
+
+        // PLUS
+        assertEquals(tf("123-[]"), tf("123+[]").addTokens(Token.Operator.minus))
+        assertEquals(tf("123-[]"), tf("123[+]").addTokens(Token.Operator.minus))
+        assertEquals(tf("123-[]56"), tf("123+[4]56").addTokens(Token.Operator.minus))
+        assertEquals(tf("123-[]"), tf("123+[456]").addTokens(Token.Operator.minus))
+
+        // MINUS
+        assertEquals(tf("123-[]"), tf("123-[]").addTokens(Token.Operator.minus))
+        assertEquals(tf("123-[]"), tf("123[-]").addTokens(Token.Operator.minus))
+        assertEquals(tf("123-[]56"), tf("123-[4]56").addTokens(Token.Operator.minus))
+        assertEquals(tf("123-[]"), tf("123-[456]").addTokens(Token.Operator.minus))
+
+        // MULTIPLY
+        assertEquals(tf("123*-[]"), tf("123*[]").addTokens(Token.Operator.minus))
+        assertEquals(tf("123-[]"), tf("123[*]").addTokens(Token.Operator.minus))
+        assertEquals(tf("123*-[]56"), tf("123*[4]56").addTokens(Token.Operator.minus))
+        assertEquals(tf("123*-[]"), tf("123*[456]").addTokens(Token.Operator.minus))
+
+        // DIVIDE
+        assertEquals(tf("123/-[]"), tf("123/[]").addTokens(Token.Operator.minus))
+        assertEquals(tf("123-[]"), tf("123[/]").addTokens(Token.Operator.minus))
+        assertEquals(tf("123/-[]56"), tf("123/[4]56").addTokens(Token.Operator.minus))
+        assertEquals(tf("123/-[]"), tf("123/[456]").addTokens(Token.Operator.minus))
+
+        // SQRT
+        assertEquals(tf("123√-[]"), tf("123√[]").addTokens(Token.Operator.minus))
+        assertEquals(tf("123-[]"), tf("123[√]").addTokens(Token.Operator.minus))
+        assertEquals(tf("123√-[]56"), tf("123√[4]56").addTokens(Token.Operator.minus))
+        assertEquals(tf("123√-[]"), tf("123√[456]").addTokens(Token.Operator.minus))
+
+        // POWER
+        assertEquals(tf("123^-[]"), tf("123^[]").addTokens(Token.Operator.minus))
+        assertEquals(tf("123-[]"), tf("123[^]").addTokens(Token.Operator.minus))
+        assertEquals(tf("123^-[]56"), tf("123^[4]56").addTokens(Token.Operator.minus))
+        assertEquals(tf("123^-[]"), tf("123^[456]").addTokens(Token.Operator.minus))
+    }
+
+    @Test
+    fun addMultiply() {
+        // EMPTY
+        assertEquals(tf("[]123+456"), tf("[]123+456").addTokens(Token.Operator.multiply))
+        assertEquals(tf("[]+456"), tf("[123]+456").addTokens(Token.Operator.multiply))
+        assertEquals(tf("[]"), tf("[123+456]").addTokens(Token.Operator.multiply))
+
+        // PLUS
+        assertEquals(tf("123*[]"), tf("123+[]").addTokens(Token.Operator.multiply))
+        assertEquals(tf("123*[]"), tf("123[+]").addTokens(Token.Operator.multiply))
+        assertEquals(tf("123*[]56"), tf("123+[4]56").addTokens(Token.Operator.multiply))
+        assertEquals(tf("123*[]"), tf("123+[456]").addTokens(Token.Operator.multiply))
+
+        // MINUS
+        assertEquals(tf("123*[]"), tf("123-[]").addTokens(Token.Operator.multiply))
+        assertEquals(tf("123*[]"), tf("123[-]").addTokens(Token.Operator.multiply))
+        assertEquals(tf("123*[]56"), tf("123-[4]56").addTokens(Token.Operator.multiply))
+        assertEquals(tf("123*[]"), tf("123-[456]").addTokens(Token.Operator.multiply))
+
+        // MULTIPLY
+        assertEquals(tf("123*[]"), tf("123*[]").addTokens(Token.Operator.multiply))
+        assertEquals(tf("123*[]"), tf("123[*]").addTokens(Token.Operator.multiply))
+        assertEquals(tf("123*[]56"), tf("123*[4]56").addTokens(Token.Operator.multiply))
+        assertEquals(tf("123*[]"), tf("123*[456]").addTokens(Token.Operator.multiply))
+
+        // DIVIDE
+        assertEquals(tf("123*[]"), tf("123/[]").addTokens(Token.Operator.multiply))
+        assertEquals(tf("123*[]"), tf("123[/]").addTokens(Token.Operator.multiply))
+        assertEquals(tf("123*[]56"), tf("123/[4]56").addTokens(Token.Operator.multiply))
+        assertEquals(tf("123*[]"), tf("123/[456]").addTokens(Token.Operator.multiply))
+
+        // SQRT
+        assertEquals(tf("123*[]"), tf("123√[]").addTokens(Token.Operator.multiply))
+        assertEquals(tf("123*[]"), tf("123[√]").addTokens(Token.Operator.multiply))
+        assertEquals(tf("123*[]56"), tf("123√[4]56").addTokens(Token.Operator.multiply))
+        assertEquals(tf("123*[]"), tf("123√[456]").addTokens(Token.Operator.multiply))
+
+        // POWER
+        assertEquals(tf("123*[]"), tf("123^[]").addTokens(Token.Operator.multiply))
+        assertEquals(tf("123*[]"), tf("123[^]").addTokens(Token.Operator.multiply))
+        assertEquals(tf("123*[]56"), tf("123^[4]56").addTokens(Token.Operator.multiply))
+        assertEquals(tf("123*[]"), tf("123^[456]").addTokens(Token.Operator.multiply))
+    }
+
+    @Test
+    fun addDivide() {
+        // EMPTY
+        assertEquals(tf("[]123+456"), tf("[]123+456").addTokens(Token.Operator.divide))
+        assertEquals(tf("[]+456"), tf("[123]+456").addTokens(Token.Operator.divide))
+        assertEquals(tf("[]"), tf("[123+456]").addTokens(Token.Operator.divide))
+
+        // PLUS
+        assertEquals(tf("123/[]"), tf("123+[]").addTokens(Token.Operator.divide))
+        assertEquals(tf("123/[]"), tf("123[+]").addTokens(Token.Operator.divide))
+        assertEquals(tf("123/[]56"), tf("123+[4]56").addTokens(Token.Operator.divide))
+        assertEquals(tf("123/[]"), tf("123+[456]").addTokens(Token.Operator.divide))
+
+        // MINUS
+        assertEquals(tf("123/[]"), tf("123-[]").addTokens(Token.Operator.divide))
+        assertEquals(tf("123/[]"), tf("123[-]").addTokens(Token.Operator.divide))
+        assertEquals(tf("123/[]56"), tf("123-[4]56").addTokens(Token.Operator.divide))
+        assertEquals(tf("123/[]"), tf("123-[456]").addTokens(Token.Operator.divide))
+
+        // MULTIPLY
+        assertEquals(tf("123/[]"), tf("123*[]").addTokens(Token.Operator.divide))
+        assertEquals(tf("123/[]"), tf("123[*]").addTokens(Token.Operator.divide))
+        assertEquals(tf("123/[]56"), tf("123*[4]56").addTokens(Token.Operator.divide))
+        assertEquals(tf("123/[]"), tf("123*[456]").addTokens(Token.Operator.divide))
+
+        // DIVIDE
+        assertEquals(tf("123/[]"), tf("123/[]").addTokens(Token.Operator.divide))
+        assertEquals(tf("123/[]"), tf("123[/]").addTokens(Token.Operator.divide))
+        assertEquals(tf("123/[]56"), tf("123/[4]56").addTokens(Token.Operator.divide))
+        assertEquals(tf("123/[]"), tf("123/[456]").addTokens(Token.Operator.divide))
+
+        // SQRT
+        assertEquals(tf("123/[]"), tf("123√[]").addTokens(Token.Operator.divide))
+        assertEquals(tf("123/[]"), tf("123[√]").addTokens(Token.Operator.divide))
+        assertEquals(tf("123/[]56"), tf("123√[4]56").addTokens(Token.Operator.divide))
+        assertEquals(tf("123/[]"), tf("123√[456]").addTokens(Token.Operator.divide))
+
+        // POWER
+        assertEquals(tf("123/[]"), tf("123^[]").addTokens(Token.Operator.divide))
+        assertEquals(tf("123/[]"), tf("123[^]").addTokens(Token.Operator.divide))
+        assertEquals(tf("123/[]56"), tf("123^[4]56").addTokens(Token.Operator.divide))
+        assertEquals(tf("123/[]"), tf("123^[456]").addTokens(Token.Operator.divide))
+    }
+
+    @Test
+    fun addPower() {
+        // EMPTY
+        assertEquals(tf("[]123+456"), tf("[]123+456").addTokens(Token.Operator.power))
+        assertEquals(tf("[]+456"), tf("[123]+456").addTokens(Token.Operator.power))
+        assertEquals(tf("[]"), tf("[123+456]").addTokens(Token.Operator.power))
+
+        // PLUS
+        assertEquals(tf("123^[]"), tf("123+[]").addTokens(Token.Operator.power))
+        assertEquals(tf("123^[]"), tf("123[+]").addTokens(Token.Operator.power))
+        assertEquals(tf("123^[]56"), tf("123+[4]56").addTokens(Token.Operator.power))
+        assertEquals(tf("123^[]"), tf("123+[456]").addTokens(Token.Operator.power))
+
+        // MINUS
+        assertEquals(tf("123^[]"), tf("123-[]").addTokens(Token.Operator.power))
+        assertEquals(tf("123^[]"), tf("123[-]").addTokens(Token.Operator.power))
+        assertEquals(tf("123^[]56"), tf("123-[4]56").addTokens(Token.Operator.power))
+        assertEquals(tf("123^[]"), tf("123-[456]").addTokens(Token.Operator.power))
+
+        // MULTIPLY
+        assertEquals(tf("123^[]"), tf("123*[]").addTokens(Token.Operator.power))
+        assertEquals(tf("123^[]"), tf("123[*]").addTokens(Token.Operator.power))
+        assertEquals(tf("123^[]56"), tf("123*[4]56").addTokens(Token.Operator.power))
+        assertEquals(tf("123^[]"), tf("123*[456]").addTokens(Token.Operator.power))
+
+        // DIVIDE
+        assertEquals(tf("123^[]"), tf("123/[]").addTokens(Token.Operator.power))
+        assertEquals(tf("123^[]"), tf("123[/]").addTokens(Token.Operator.power))
+        assertEquals(tf("123^[]56"), tf("123/[4]56").addTokens(Token.Operator.power))
+        assertEquals(tf("123^[]"), tf("123/[456]").addTokens(Token.Operator.power))
+
+        // SQRT
+        assertEquals(tf("123^[]"), tf("123√[]").addTokens(Token.Operator.power))
+        assertEquals(tf("123^[]"), tf("123[√]").addTokens(Token.Operator.power))
+        assertEquals(tf("123^[]56"), tf("123√[4]56").addTokens(Token.Operator.power))
+        assertEquals(tf("123^[]"), tf("123√[456]").addTokens(Token.Operator.power))
+
+        // POWER
+        assertEquals(tf("123^[]"), tf("123^[]").addTokens(Token.Operator.power))
+        assertEquals(tf("123^[]"), tf("123[^]").addTokens(Token.Operator.power))
+        assertEquals(tf("123^[]56"), tf("123^[4]56").addTokens(Token.Operator.power))
+        assertEquals(tf("123^[]"), tf("123^[456]").addTokens(Token.Operator.power))
+    }
+
+    @Test
+    fun addDot() {
+        // EMPTY
+        assertEquals(tf(".[]123+456"), tf("[]123+456").addTokens(Token.Digit.dot))
+        assertEquals(tf(".[]+456"), tf("[123]+456").addTokens(Token.Digit.dot))
+        assertEquals(tf(".[]"), tf("[123+456]").addTokens(Token.Digit.dot))
+
+        assertEquals(tf("123+456.[]78"), tf("123+456.[]78").addTokens(Token.Digit.dot))
+        assertEquals(tf("123+456.[]78"), tf("123+456[.]78").addTokens(Token.Digit.dot))
+        assertEquals(tf("123+456.[]8"), tf("123+456[.7]8").addTokens(Token.Digit.dot))
+        assertEquals(tf("123+45.[]78"), tf("123+45[6.]78").addTokens(Token.Digit.dot))
+    }
+
+    // Use [] for selection
+    private fun tf(
+        text: String = "",
+    ): TextFieldValue {
+        val selectionStart = text.indexOf("[")
+        val selectionEnd = text.indexOf("]") - 1
+
+        return TextFieldValue(
+            text = text
+                .replace("[", "")
+                .replace("]", "")
+                .replace("-", Token.Operator.minus)
+                .replace("/", Token.Operator.divide)
+                .replace("*", Token.Operator.multiply),
+            selection = TextRange(selectionStart, selectionEnd)
+        )
+    }
+}
diff --git a/data/calculator/build.gradle.kts b/data/calculator/build.gradle.kts
index 9b5f6680..e5919173 100644
--- a/data/calculator/build.gradle.kts
+++ b/data/calculator/build.gradle.kts
@@ -26,6 +26,6 @@ android {
 }
 
 dependencies {
-    implementation(project(mapOf("path" to ":data:model")))
-    implementation(project(mapOf("path" to ":data:database")))
+    implementation(project(":data:model"))
+    implementation(project(":data:database"))
 }
diff --git a/data/common/build.gradle.kts b/data/common/build.gradle.kts
index 6c1f9cf4..eda1e259 100644
--- a/data/common/build.gradle.kts
+++ b/data/common/build.gradle.kts
@@ -25,6 +25,8 @@ android {
 }
 
 dependencies {
-    implementation(project(mapOf("path" to ":core:base")))
-    testImplementation(libs.junit)
+    implementation(libs.androidx.core.core.ktx)
+    implementation(libs.androidx.lifecycle.lifecycle.runtime.compose)
+    implementation(project(":core:base"))
+    testImplementation(libs.junit.junit)
 }
\ No newline at end of file
diff --git a/data/common/src/main/java/com/sadellie/unitto/data/common/BigDecimalUtils.kt b/data/common/src/main/java/com/sadellie/unitto/data/common/BigDecimalUtils.kt
index 0400b469..4354814c 100644
--- a/data/common/src/main/java/com/sadellie/unitto/data/common/BigDecimalUtils.kt
+++ b/data/common/src/main/java/com/sadellie/unitto/data/common/BigDecimalUtils.kt
@@ -24,6 +24,16 @@ import java.math.RoundingMode
 import kotlin.math.floor
 import kotlin.math.log10
 
+fun BigDecimal.format(
+    scale: Int,
+    outputFormat: Int
+): String {
+    return this
+        .setMinimumRequiredScale(scale)
+        .trimZeros()
+        .toStringWith(outputFormat)
+}
+
 /**
  * Shorthand function to use correct `toString` method according to [outputFormat].
  */
diff --git a/data/common/src/main/java/com/sadellie/unitto/data/common/FlowUtils.kt b/data/common/src/main/java/com/sadellie/unitto/data/common/FlowUtils.kt
new file mode 100644
index 00000000..d7b745d3
--- /dev/null
+++ b/data/common/src/main/java/com/sadellie/unitto/data/common/FlowUtils.kt
@@ -0,0 +1,158 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2022 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.data.common
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.stateIn
+
+@Suppress("UNCHECKED_CAST", "UNUSED")
+fun <T1, T2, T3, T4, T5, T6, R> combine(
+    flow: Flow<T1>,
+    flow2: Flow<T2>,
+    flow3: Flow<T3>,
+    flow4: Flow<T4>,
+    flow5: Flow<T5>,
+    flow6: Flow<T6>,
+    transform: suspend (T1, T2, T3, T4, T5, T6) -> R,
+): Flow<R> =
+    kotlinx.coroutines.flow.combine(
+        flow,
+        flow2,
+        flow3,
+        flow4,
+        flow5,
+        flow6,
+    ) { args: Array<*> ->
+        transform(
+            args[0] as T1,
+            args[1] as T2,
+            args[2] as T3,
+            args[3] as T4,
+            args[4] as T5,
+            args[5] as T6,
+        )
+    }
+
+@Suppress("UNCHECKED_CAST", "UNUSED")
+fun <T1, T2, T3, T4, T5, T6, T7, R> combine(
+    flow: Flow<T1>,
+    flow2: Flow<T2>,
+    flow3: Flow<T3>,
+    flow4: Flow<T4>,
+    flow5: Flow<T5>,
+    flow6: Flow<T6>,
+    flow7: Flow<T7>,
+    transform: suspend (T1, T2, T3, T4, T5, T6, T7) -> R,
+): Flow<R> =
+    kotlinx.coroutines.flow.combine(
+        flow,
+        flow2,
+        flow3,
+        flow4,
+        flow5,
+        flow6,
+        flow7,
+    ) { args: Array<*> ->
+        transform(
+            args[0] as T1,
+            args[1] as T2,
+            args[2] as T3,
+            args[3] as T4,
+            args[4] as T5,
+            args[5] as T6,
+            args[6] as T7,
+        )
+    }
+
+@Suppress("UNCHECKED_CAST", "UNUSED")
+fun <T1, T2, T3, T4, T5, T6, T7, T8, R> combine(
+    flow: Flow<T1>,
+    flow2: Flow<T2>,
+    flow3: Flow<T3>,
+    flow4: Flow<T4>,
+    flow5: Flow<T5>,
+    flow6: Flow<T6>,
+    flow7: Flow<T7>,
+    flow8: Flow<T8>,
+    transform: suspend (T1, T2, T3, T4, T5, T6, T7, T8) -> R,
+): Flow<R> =
+    kotlinx.coroutines.flow.combine(
+        flow,
+        flow2,
+        flow3,
+        flow4,
+        flow5,
+        flow6,
+        flow7,
+        flow8
+    ) { args: Array<*> ->
+        transform(
+            args[0] as T1,
+            args[1] as T2,
+            args[2] as T3,
+            args[3] as T4,
+            args[4] as T5,
+            args[5] as T6,
+            args[6] as T7,
+            args[7] as T8,
+        )
+    }
+
+@Suppress("UNCHECKED_CAST", "UNUSED")
+fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> combine(
+    flow: Flow<T1>,
+    flow2: Flow<T2>,
+    flow3: Flow<T3>,
+    flow4: Flow<T4>,
+    flow5: Flow<T5>,
+    flow6: Flow<T6>,
+    flow7: Flow<T7>,
+    flow8: Flow<T8>,
+    flow9: Flow<T9>,
+    transform: suspend (T1, T2, T3, T4, T5, T6, T7, T8, T9) -> R,
+): Flow<R> =
+    kotlinx.coroutines.flow.combine(
+        flow,
+        flow2,
+        flow3,
+        flow4,
+        flow5,
+        flow6,
+        flow7,
+        flow8,
+        flow9
+    ) { args: Array<*> ->
+        transform(
+            args[0] as T1,
+            args[1] as T2,
+            args[2] as T3,
+            args[3] as T4,
+            args[4] as T5,
+            args[5] as T6,
+            args[6] as T7,
+            args[7] as T8,
+            args[8] as T9,
+        )
+    }
+
+fun <T> Flow<T>.stateIn(scope: CoroutineScope, initialValue: T): StateFlow<T> =
+    stateIn(scope, SharingStarted.WhileSubscribed(5000L), initialValue)
diff --git a/data/database/build.gradle.kts b/data/database/build.gradle.kts
index 301acfc6..111a6b01 100644
--- a/data/database/build.gradle.kts
+++ b/data/database/build.gradle.kts
@@ -19,22 +19,15 @@
 plugins {
     id("unitto.library")
     id("unitto.android.hilt")
+    id("unitto.room")
 }
 
 android {
     namespace = "com.sadellie.unitto.data.database"
 
-    // Long thingy
-    val schemaLocation = "$projectDir/schemas"
-    defaultConfig
-        .javaCompileOptions
-        .annotationProcessorOptions
-        .arguments["room.schemaLocation"] = schemaLocation
-    println("Exported Database schema to $schemaLocation")
+    room {
+        val schemaLocation = "$projectDir/schemas"
+        schemaDirectory(schemaLocation)
+        println("Exported Database schema to $schemaLocation")
+    }
 }
-
-dependencies {
-    implementation(libs.androidx.room.runtime)
-    implementation(libs.androidx.room.ktx)
-    kapt(libs.androidx.room.compiler)
-}
\ No newline at end of file
diff --git a/data/database/schemas/com.sadellie.unitto.data.database.UnittoDatabase/4.json b/data/database/schemas/com.sadellie.unitto.data.database.UnittoDatabase/4.json
new file mode 100644
index 00000000..a37ad46f
--- /dev/null
+++ b/data/database/schemas/com.sadellie.unitto.data.database.UnittoDatabase/4.json
@@ -0,0 +1,122 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 4,
+    "identityHash": "93874ff636d0307d3643833770cf9fd2",
+    "entities": [
+      {
+        "tableName": "units",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`unitId` TEXT NOT NULL, `is_favorite` INTEGER NOT NULL, `paired_unit_id` TEXT, `frequency` INTEGER NOT NULL, PRIMARY KEY(`unitId`))",
+        "fields": [
+          {
+            "fieldPath": "unitId",
+            "columnName": "unitId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isFavorite",
+            "columnName": "is_favorite",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pairedUnitId",
+            "columnName": "paired_unit_id",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "frequency",
+            "columnName": "frequency",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "unitId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "calculator_history",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`entityId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `timestamp` INTEGER NOT NULL, `expression` TEXT NOT NULL, `result` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "entityId",
+            "columnName": "entityId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "expression",
+            "columnName": "expression",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "result",
+            "columnName": "result",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "entityId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "time_zones",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `position` INTEGER NOT NULL, `label` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "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, '93874ff636d0307d3643833770cf9fd2')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/data/database/schemas/com.sadellie.unitto.data.database.UnittoDatabase/5.json b/data/database/schemas/com.sadellie.unitto.data.database.UnittoDatabase/5.json
new file mode 100644
index 00000000..4cb602e9
--- /dev/null
+++ b/data/database/schemas/com.sadellie.unitto.data.database.UnittoDatabase/5.json
@@ -0,0 +1,166 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 5,
+    "identityHash": "920913c194487fd80e7020d3606cf8da",
+    "entities": [
+      {
+        "tableName": "units",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`unitId` TEXT NOT NULL, `is_favorite` INTEGER NOT NULL, `paired_unit_id` TEXT, `frequency` INTEGER NOT NULL, PRIMARY KEY(`unitId`))",
+        "fields": [
+          {
+            "fieldPath": "unitId",
+            "columnName": "unitId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isFavorite",
+            "columnName": "is_favorite",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pairedUnitId",
+            "columnName": "paired_unit_id",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "frequency",
+            "columnName": "frequency",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "unitId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "calculator_history",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`entityId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `timestamp` INTEGER NOT NULL, `expression` TEXT NOT NULL, `result` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "entityId",
+            "columnName": "entityId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "expression",
+            "columnName": "expression",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "result",
+            "columnName": "result",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "entityId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "time_zones",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `position` INTEGER NOT NULL, `label` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "currency_rates",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`entityId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `base_unit_id` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, `pair_unit_id` TEXT NOT NULL, `pair_unit_value` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "entityId",
+            "columnName": "entityId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "baseUnitId",
+            "columnName": "base_unit_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pairUnitId",
+            "columnName": "pair_unit_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pairUnitValue",
+            "columnName": "pair_unit_value",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "entityId"
+          ]
+        },
+        "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, '920913c194487fd80e7020d3606cf8da')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/data/database/src/main/java/com/sadellie/unitto/data/database/CurrencyRatesDao.kt b/data/database/src/main/java/com/sadellie/unitto/data/database/CurrencyRatesDao.kt
new file mode 100644
index 00000000..991aefa2
--- /dev/null
+++ b/data/database/src/main/java/com/sadellie/unitto/data/database/CurrencyRatesDao.kt
@@ -0,0 +1,41 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.data.database
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface CurrencyRatesDao {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertRates(currencyRates: List<CurrencyRatesEntity>)
+
+    @Query("SELECT DISTINCT * FROM currency_rates WHERE timestamp = (SELECT MAX(timestamp) FROM currency_rates) AND base_unit_id = :baseId")
+    suspend fun getLatestRates(baseId: String): List<CurrencyRatesEntity>
+
+    @Query("SELECT COUNT(*) from currency_rates")
+    fun size(): Flow<Int>
+
+    @Query("DELETE FROM currency_rates")
+    suspend fun clear()
+}
diff --git a/data/database/src/main/java/com/sadellie/unitto/data/database/UnitsRepository.kt b/data/database/src/main/java/com/sadellie/unitto/data/database/CurrencyRatesEntity.kt
similarity index 55%
rename from data/database/src/main/java/com/sadellie/unitto/data/database/UnitsRepository.kt
rename to data/database/src/main/java/com/sadellie/unitto/data/database/CurrencyRatesEntity.kt
index 810f032d..74ac9a45 100644
--- a/data/database/src/main/java/com/sadellie/unitto/data/database/UnitsRepository.kt
+++ b/data/database/src/main/java/com/sadellie/unitto/data/database/CurrencyRatesEntity.kt
@@ -1,6 +1,6 @@
 /*
  * Unitto is a unit converter for Android
- * Copyright (c) 2022-2023 Elshan Agaev
+ * Copyright (c) 2023 Elshan Agaev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,24 +18,16 @@
 
 package com.sadellie.unitto.data.database
 
-import javax.inject.Inject
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import java.math.BigDecimal
 
-class UnitsRepository @Inject constructor (private val unitsDao: UnitsDao) {
-    /**
-     * Method to insert units. Will rewrite row if unit's id is already in database
-     *
-     * @param unit Unit to add
-     */
-    suspend fun insertUnits(unit: UnitsEntity) {
-        unitsDao.insertUnits(unit)
-    }
-
-    /**
-     * Method to get all units from units table
-     *
-     * @return List of [UnitsEntity] objects that represent one row in table
-     */
-    suspend fun getAll(): List<UnitsEntity> {
-        return unitsDao.getAll()
-    }
-}
\ No newline at end of file
+@Entity(tableName = "currency_rates")
+class CurrencyRatesEntity(
+    @PrimaryKey(autoGenerate = true) val entityId: Int = 0,
+    @ColumnInfo(name = "base_unit_id") val baseUnitId: String,
+    @ColumnInfo(name = "timestamp") val date: Long,
+    @ColumnInfo(name = "pair_unit_id") val pairUnitId: String,
+    @ColumnInfo(name = "pair_unit_value") val pairUnitValue: BigDecimal?
+)
diff --git a/data/database/src/main/java/com/sadellie/unitto/data/database/UnitsDao.kt b/data/database/src/main/java/com/sadellie/unitto/data/database/UnitsDao.kt
index 6a1175cc..5e03da1c 100644
--- a/data/database/src/main/java/com/sadellie/unitto/data/database/UnitsDao.kt
+++ b/data/database/src/main/java/com/sadellie/unitto/data/database/UnitsDao.kt
@@ -22,12 +22,17 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
+import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface UnitsDao {
+
     @Query("SELECT * FROM units")
-    suspend fun getAll(): List<UnitsEntity>
+    fun getAllFlow(): Flow<List<UnitsEntity>>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertUnits(vararg units: UnitsEntity)
+    suspend fun insertUnit(unit: UnitsEntity)
+
+    @Query("SELECT * FROM units WHERE unitId == :unitId LIMIT 1")
+    suspend fun getById(unitId: String): UnitsEntity?
 }
diff --git a/data/database/src/main/java/com/sadellie/unitto/data/database/UnitsEntity.kt b/data/database/src/main/java/com/sadellie/unitto/data/database/UnitsEntity.kt
index 83601859..8d008c0f 100644
--- a/data/database/src/main/java/com/sadellie/unitto/data/database/UnitsEntity.kt
+++ b/data/database/src/main/java/com/sadellie/unitto/data/database/UnitsEntity.kt
@@ -32,7 +32,7 @@ import androidx.room.PrimaryKey
 @Entity(tableName = "units")
 class UnitsEntity(
     @PrimaryKey val unitId: String,
-    @ColumnInfo(name = "is_favorite") val isFavorite: Boolean?,
-    @ColumnInfo(name = "paired_unit_id") val pairedUnitId: String?,
-    @ColumnInfo(name = "frequency") val frequency: Int? = 0,
+    @ColumnInfo(name = "is_favorite") val isFavorite: Boolean = false,
+    @ColumnInfo(name = "paired_unit_id") val pairedUnitId: String? = null,
+    @ColumnInfo(name = "frequency") val frequency: Int = 0,
 )
diff --git a/data/database/src/main/java/com/sadellie/unitto/data/database/UnittoDatabase.kt b/data/database/src/main/java/com/sadellie/unitto/data/database/UnittoDatabase.kt
index 1c25b0d8..7cbb4bc8 100644
--- a/data/database/src/main/java/com/sadellie/unitto/data/database/UnittoDatabase.kt
+++ b/data/database/src/main/java/com/sadellie/unitto/data/database/UnittoDatabase.kt
@@ -21,22 +21,29 @@ package com.sadellie.unitto.data.database
 import androidx.room.AutoMigration
 import androidx.room.Database
 import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
+import com.sadellie.unitto.data.database.converters.Converters
 
 @Database(
-    version = 3,
+    version = 5,
     exportSchema = true,
     entities = [
         UnitsEntity::class,
         CalculatorHistoryEntity::class,
-        TimeZoneEntity::class
+        TimeZoneEntity::class,
+        CurrencyRatesEntity::class,
     ],
     autoMigrations = [
         AutoMigration (from = 1, to = 2),
         AutoMigration (from = 2, to = 3),
+        AutoMigration (from = 3, to = 4),
+        AutoMigration (from = 4, to = 5),
     ]
 )
+@TypeConverters(Converters::class)
 abstract class UnittoDatabase : RoomDatabase() {
     abstract fun unitsDao(): UnitsDao
     abstract fun calculatorHistoryDao(): CalculatorHistoryDao
     abstract fun timeZoneDao(): TimeZoneDao
+    abstract fun currencyRatesDao(): CurrencyRatesDao
 }
diff --git a/data/database/src/main/java/com/sadellie/unitto/data/database/UnittoDatabaseModule.kt b/data/database/src/main/java/com/sadellie/unitto/data/database/UnittoDatabaseModule.kt
index b88545c5..d47cc6f6 100644
--- a/data/database/src/main/java/com/sadellie/unitto/data/database/UnittoDatabaseModule.kt
+++ b/data/database/src/main/java/com/sadellie/unitto/data/database/UnittoDatabaseModule.kt
@@ -34,23 +34,12 @@ import javax.inject.Singleton
 @InstallIn(SingletonComponent::class)
 @Module
 class UnittoDatabaseModule {
-    /**
-     * Tells Hilt to use this method to get [UnitsDao]
-     *
-     * @param unittoDatabase Database for which we need DAO
-     * @return Singleton of [UnitsDao]
-     */
+
     @Provides
     fun provideUnitsDao(unittoDatabase: UnittoDatabase): UnitsDao {
         return unittoDatabase.unitsDao()
     }
 
-    /**
-     * Tells Hilt to use this method to get [CalculatorHistoryDao]
-     *
-     * @param unittoDatabase Database for which we need DAO
-     * @return Singleton of [CalculatorHistoryDao]
-     */
     @Provides
     fun provideCalculatorHistoryDao(unittoDatabase: UnittoDatabase): CalculatorHistoryDao {
         return unittoDatabase.calculatorHistoryDao()
@@ -68,6 +57,11 @@ class UnittoDatabaseModule {
 //        return unittoDatabase.timeZoneDao()
 //    }
 
+    @Provides
+    fun provideCurrencyRatesDao(unittoDatabase: UnittoDatabase): CurrencyRatesDao {
+        return unittoDatabase.currencyRatesDao()
+    }
+
     /**
      * Tells Hilt to use this method to get [UnittoDatabase]
      *
diff --git a/data/model/src/main/java/com/sadellie/unitto/data/model/NumberBaseUnit.kt b/data/database/src/main/java/com/sadellie/unitto/data/database/converters/Converters.kt
similarity index 56%
rename from data/model/src/main/java/com/sadellie/unitto/data/model/NumberBaseUnit.kt
rename to data/database/src/main/java/com/sadellie/unitto/data/database/converters/Converters.kt
index 3fc4ec25..a44db909 100644
--- a/data/model/src/main/java/com/sadellie/unitto/data/model/NumberBaseUnit.kt
+++ b/data/database/src/main/java/com/sadellie/unitto/data/database/converters/Converters.kt
@@ -16,28 +16,25 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.model
+package com.sadellie.unitto.data.database.converters
 
-import androidx.annotation.StringRes
+import androidx.room.TypeConverter
 import java.math.BigDecimal
 
-class NumberBaseUnit(
-    unitId: String,
-    val base: Int,
-    group: UnitGroup,
-    @StringRes displayName: Int,
-    @StringRes shortName: Int,
-) : AbstractUnit(
-    unitId = unitId,
-    displayName = displayName,
-    shortName = shortName,
-    basicUnit = BigDecimal.ONE,
-    group = group,
-) {
-    override fun convert(unitTo: AbstractUnit, value: BigDecimal, scale: Int): BigDecimal = this.basicUnit
+class Converters {
 
-    fun convertToBase(input: String, toBase: Int): String {
-        return input.toBigInteger(base).toString(toBase)
+    @TypeConverter
+    fun stringToBigDecimal(value: String): BigDecimal = try {
+        BigDecimal(value)
+    } catch (e: Exception) {
+        BigDecimal.ZERO
     }
 
-}
\ No newline at end of file
+    @TypeConverter
+    fun bigDecimalToString(value: BigDecimal?): String? = try {
+        value?.toPlainString()
+    } catch (e: Exception) {
+        null
+    }
+
+}
diff --git a/data/epoch/build.gradle.kts b/data/epoch/build.gradle.kts
index 387eed23..a342257c 100644
--- a/data/epoch/build.gradle.kts
+++ b/data/epoch/build.gradle.kts
@@ -26,5 +26,5 @@ android {
 }
 
 dependencies {
-    testImplementation(libs.junit)
+    testImplementation(libs.junit.junit)
 }
diff --git a/data/evaluatto/build.gradle.kts b/data/evaluatto/build.gradle.kts
index 30a2557b..ab006f96 100644
--- a/data/evaluatto/build.gradle.kts
+++ b/data/evaluatto/build.gradle.kts
@@ -26,6 +26,6 @@ android {
 }
 
 dependencies {
-    implementation(project(mapOf("path" to ":core:base")))
-    testImplementation(libs.junit)
+    implementation(project(":core:base"))
+    testImplementation(libs.junit.junit)
 }
diff --git a/data/evaluatto/src/test/java/io/github/sadellie/evaluatto/ExpressionComplexTest.kt b/data/evaluatto/src/test/java/io/github/sadellie/evaluatto/ExpressionComplexTest.kt
index f7ab5edb..d530ebd6 100644
--- a/data/evaluatto/src/test/java/io/github/sadellie/evaluatto/ExpressionComplexTest.kt
+++ b/data/evaluatto/src/test/java/io/github/sadellie/evaluatto/ExpressionComplexTest.kt
@@ -18,7 +18,7 @@
 
 package io.github.sadellie.evaluatto
 
-import org.junit.jupiter.api.Test
+import org.junit.Test
 
 class ExpressionComplexTest {
 
diff --git a/data/evaluatto/src/test/java/io/github/sadellie/evaluatto/ExpressionExceptionsTest.kt b/data/evaluatto/src/test/java/io/github/sadellie/evaluatto/ExpressionExceptionsTest.kt
index 78ffeb83..262c5841 100644
--- a/data/evaluatto/src/test/java/io/github/sadellie/evaluatto/ExpressionExceptionsTest.kt
+++ b/data/evaluatto/src/test/java/io/github/sadellie/evaluatto/ExpressionExceptionsTest.kt
@@ -18,7 +18,7 @@
 
 package io.github.sadellie.evaluatto
 
-import org.junit.jupiter.api.Test
+import org.junit.Test
 
 class ExpressionExceptionsTest {
 
diff --git a/data/evaluatto/src/test/java/io/github/sadellie/evaluatto/ExpressionSimpleTest.kt b/data/evaluatto/src/test/java/io/github/sadellie/evaluatto/ExpressionSimpleTest.kt
index 0e1f68f8..24d0b75e 100644
--- a/data/evaluatto/src/test/java/io/github/sadellie/evaluatto/ExpressionSimpleTest.kt
+++ b/data/evaluatto/src/test/java/io/github/sadellie/evaluatto/ExpressionSimpleTest.kt
@@ -18,7 +18,7 @@
 
 package io.github.sadellie.evaluatto
 
-import org.junit.jupiter.api.Test
+import org.junit.Test
 
 class ExpressionSimpleTest {
 
diff --git a/data/evaluatto/src/test/java/io/github/sadellie/evaluatto/FixLexiconTest.kt b/data/evaluatto/src/test/java/io/github/sadellie/evaluatto/FixLexiconTest.kt
index b6b9d8e6..279744bb 100644
--- a/data/evaluatto/src/test/java/io/github/sadellie/evaluatto/FixLexiconTest.kt
+++ b/data/evaluatto/src/test/java/io/github/sadellie/evaluatto/FixLexiconTest.kt
@@ -18,7 +18,7 @@
 
 package io.github.sadellie.evaluatto
 
-import org.junit.jupiter.api.Test
+import org.junit.Test
 
 class FixLexiconTest {
 
diff --git a/data/evaluatto/src/test/java/io/github/sadellie/evaluatto/Helpers.kt b/data/evaluatto/src/test/java/io/github/sadellie/evaluatto/Helpers.kt
index 806c42e7..024eec3e 100644
--- a/data/evaluatto/src/test/java/io/github/sadellie/evaluatto/Helpers.kt
+++ b/data/evaluatto/src/test/java/io/github/sadellie/evaluatto/Helpers.kt
@@ -18,8 +18,8 @@
 
 package io.github.sadellie.evaluatto
 
-import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Assertions.assertThrows
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertThrows
 import java.math.BigDecimal
 import java.math.RoundingMode
 
diff --git a/data/evaluatto/src/test/java/io/github/sadellie/evaluatto/TokenizerTest.kt b/data/evaluatto/src/test/java/io/github/sadellie/evaluatto/TokenizerTest.kt
index 7f35b7ef..9ad2e5f1 100644
--- a/data/evaluatto/src/test/java/io/github/sadellie/evaluatto/TokenizerTest.kt
+++ b/data/evaluatto/src/test/java/io/github/sadellie/evaluatto/TokenizerTest.kt
@@ -18,7 +18,7 @@
 
 package io.github.sadellie.evaluatto
 
-import org.junit.jupiter.api.Test
+import org.junit.Test
 
 class TokenizerTest {
 
diff --git a/data/model/build.gradle.kts b/data/model/build.gradle.kts
index d6d0a1f5..7bc12002 100644
--- a/data/model/build.gradle.kts
+++ b/data/model/build.gradle.kts
@@ -25,6 +25,6 @@ android {
 }
 
 dependencies {
-    implementation(project(mapOf("path" to ":core:base")))
-    implementation(project(mapOf("path" to ":data:common")))
+    implementation(project(":core:base"))
+    implementation(project(":data:common"))
 }
\ No newline at end of file
diff --git a/data/model/src/main/java/com/sadellie/unitto/data/model/DefaultUnit.kt b/data/model/src/main/java/com/sadellie/unitto/data/model/DefaultUnit.kt
deleted file mode 100644
index b37a6e01..00000000
--- a/data/model/src/main/java/com/sadellie/unitto/data/model/DefaultUnit.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Unitto is a unit converter for Android
- * Copyright (c) 2022-2023 Elshan Agaev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.sadellie.unitto.data.model
-
-import androidx.annotation.StringRes
-import com.sadellie.unitto.core.base.MAX_PRECISION
-import com.sadellie.unitto.data.common.setMinimumRequiredScale
-import com.sadellie.unitto.data.common.trimZeros
-import java.math.BigDecimal
-
-/**
- * Default representation of a unit. Uses default conversion formula.
- *
- * @param displayName The string resource, i.e. kilometer
- * @param shortName The string resource for a short name, i.e. km
- * @param basicUnit One unit of this measurement in basic unit
- * @param group THe group this measurement belongs to
- */
-class DefaultUnit(
-    unitId: String,
-    basicUnit: BigDecimal,
-    group: UnitGroup,
-    @StringRes displayName: Int,
-    @StringRes shortName: Int,
-) : AbstractUnit(
-    unitId = unitId,
-    displayName = displayName,
-    shortName = shortName,
-    basicUnit = basicUnit,
-    group = group,
-) {
-    override fun convert(
-        unitTo: AbstractUnit,
-        value: BigDecimal,
-        scale: Int
-    ): BigDecimal {
-        // Avoid division by zero
-        if (unitTo.basicUnit.compareTo(BigDecimal.ZERO) == 0) return BigDecimal.ZERO
-
-        return this
-            .basicUnit
-            .setScale(MAX_PRECISION)
-            .multiply(value)
-            .div(unitTo.basicUnit)
-            .setMinimumRequiredScale(scale)
-            .trimZeros()
-    }
-}
diff --git a/data/model/src/main/java/com/sadellie/unitto/data/model/FlowRateUnit.kt b/data/model/src/main/java/com/sadellie/unitto/data/model/FlowRateUnit.kt
deleted file mode 100644
index 8ae610ce..00000000
--- a/data/model/src/main/java/com/sadellie/unitto/data/model/FlowRateUnit.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Unitto is a unit converter for Android
- * Copyright (c) 2023 Elshan Agaev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.sadellie.unitto.data.model
-
-import androidx.annotation.StringRes
-import com.sadellie.unitto.core.base.MAX_PRECISION
-import com.sadellie.unitto.data.common.setMinimumRequiredScale
-import com.sadellie.unitto.data.common.trimZeros
-import java.math.BigDecimal
-
-/**
- * Same as [DefaultUnit], but conversion formula is different.
- *
- * @see DefaultUnit
- */
-class FlowRateUnit(
-    unitId: String,
-    basicUnit: BigDecimal,
-    group: UnitGroup,
-    @StringRes displayName: Int,
-    @StringRes shortName: Int,
-) : AbstractUnit(
-    unitId = unitId,
-    displayName = displayName,
-    shortName = shortName,
-    basicUnit = basicUnit,
-    group = group,
-) {
-    override fun convert(
-        unitTo: AbstractUnit,
-        value: BigDecimal,
-        scale: Int
-    ): BigDecimal {
-        return unitTo.basicUnit
-            .setScale(MAX_PRECISION)
-            .div(this.basicUnit)
-            .multiply(value)
-            .setMinimumRequiredScale(scale)
-            .trimZeros()
-    }
-}
diff --git a/data/model/src/main/java/com/sadellie/unitto/data/model/UnitGroup.kt b/data/model/src/main/java/com/sadellie/unitto/data/model/UnitGroup.kt
index 9d90d44c..aaea287e 100644
--- a/data/model/src/main/java/com/sadellie/unitto/data/model/UnitGroup.kt
+++ b/data/model/src/main/java/com/sadellie/unitto/data/model/UnitGroup.kt
@@ -55,4 +55,5 @@ enum class UnitGroup(
     TORQUE(res = R.string.torque),
     FLOW_RATE(res = R.string.flow_rate),
     LUMINANCE(res = R.string.luminance),
+    FUEL_CONSUMPTION(res = R.string.fuel_consumption)
 }
diff --git a/data/model/src/main/java/com/sadellie/unitto/data/model/AbstractUnit.kt b/data/model/src/main/java/com/sadellie/unitto/data/model/unit/AbstractUnit.kt
similarity index 57%
rename from data/model/src/main/java/com/sadellie/unitto/data/model/AbstractUnit.kt
rename to data/model/src/main/java/com/sadellie/unitto/data/model/unit/AbstractUnit.kt
index 8ee9aae4..5a106148 100644
--- a/data/model/src/main/java/com/sadellie/unitto/data/model/AbstractUnit.kt
+++ b/data/model/src/main/java/com/sadellie/unitto/data/model/unit/AbstractUnit.kt
@@ -1,6 +1,6 @@
 /*
  * Unitto is a unit converter for Android
- * Copyright (c) 2022-2023 Elshan Agaev
+ * Copyright (c) 2023 Elshan Agaev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,71 +16,43 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.model
+package com.sadellie.unitto.data.model.unit
 
-import androidx.annotation.StringRes
+import android.content.Context
 import com.sadellie.unitto.data.common.lev
+import com.sadellie.unitto.data.model.UnitGroup
 import java.math.BigDecimal
 
-/**
- * This is a basic representation of what a unit must have (properties and convert function)
- *
- * @property unitId Unit ID from [MyUnitIDS]
- * @property displayName String resource with long name, i.e. kilometer
- * @property shortName String resource with short name, i.e. km
- * @property basicUnit Used for conversion. Basically tells how big this unit is if comparing with
- * basicUnit. For example, in [UnitGroup.LENGTH] basic unit is an attometer (1), then nanometer is
- * 1.0E+9 times bigger than that. This number (1.0E+9) is a basic unit for nanometer
- * @property group [UnitGroup] of this unit
- * @property renderedName Used as cache. Stores long name string for this specific device. Need for
- * search functionality.
- * @property renderedShortName Used as cache. Stores short name string for this specific device. Need for
- * search functionality.
- * @property isFavorite Whether this unit is favorite.
- * @property pairedUnit Latest paired unit on the right
- * @property counter The amount of time this unit was chosen
- */
-abstract class AbstractUnit(
-    val unitId: String,
-    @StringRes val displayName: Int,
-    @StringRes val shortName: Int,
-    var basicUnit: BigDecimal,
-    val group: UnitGroup,
-    var renderedName: String = String(),
-    var renderedShortName: String = String(),
-    var isFavorite: Boolean = false,
-    var pairedUnit: String? = null,
-    var counter: Int = 0
-) {
-    /**
-     * Convert this unit into another
-     *
-     * @param unitTo Unit we want to convert to (right side unit)
-     * @param value The amount to convert
-     * @param scale Which scale to use (number of decimal places)
-     * @return
-     */
-    abstract fun convert(
-        unitTo: AbstractUnit,
-        value: BigDecimal,
-        scale: Int
-    ): BigDecimal
+interface AbstractUnit {
+    val id: String
+    val basicUnit: BigDecimal
+    val group: UnitGroup
+    val displayName: Int
+    val shortName: Int
+    val isFavorite: Boolean
+    val pairId: String?
+    val counter: Int
+
+    fun clone(
+        id: String = this.id,
+        basicUnit: BigDecimal = this.basicUnit,
+        group: UnitGroup = this.group,
+        displayName: Int = this.displayName,
+        shortName: Int = this.shortName,
+        isFavorite: Boolean = this.isFavorite,
+        pairId: String? = this.pairId,
+        counter: Int = this.counter,
+    ): AbstractUnit
 }
 
-/**
- * Sorts sequence of units by Levenshtein distance
- *
- * @param stringA String for Levenshtein distance
- * @return Sorted sequence of units. Units with lower Levenshtein distance are higher
- */
-fun Sequence<AbstractUnit>.sortByLev(stringA: String): Sequence<AbstractUnit> {
+fun Sequence<AbstractUnit>.filterByLev(stringA: String, context: Context): Sequence<AbstractUnit> {
     val stringToCompare = stringA.trim().lowercase()
     // We don't need units where name is too different, half of the symbols is wrong in this situation
     val threshold: Int = stringToCompare.length / 2
     // List of pair: Unit and it's levDist
     val unitsWithDist = mutableListOf<Pair<AbstractUnit, Int>>()
     this.forEach { unit ->
-        val unitShortName: String = unit.renderedShortName.lowercase()
+        val unitShortName: String = context.getString(unit.shortName).lowercase()
         /**
          * There is a chance that we search for unit with a specific short name. Such cases are
          * should be higher in the list. Best possible match.
@@ -90,7 +62,7 @@ fun Sequence<AbstractUnit>.sortByLev(stringA: String): Sequence<AbstractUnit> {
             return@forEach
         }
 
-        val unitFullName: String = unit.renderedName.lowercase()
+        val unitFullName: String = context.getString(unit.displayName).lowercase()
 
         /**
          * There is chance that unit name doesn't need any edits (contains part of the query)
diff --git a/feature/epoch/build.gradle.kts b/data/model/src/main/java/com/sadellie/unitto/data/model/unit/DefaultUnit.kt
similarity index 73%
rename from feature/epoch/build.gradle.kts
rename to data/model/src/main/java/com/sadellie/unitto/data/model/unit/DefaultUnit.kt
index 97b943f0..359db5f6 100644
--- a/feature/epoch/build.gradle.kts
+++ b/data/model/src/main/java/com/sadellie/unitto/data/model/unit/DefaultUnit.kt
@@ -16,17 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-plugins {
-    id("unitto.library")
-    id("unitto.library.compose")
-    id("unitto.library.feature")
-    id("unitto.android.hilt")
-}
+package com.sadellie.unitto.data.model.unit
 
-android {
-    namespace = "com.sadellie.unitto.feature.epoch"
-}
+import java.math.BigDecimal
 
-dependencies {
-    implementation(project(mapOf("path" to ":data:epoch")))
-}
\ No newline at end of file
+interface DefaultUnit : AbstractUnit {
+    fun convert(unitTo: DefaultUnit, value: BigDecimal): BigDecimal
+}
diff --git a/data/model/src/main/java/com/sadellie/unitto/data/model/unit/FuelBackward.kt b/data/model/src/main/java/com/sadellie/unitto/data/model/unit/FuelBackward.kt
new file mode 100644
index 00000000..91c68396
--- /dev/null
+++ b/data/model/src/main/java/com/sadellie/unitto/data/model/unit/FuelBackward.kt
@@ -0,0 +1,76 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.data.model.unit
+
+import com.sadellie.unitto.core.base.MAX_PRECISION
+import com.sadellie.unitto.data.model.UnitGroup
+import java.math.BigDecimal
+import java.math.RoundingMode
+
+data class FuelBackward(
+    override val id: String,
+    override val basicUnit: BigDecimal,
+    override val group: UnitGroup,
+    override val displayName: Int,
+    override val shortName: Int,
+    override val isFavorite: Boolean = false,
+    override val pairId: String? = null,
+    override val counter: Int = 0,
+) : DefaultUnit {
+    override fun convert(unitTo: DefaultUnit, value: BigDecimal): BigDecimal {
+        // Avoid division by zero
+        if (unitTo.basicUnit.compareTo(BigDecimal.ZERO) == 0) return BigDecimal.ZERO
+
+        return when (unitTo) {
+            is FuelForward -> this
+                .basicUnit
+                .setScale(MAX_PRECISION, RoundingMode.HALF_EVEN)
+                .div(unitTo.basicUnit)
+                .div(value)
+
+            is FuelBackward -> unitTo
+                .basicUnit
+                .setScale(MAX_PRECISION, RoundingMode.HALF_EVEN)
+                .div(this.basicUnit)
+                .multiply(value)
+
+            else -> BigDecimal.ZERO
+        }
+    }
+
+    override fun clone(
+        id: String,
+        basicUnit: BigDecimal,
+        group: UnitGroup,
+        displayName: Int,
+        shortName: Int,
+        isFavorite: Boolean,
+        pairId: String?,
+        counter: Int,
+    ): FuelBackward = copy(
+        id = id,
+        basicUnit = basicUnit,
+        group = group,
+        displayName = displayName,
+        shortName = shortName,
+        isFavorite = isFavorite,
+        pairId = pairId,
+        counter = counter,
+    )
+}
diff --git a/data/model/src/main/java/com/sadellie/unitto/data/model/unit/FuelForward.kt b/data/model/src/main/java/com/sadellie/unitto/data/model/unit/FuelForward.kt
new file mode 100644
index 00000000..457ecaa9
--- /dev/null
+++ b/data/model/src/main/java/com/sadellie/unitto/data/model/unit/FuelForward.kt
@@ -0,0 +1,75 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.data.model.unit
+
+import com.sadellie.unitto.core.base.MAX_PRECISION
+import com.sadellie.unitto.data.model.UnitGroup
+import java.math.BigDecimal
+import java.math.RoundingMode
+
+data class FuelForward(
+    override val id: String,
+    override val basicUnit: BigDecimal,
+    override val group: UnitGroup,
+    override val displayName: Int,
+    override val shortName: Int,
+    override val isFavorite: Boolean = false,
+    override val pairId: String? = null,
+    override val counter: Int = 0,
+) : DefaultUnit {
+    override fun convert(unitTo: DefaultUnit, value: BigDecimal): BigDecimal {
+        // Avoid division by zero
+        if (unitTo.basicUnit.compareTo(BigDecimal.ZERO) == 0) return BigDecimal.ZERO
+
+        return when (unitTo) {
+            is FuelForward -> this
+                .basicUnit
+                .setScale(MAX_PRECISION, RoundingMode.HALF_EVEN)
+                .div(unitTo.basicUnit).multiply(value)
+
+            is FuelBackward -> unitTo
+                .basicUnit
+                .setScale(MAX_PRECISION, RoundingMode.HALF_EVEN)
+                .div(this.basicUnit)
+                .div(value)
+
+            else -> BigDecimal.ZERO
+        }
+    }
+
+    override fun clone(
+        id: String,
+        basicUnit: BigDecimal,
+        group: UnitGroup,
+        displayName: Int,
+        shortName: Int,
+        isFavorite: Boolean,
+        pairId: String?,
+        counter: Int,
+    ): FuelForward = copy(
+        id = id,
+        basicUnit = basicUnit,
+        group = group,
+        displayName = displayName,
+        shortName = shortName,
+        isFavorite = isFavorite,
+        pairId = pairId,
+        counter = counter,
+    )
+}
diff --git a/data/model/src/main/java/com/sadellie/unitto/data/model/unit/NormalUnit.kt b/data/model/src/main/java/com/sadellie/unitto/data/model/unit/NormalUnit.kt
new file mode 100644
index 00000000..5c4fa0e0
--- /dev/null
+++ b/data/model/src/main/java/com/sadellie/unitto/data/model/unit/NormalUnit.kt
@@ -0,0 +1,66 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.data.model.unit
+
+import com.sadellie.unitto.core.base.MAX_PRECISION
+import com.sadellie.unitto.data.model.UnitGroup
+import java.math.BigDecimal
+import java.math.RoundingMode
+
+data class NormalUnit(
+    override val id: String,
+    override val basicUnit: BigDecimal,
+    override val group: UnitGroup,
+    override val displayName: Int,
+    override val shortName: Int,
+    override val isFavorite: Boolean = false,
+    override val pairId: String? = null,
+    override val counter: Int = 0,
+) : DefaultUnit {
+    override fun convert(unitTo: DefaultUnit, value: BigDecimal): BigDecimal {
+        // Avoid division by zero
+        if (unitTo.basicUnit.compareTo(BigDecimal.ZERO) == 0) return BigDecimal.ZERO
+
+        return this
+            .basicUnit
+            .setScale(MAX_PRECISION, RoundingMode.HALF_EVEN)
+            .multiply(value)
+            .div(unitTo.basicUnit)
+    }
+
+    override fun clone(
+        id: String,
+        basicUnit: BigDecimal,
+        group: UnitGroup,
+        displayName: Int,
+        shortName: Int,
+        isFavorite: Boolean,
+        pairId: String?,
+        counter: Int,
+    ): NormalUnit = copy(
+        id = id,
+        basicUnit = basicUnit,
+        group = group,
+        displayName = displayName,
+        shortName = shortName,
+        isFavorite = isFavorite,
+        pairId = pairId,
+        counter = counter,
+    )
+}
diff --git a/data/model/src/main/java/com/sadellie/unitto/data/model/unit/NumberBaseUnit.kt b/data/model/src/main/java/com/sadellie/unitto/data/model/unit/NumberBaseUnit.kt
new file mode 100644
index 00000000..344f606f
--- /dev/null
+++ b/data/model/src/main/java/com/sadellie/unitto/data/model/unit/NumberBaseUnit.kt
@@ -0,0 +1,57 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.data.model.unit
+
+import com.sadellie.unitto.data.model.UnitGroup
+import java.math.BigDecimal
+
+data class NumberBaseUnit(
+    override val id: String,
+    override val basicUnit: BigDecimal,
+    override val group: UnitGroup,
+    override val displayName: Int,
+    override val shortName: Int,
+    override val isFavorite: Boolean = false,
+    override val pairId: String? = null,
+    override val counter: Int = 0,
+) : AbstractUnit {
+    fun convert(toBase: NumberBaseUnit, input: String): String {
+        return input.toBigInteger(basicUnit.intValueExact()).toString(toBase.basicUnit.intValueExact())
+    }
+
+    override fun clone(
+        id: String,
+        basicUnit: BigDecimal,
+        group: UnitGroup,
+        displayName: Int,
+        shortName: Int,
+        isFavorite: Boolean,
+        pairId: String?,
+        counter: Int,
+    ): NumberBaseUnit = copy(
+        id = id,
+        basicUnit = basicUnit,
+        group = group,
+        displayName = displayName,
+        shortName = shortName,
+        isFavorite = isFavorite,
+        pairId = pairId,
+        counter = counter,
+    )
+}
diff --git a/data/model/src/main/java/com/sadellie/unitto/data/model/unit/ReverseUnit.kt b/data/model/src/main/java/com/sadellie/unitto/data/model/unit/ReverseUnit.kt
new file mode 100644
index 00000000..74851bc6
--- /dev/null
+++ b/data/model/src/main/java/com/sadellie/unitto/data/model/unit/ReverseUnit.kt
@@ -0,0 +1,64 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.data.model.unit
+
+import com.sadellie.unitto.core.base.MAX_PRECISION
+import com.sadellie.unitto.data.model.UnitGroup
+import java.math.BigDecimal
+import java.math.RoundingMode
+
+data class ReverseUnit(
+    override val id: String,
+    override val basicUnit: BigDecimal,
+    override val group: UnitGroup,
+    override val displayName: Int,
+    override val shortName: Int,
+    override val isFavorite: Boolean = false,
+    override val pairId: String? = null,
+    override val counter: Int = 0,
+) : DefaultUnit {
+    override fun convert(unitTo: DefaultUnit, value: BigDecimal): BigDecimal {
+
+        return unitTo
+            .basicUnit
+            .setScale(MAX_PRECISION, RoundingMode.HALF_EVEN)
+            .div(this.basicUnit)
+            .multiply(value)
+    }
+
+    override fun clone(
+        id: String,
+        basicUnit: BigDecimal,
+        group: UnitGroup,
+        displayName: Int,
+        shortName: Int,
+        isFavorite: Boolean,
+        pairId: String?,
+        counter: Int,
+    ): ReverseUnit = copy(
+        id = id,
+        basicUnit = basicUnit,
+        group = group,
+        displayName = displayName,
+        shortName = shortName,
+        isFavorite = isFavorite,
+        pairId = pairId,
+        counter = counter,
+    )
+}
diff --git a/data/model/src/main/java/com/sadellie/unitto/data/model/unit/TemperatureUnit.kt b/data/model/src/main/java/com/sadellie/unitto/data/model/unit/TemperatureUnit.kt
new file mode 100644
index 00000000..b5944407
--- /dev/null
+++ b/data/model/src/main/java/com/sadellie/unitto/data/model/unit/TemperatureUnit.kt
@@ -0,0 +1,56 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.data.model.unit
+
+import com.sadellie.unitto.data.model.UnitGroup
+import java.math.BigDecimal
+
+data class TemperatureUnit(
+    override val id: String,
+    override val basicUnit: BigDecimal,
+    override val group: UnitGroup,
+    override val displayName: Int,
+    override val shortName: Int,
+    override val isFavorite: Boolean = false,
+    override val pairId: String? = null,
+    override val counter: Int = 0,
+    val customConvert: (unitTo: DefaultUnit, value: BigDecimal) -> BigDecimal
+): DefaultUnit {
+    override fun convert(unitTo: DefaultUnit, value: BigDecimal): BigDecimal = customConvert(unitTo, value)
+
+    override fun clone(
+        id: String,
+        basicUnit: BigDecimal,
+        group: UnitGroup,
+        displayName: Int,
+        shortName: Int,
+        isFavorite: Boolean,
+        pairId: String?,
+        counter: Int,
+    ): TemperatureUnit = copy(
+        id = id,
+        basicUnit = basicUnit,
+        group = group,
+        displayName = displayName,
+        shortName = shortName,
+        isFavorite = isFavorite,
+        pairId = pairId,
+        counter = counter,
+    )
+}
diff --git a/data/timezone/build.gradle.kts b/data/timezone/build.gradle.kts
index 8a98d783..4de5b10c 100644
--- a/data/timezone/build.gradle.kts
+++ b/data/timezone/build.gradle.kts
@@ -26,8 +26,8 @@ android {
 }
 
 dependencies {
-    implementation(project(mapOf("path" to ":core:base")))
-    implementation(project(mapOf("path" to ":data:common")))
-    implementation(project(mapOf("path" to ":data:model")))
-    implementation(project(mapOf("path" to ":data:database")))
+    implementation(project(":core:base"))
+    implementation(project(":data:common"))
+    implementation(project(":data:model"))
+    implementation(project(":data:database"))
 }
diff --git a/data/units/build.gradle.kts b/data/units/build.gradle.kts
index df73e349..65bd474d 100644
--- a/data/units/build.gradle.kts
+++ b/data/units/build.gradle.kts
@@ -19,26 +19,33 @@
 plugins {
     id("unitto.library")
     id("unitto.android.hilt")
+    id("unitto.room")
 }
 
 android {
     namespace = "com.sadellie.unitto.data.units"
+
+    testOptions.unitTests.isIncludeAndroidResources = true
+
+    room {
+        val schemaLocation = "$projectDir/schemas"
+        schemaDirectory(schemaLocation)
+        println("Exported Database schema to $schemaLocation")
+    }
 }
 
 dependencies {
-    testImplementation(libs.junit)
+    testImplementation(libs.junit.junit)
+    testImplementation(libs.org.robolectric.robolectric)
 
-    implementation(libs.androidx.lifecycle.runtime.compose)
-    implementation(libs.androidx.datastore)
+    implementation(libs.androidx.lifecycle.lifecycle.runtime.compose)
+    implementation(libs.androidx.datastore.datastore.preferences)
 
-    implementation(libs.com.squareup.moshi)
-    implementation(libs.com.squareup.retrofit2)
+    implementation(libs.com.squareup.moshi.moshi.kotlin)
+    implementation(libs.com.squareup.retrofit2.converter.moshi)
 
-    implementation(libs.org.burnoutcrew.composereorderable)
-    implementation(libs.com.github.sadellie.themmo)
-
-    implementation(project(mapOf("path" to ":core:base")))
-    implementation(project(mapOf("path" to ":data:database")))
-    implementation(project(mapOf("path" to ":data:common")))
-    implementation(project(mapOf("path" to ":data:model")))
+    implementation(project(":core:base"))
+    implementation(project(":data:database"))
+    implementation(project(":data:common"))
+    implementation(project(":data:model"))
 }
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/AllUnitsRepository.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/AllUnitsRepository.kt
deleted file mode 100644
index 4680e432..00000000
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/AllUnitsRepository.kt
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Unitto is a unit converter for Android
- * Copyright (c) 2022-2023 Elshan Agaev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.sadellie.unitto.data.units
-
-import android.content.Context
-import com.sadellie.unitto.core.base.MAX_PRECISION
-import com.sadellie.unitto.data.database.UnitsEntity
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.UnitGroup
-import com.sadellie.unitto.data.model.UnitsListSorting
-import com.sadellie.unitto.data.model.sortByLev
-import com.sadellie.unitto.data.units.collections.accelerationCollection
-import com.sadellie.unitto.data.units.collections.angleCollection
-import com.sadellie.unitto.data.units.collections.areaCollection
-import com.sadellie.unitto.data.units.collections.currencyCollection
-import com.sadellie.unitto.data.units.collections.dataCollection
-import com.sadellie.unitto.data.units.collections.dataTransferCollection
-import com.sadellie.unitto.data.units.collections.electrostaticCapacitance
-import com.sadellie.unitto.data.units.collections.energyCollection
-import com.sadellie.unitto.data.units.collections.flowRateCollection
-import com.sadellie.unitto.data.units.collections.fluxCollection
-import com.sadellie.unitto.data.units.collections.forceCollection
-import com.sadellie.unitto.data.units.collections.lengthCollection
-import com.sadellie.unitto.data.units.collections.luminanceCollection
-import com.sadellie.unitto.data.units.collections.massCollection
-import com.sadellie.unitto.data.units.collections.numberBaseCollection
-import com.sadellie.unitto.data.units.collections.powerCollection
-import com.sadellie.unitto.data.units.collections.prefixCollection
-import com.sadellie.unitto.data.units.collections.pressureCollection
-import com.sadellie.unitto.data.units.collections.speedCollection
-import com.sadellie.unitto.data.units.collections.temperatureCollection
-import com.sadellie.unitto.data.units.collections.timeCollection
-import com.sadellie.unitto.data.units.collections.torqueCollection
-import com.sadellie.unitto.data.units.collections.volumeCollection
-import com.sadellie.unitto.data.units.remote.CurrencyApi
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import java.math.BigDecimal
-import javax.inject.Inject
-import javax.inject.Singleton
-
-/**
- * This repository provides access to all collection of units in the app.
- */
-@Singleton
-class AllUnitsRepository @Inject constructor() {
-    /**
-     * This is a collection of all available units.
-     */
-    private val allUnits: List<AbstractUnit> by lazy {
-        mapOfCollections.values.flatten()
-    }
-
-    /**
-     * Mapped [UnitGroup] to [List] of [AbstractUnit]s.
-     */
-    private val mapOfCollections by lazy {
-        hashMapOf(
-            UnitGroup.LENGTH to lengthCollection,
-            UnitGroup.CURRENCY to currencyCollection,
-            UnitGroup.MASS to massCollection,
-            UnitGroup.SPEED to speedCollection,
-            UnitGroup.TEMPERATURE to temperatureCollection,
-            UnitGroup.AREA to areaCollection,
-            UnitGroup.TIME to timeCollection,
-            UnitGroup.VOLUME to volumeCollection,
-            UnitGroup.DATA to dataCollection,
-            UnitGroup.PRESSURE to pressureCollection,
-            UnitGroup.ACCELERATION to accelerationCollection,
-            UnitGroup.ENERGY to energyCollection,
-            UnitGroup.POWER to powerCollection,
-            UnitGroup.ANGLE to angleCollection,
-            UnitGroup.DATA_TRANSFER to dataTransferCollection,
-            UnitGroup.FLUX to fluxCollection,
-            UnitGroup.NUMBER_BASE to numberBaseCollection,
-            UnitGroup.ELECTROSTATIC_CAPACITANCE to electrostaticCapacitance,
-            UnitGroup.PREFIX to prefixCollection,
-            UnitGroup.FORCE to forceCollection,
-            UnitGroup.TORQUE to torqueCollection,
-            UnitGroup.FLOW_RATE to flowRateCollection,
-            UnitGroup.LUMINANCE to luminanceCollection,
-        )
-    }
-
-    /**
-     * Get [AbstractUnit] by specified id from [MyUnitIDS].
-     *
-     * @param unitId Unit id from [MyUnitIDS]. Don't use literal strings here.
-     * @return [AbstractUnit] from [AllUnitsRepository.allUnits] that has the given id.
-     * @throws NoSuchElementException If there is no [AbstractUnit] in [AllUnitsRepository.allUnits]
-     * that has the requested unitId.
-     */
-    fun getById(unitId: String): AbstractUnit {
-        return allUnits.first { it.unitId == unitId }
-    }
-
-    /**
-     * Looks for a collection of units of the given [UnitGroup].
-     *
-     * @param unitGroup Requested [UnitGroup]
-     * @return List of [AbstractUnit]s. Will return null if the is no collection for the specified
-     * [UnitGroup].
-     *
-     * @throws [NoSuchElementException] from [Map.getValue]
-     */
-    fun getCollectionByGroup(unitGroup: UnitGroup): List<AbstractUnit> {
-        return mapOfCollections.getValue(unitGroup)
-    }
-
-    /**
-     * Filter [AllUnitsRepository.allUnits] and group them.
-     *
-     * @param hideBrokenUnits When set to True will remove [AbstractUnit]s that have
-     * [AbstractUnit.basicUnit] set to [BigDecimal.ZERO] (comes from currencies API).
-     * @param chosenUnitGroup If provided will scope list to a specific [UnitGroup].
-     * @param favoritesOnly When True will filter only [AbstractUnit]s with [AbstractUnit.isFavorite]
-     * set to True.
-     * @param searchQuery When not empty, will search by [AbstractUnit.renderedName] using [sortByLev].
-     * @param allUnitsGroups All [UnitGroup]s. Determines which units will be used for filtering.
-     * @param sorting Sorting mode from [UnitsListSorting]
-     *
-     * @return Grouped by [UnitGroup] list of [AbstractUnit]s.
-     */
-    fun filterUnits(
-        hideBrokenUnits: Boolean,
-        chosenUnitGroup: UnitGroup?,
-        favoritesOnly: Boolean,
-        searchQuery: String,
-        allUnitsGroups: List<UnitGroup>,
-        sorting: UnitsListSorting = UnitsListSorting.USAGE
-    ): Map<UnitGroup, List<AbstractUnit>> {
-        // Leave only shown unit groups
-        var units: Sequence<AbstractUnit> = if (chosenUnitGroup == null) {
-            allUnits.filter { it.group in allUnitsGroups }
-        } else {
-            val collection = getCollectionByGroup(chosenUnitGroup)
-            collection
-        }.asSequence()
-
-        if (favoritesOnly) {
-            units = units.filter { it.isFavorite }
-        }
-        if (hideBrokenUnits) {
-            units = units.filter { it.basicUnit > BigDecimal.ZERO }
-        }
-
-        units = when (sorting) {
-            UnitsListSorting.USAGE -> units.sortedByDescending { it.counter }
-            UnitsListSorting.ALPHABETICAL -> units.sortedBy { it.renderedName }
-            UnitsListSorting.SCALE_ASC -> units.sortedBy { it.basicUnit }
-            UnitsListSorting.SCALE_DESC -> units.sortedByDescending { it.basicUnit }
-        }
-
-        units = if (searchQuery.isEmpty()) {
-            units.sortedByDescending { it.isFavorite }
-        } else {
-            // For search we sort by popularity and Levenshtein distance (short and long name).
-            units.sortByLev(searchQuery)
-        }
-
-        return units.groupBy { it.group }
-    }
-
-    /**
-     * Maps data from database to [allUnits] item: favorites, counters, renderedNames and etc.
-     *
-     * @param context [Context] that is used to fill [AbstractUnit.renderedName]. Rendered names are used when
-     * searching.
-     * @param allUnits List from database. See: [UnitsEntity].
-     */
-    fun loadFromDatabase(context: Context, allUnits: List<UnitsEntity>) {
-        this.allUnits.forEach {
-            // Loading unit names so that we can search through them
-            it.renderedName = context.getString(it.displayName)
-            it.renderedShortName = context.getString(it.shortName)
-            val fromDb = allUnits.firstOrNull { fromDb -> fromDb.unitId == it.unitId }
-            // Loading paired units
-            it.pairedUnit = fromDb?.pairedUnitId
-            // Loading favorite state
-            it.isFavorite = fromDb?.isFavorite ?: false
-            it.counter = fromDb?.frequency ?: 0
-        }
-    }
-
-    /**
-     * Update [AbstractUnit.basicUnit] properties for currencies from [currencyCollection].
-     *
-     * @param unitFrom Base unit
-     */
-    suspend fun updateBasicUnitsForCurrencies(
-        unitFrom: AbstractUnit
-    ) = withContext(Dispatchers.IO) {
-        val conversions: Map<String, BigDecimal> = CurrencyApi.retrofitService.getCurrencyPairs(unitFrom.unitId).currency
-        getCollectionByGroup(UnitGroup.CURRENCY).forEach {
-            // Getting rates from map. We set ZERO as default so that it can be skipped
-            val rate = conversions.getOrElse(it.unitId) { BigDecimal.ZERO }
-            // We make sure that we don't divide by zero
-            if (rate > BigDecimal.ZERO) {
-                it.basicUnit = BigDecimal.ONE.setScale(MAX_PRECISION).div(rate)
-            } else {
-                it.basicUnit = BigDecimal.ZERO
-            }
-        }
-    }
-}
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/FlowUtils.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/FlowUtils.kt
deleted file mode 100644
index 83f5f89f..00000000
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/FlowUtils.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Unitto is a unit converter for Android
- * Copyright (c) 2022 Elshan Agaev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.sadellie.unitto.data.units
-
-import kotlinx.coroutines.flow.Flow
-
-@Suppress("UNCHECKED_CAST")
-fun <T1, T2, T3, T4, T5, T6, T7, T8, R> combine(
-    flow: Flow<T1>,
-    flow2: Flow<T2>,
-    flow3: Flow<T3>,
-    flow4: Flow<T4>,
-    flow5: Flow<T5>,
-    flow6: Flow<T6>,
-    flow7: Flow<T7>,
-    flow8: Flow<T8>,
-    transform: suspend (T1, T2, T3, T4, T5, T6, T7, T8) -> R
-): Flow<R> =
-    kotlinx.coroutines.flow.combine(flow, flow2, flow3, flow4, flow5, flow6, flow7, flow8) { args: Array<*> ->
-        transform(
-            args[0] as T1,
-            args[1] as T2,
-            args[2] as T3,
-            args[3] as T4,
-            args[4] as T5,
-            args[5] as T6,
-            args[6] as T7,
-            args[7] as T8,
-        )
-    }
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/MyUnitIDS.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/MyUnitIDS.kt
index eaeafbc7..f2f3f428 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/MyUnitIDS.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/MyUnitIDS.kt
@@ -642,4 +642,16 @@ object MyUnitIDS {
     const val blondel = "blondel"
     const val bril = "bril"
     const val skot = "skot"
+
+    // FUEL
+    const val kilometer_per_liter = "kilometer_per_liter"
+    const val liter_per_kilometer = "liter_per_kilometer"
+    const val liter_per_100_kilometer = "liter_per_100_kilometer"
+    const val mile_per_gallon_uk = "mile_per_gallon_uk"
+    const val mile_per_gallon_us = "mile_per_gallon_us"
+    const val mile_us_per_liter = "mile_us_per_liter"
+    const val gallon_us_per_mile = "gallon_us_per_mile"
+    const val gallon_uk_per_mile = "gallon_uk_per_mile"
+    const val gallon_us_per_100_mile = "gallon_us_per_100_mile"
+    const val gallon_uk_per_100_mile = "gallon_uk_per_100_mile"
 }
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/UnitsRepository.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/UnitsRepository.kt
new file mode 100644
index 00000000..af571078
--- /dev/null
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/UnitsRepository.kt
@@ -0,0 +1,291 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2022-2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.data.units
+
+import android.content.Context
+import android.util.Log
+import com.sadellie.unitto.data.database.CurrencyRatesDao
+import com.sadellie.unitto.data.database.CurrencyRatesEntity
+import com.sadellie.unitto.data.database.UnitsDao
+import com.sadellie.unitto.data.database.UnitsEntity
+import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.UnitsListSorting
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.ReverseUnit
+import com.sadellie.unitto.data.model.unit.filterByLev
+import com.sadellie.unitto.data.units.collections.accelerationCollection
+import com.sadellie.unitto.data.units.collections.angleCollection
+import com.sadellie.unitto.data.units.collections.areaCollection
+import com.sadellie.unitto.data.units.collections.currencyCollection
+import com.sadellie.unitto.data.units.collections.dataCollection
+import com.sadellie.unitto.data.units.collections.dataTransferCollection
+import com.sadellie.unitto.data.units.collections.electrostaticCapacitance
+import com.sadellie.unitto.data.units.collections.energyCollection
+import com.sadellie.unitto.data.units.collections.flowRateCollection
+import com.sadellie.unitto.data.units.collections.fluxCollection
+import com.sadellie.unitto.data.units.collections.forceCollection
+import com.sadellie.unitto.data.units.collections.fuelConsumptionCollection
+import com.sadellie.unitto.data.units.collections.lengthCollection
+import com.sadellie.unitto.data.units.collections.luminanceCollection
+import com.sadellie.unitto.data.units.collections.massCollection
+import com.sadellie.unitto.data.units.collections.numberBaseCollection
+import com.sadellie.unitto.data.units.collections.powerCollection
+import com.sadellie.unitto.data.units.collections.prefixCollection
+import com.sadellie.unitto.data.units.collections.pressureCollection
+import com.sadellie.unitto.data.units.collections.speedCollection
+import com.sadellie.unitto.data.units.collections.temperatureCollection
+import com.sadellie.unitto.data.units.collections.timeCollection
+import com.sadellie.unitto.data.units.collections.torqueCollection
+import com.sadellie.unitto.data.units.collections.volumeCollection
+import com.sadellie.unitto.data.units.remote.CurrencyApi
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.mapLatest
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.withContext
+import java.math.BigDecimal
+import java.time.LocalDate
+import javax.inject.Inject
+
+class UnitsRepository @Inject constructor(
+    private val unitsDao: UnitsDao,
+    private val currencyRatesDao: CurrencyRatesDao,
+    @ApplicationContext private val mContext: Context,
+) {
+    private val myUnits = MutableStateFlow(
+        lengthCollection +
+                currencyCollection +
+                massCollection +
+                speedCollection +
+                temperatureCollection +
+                areaCollection +
+                timeCollection +
+                volumeCollection +
+                dataCollection +
+                pressureCollection +
+                accelerationCollection +
+                energyCollection +
+                powerCollection +
+                angleCollection +
+                dataTransferCollection +
+                fluxCollection +
+                numberBaseCollection +
+                electrostaticCapacitance +
+                prefixCollection +
+                forceCollection +
+                torqueCollection +
+                flowRateCollection +
+                luminanceCollection +
+                fuelConsumptionCollection
+    )
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val allUnits = combine(
+        unitsDao.getAllFlow(),
+        myUnits
+    ) { based, _ ->
+        based
+    }
+        .mapLatest { basedList ->
+            basedList.forEach { based ->
+                // Have to use a copy so that composable can detect changes
+                val updatedUnit = getById(based.unitId)
+                    .clone(
+                        isFavorite = based.isFavorite,
+                        counter = based.frequency,
+                        pairId = based.pairedUnitId
+                    )
+
+                myUnits.update { units ->
+                    units.replace(updatedUnit) { it.id == updatedUnit.id }
+                }
+            }
+            myUnits
+        }
+        .flowOn(Dispatchers.IO)
+
+    fun getById(id: String): AbstractUnit {
+        return myUnits.value.first { it.id == id }
+    }
+
+    fun getCollection(group: UnitGroup): List<AbstractUnit> {
+        return myUnits.value.filter { it.group == group }
+    }
+
+    suspend fun favorite(unit: AbstractUnit) = withContext(Dispatchers.IO) {
+        val basedUnit = unitsDao.getById(unit.id)
+
+        if (basedUnit == null) {
+            unitsDao.insertUnit(
+                UnitsEntity(
+                    unitId = unit.id,
+                    isFavorite = true
+                )
+            )
+        } else {
+            unitsDao.insertUnit(
+                UnitsEntity(
+                    unitId = basedUnit.unitId,
+                    isFavorite = !basedUnit.isFavorite,
+                    pairedUnitId = basedUnit.pairedUnitId,
+                    frequency = basedUnit.frequency
+                )
+            )
+        }
+    }
+
+    suspend fun incrementCounter(unit: AbstractUnit) = withContext(Dispatchers.IO) {
+        val basedUnit = unitsDao.getById(unit.id)
+
+        if (basedUnit == null) {
+            unitsDao.insertUnit(
+                UnitsEntity(
+                    unitId = unit.id,
+                    frequency = 1
+                )
+            )
+        } else {
+            unitsDao.insertUnit(
+                UnitsEntity(
+                    unitId = basedUnit.unitId,
+                    isFavorite = basedUnit.isFavorite,
+                    pairedUnitId = basedUnit.pairedUnitId,
+                    frequency = basedUnit.frequency + 1
+                )
+            )
+        }
+    }
+
+    suspend fun setPair(unit: AbstractUnit, pair: AbstractUnit) = withContext(Dispatchers.IO) {
+        val basedUnit = unitsDao.getById(unit.id)
+
+        if (basedUnit == null) {
+            unitsDao.insertUnit(
+                UnitsEntity(
+                    unitId = unit.id,
+                    pairedUnitId = pair.id
+                )
+            )
+        } else {
+            unitsDao.insertUnit(
+                UnitsEntity(
+                    unitId = basedUnit.unitId,
+                    isFavorite = basedUnit.isFavorite,
+                    pairedUnitId = pair.id,
+                    frequency = basedUnit.frequency
+                )
+            )
+        }
+    }
+
+    suspend fun updateRates(unit: AbstractUnit): LocalDate? = withContext(Dispatchers.IO) {
+        var basedConversions = currencyRatesDao.getLatestRates(baseId = unit.id)
+        val epochDay = LocalDate.now().toEpochDay()
+
+        if (basedConversions.firstOrNull()?.date != epochDay) {
+            try {
+                val conversions = CurrencyApi.service.getCurrencyPairs(unit.id)
+                val rates = conversions.currency
+                    .map { (pairId, pairValue) ->
+                        CurrencyRatesEntity(
+                            baseUnitId = unit.id,
+                            date = epochDay,
+                            pairUnitId = pairId,
+                            pairUnitValue = BigDecimal.valueOf(pairValue)
+                        )
+                    }
+                currencyRatesDao.insertRates(rates)
+
+                basedConversions = currencyRatesDao.getLatestRates(baseId = unit.id)
+            } catch (e: Exception) {
+                Log.d("UnitsRepository", "Skipped update: $e")
+            }
+        }
+        myUnits.update { units ->
+            units.map { localUnit ->
+                if (localUnit.group != UnitGroup.CURRENCY) return@map localUnit
+                if (localUnit !is ReverseUnit) return@map localUnit
+
+                val rate = basedConversions
+                    .firstOrNull { localUnit.id == it.pairUnitId }
+                    ?.pairUnitValue ?: BigDecimal.ZERO
+
+                return@map if (rate > BigDecimal.ZERO) {
+                    localUnit.copy(basicUnit = rate)
+                } else {
+                    localUnit.copy(basicUnit = BigDecimal.ZERO)
+                }
+            }
+        }
+
+        return@withContext basedConversions
+            .firstOrNull()
+            ?.date
+            ?.let { LocalDate.ofEpochDay(it) }
+    }
+
+    fun filterUnits(
+        query: String,
+        unitGroup: UnitGroup?,
+        favoritesOnly: Boolean,
+        hideBrokenUnits: Boolean,
+        sorting: UnitsListSorting,
+        shownUnitGroups: List<UnitGroup> = emptyList(),
+    ): Map<UnitGroup, List<AbstractUnit>> {
+        // Leave only shown unit groups
+        var units: Sequence<AbstractUnit> = if (unitGroup == null) {
+            myUnits.value.filter { it.group in shownUnitGroups }
+        } else {
+            getCollection(unitGroup)
+        }.asSequence()
+
+        if (favoritesOnly) {
+            units = units.filter { it.isFavorite }
+        }
+        if (hideBrokenUnits) {
+            units = units.filter { it.basicUnit > BigDecimal.ZERO }
+        }
+
+        units = when (sorting) {
+            UnitsListSorting.USAGE -> units.sortedByDescending { it.counter }
+            UnitsListSorting.ALPHABETICAL -> units.sortedBy { mContext.getString(it.displayName) }
+            UnitsListSorting.SCALE_ASC -> units.sortedBy { it.basicUnit }
+            UnitsListSorting.SCALE_DESC -> units.sortedByDescending { it.basicUnit }
+            else -> units
+        }
+
+        units = if (query.isEmpty()) {
+            units.sortedByDescending { it.isFavorite }
+        } else {
+            // For search we sort by popularity and Levenshtein distance (short and long name).
+            units.filterByLev(query, mContext)
+        }
+        return units.groupBy { it.group }
+    }
+
+    private fun <T> List<T>.replace(newValue: T, block: (T) -> Boolean): List<T> {
+        return map {
+            if (block(it)) newValue else it
+        }
+    }
+}
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Acceleration.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Acceleration.kt
index eb79cde7..c8feeef1 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Acceleration.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Acceleration.kt
@@ -19,35 +19,35 @@
 package com.sadellie.unitto.data.units.collections
 
 import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.DefaultUnit
 import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.NormalUnit
 import com.sadellie.unitto.data.units.MyUnitIDS
 import java.math.BigDecimal
 
 internal val accelerationCollection: List<AbstractUnit> by lazy {
     listOf(
-        DefaultUnit(MyUnitIDS.attometer_per_square_second,  BigDecimal.valueOf(1),           UnitGroup.ACCELERATION, R.string.attometer_per_square_second,  R.string.attometer_per_square_second_short),
-        DefaultUnit(MyUnitIDS.femtometer_per_square_second, BigDecimal.valueOf(1E+3),        UnitGroup.ACCELERATION, R.string.femtometer_per_square_second, R.string.femtometer_per_square_second_short),
-        DefaultUnit(MyUnitIDS.picometer_per_square_second,  BigDecimal.valueOf(1E+6),        UnitGroup.ACCELERATION, R.string.picometer_per_square_second,  R.string.picometer_per_square_second_short),
-        DefaultUnit(MyUnitIDS.nanometer_per_square_second,  BigDecimal.valueOf(1E+9),        UnitGroup.ACCELERATION, R.string.nanometer_per_square_second,  R.string.nanometer_per_square_second_short),
-        DefaultUnit(MyUnitIDS.micrometer_per_square_second, BigDecimal.valueOf(1E+12),       UnitGroup.ACCELERATION, R.string.micrometer_per_square_second, R.string.micrometer_per_square_second_short),
-        DefaultUnit(MyUnitIDS.millimeter_per_square_second, BigDecimal.valueOf(1E+15),       UnitGroup.ACCELERATION, R.string.millimeter_per_square_second, R.string.millimeter_per_square_second_short),
-        DefaultUnit(MyUnitIDS.centimeter_per_square_second, BigDecimal.valueOf(1E+16),       UnitGroup.ACCELERATION, R.string.centimeter_per_square_second, R.string.centimeter_per_square_second_short),
-        DefaultUnit(MyUnitIDS.decimeter_per_square_second,  BigDecimal.valueOf(1E+17),       UnitGroup.ACCELERATION, R.string.decimeter_per_square_second,  R.string.decimeter_per_square_second_short),
-        DefaultUnit(MyUnitIDS.meter_per_square_second,      BigDecimal.valueOf(1E+18),       UnitGroup.ACCELERATION, R.string.meter_per_square_second,      R.string.meter_per_square_second_short),
-        DefaultUnit(MyUnitIDS.kilometer_per_square_second,  BigDecimal.valueOf(1E+21),       UnitGroup.ACCELERATION, R.string.kilometer_per_square_second,  R.string.kilometer_per_square_second_short),
-        DefaultUnit(MyUnitIDS.dekameter_per_square_second,  BigDecimal.valueOf(1E+19),       UnitGroup.ACCELERATION, R.string.dekameter_per_square_second,  R.string.dekameter_per_square_second_short),
-        DefaultUnit(MyUnitIDS.hectometer_per_square_second, BigDecimal.valueOf(1E+20),       UnitGroup.ACCELERATION, R.string.hectometer_per_square_second, R.string.hectometer_per_square_second_short),
-        DefaultUnit(MyUnitIDS.gal,                          BigDecimal.valueOf(1E+16),       UnitGroup.ACCELERATION, R.string.gal,                          R.string.gal_short),
-        DefaultUnit(MyUnitIDS.mercury_surface_gravity,      BigDecimal.valueOf(3.7E+18),     UnitGroup.ACCELERATION, R.string.mercury_surface_gravity,      R.string.mercury_surface_gravity_short),
-        DefaultUnit(MyUnitIDS.venus_surface_gravity,        BigDecimal.valueOf(8.87E+18),    UnitGroup.ACCELERATION, R.string.venus_surface_gravity,        R.string.venus_surface_gravity_short),
-        DefaultUnit(MyUnitIDS.earth_surface_gravity,        BigDecimal.valueOf(9.80655E+18), UnitGroup.ACCELERATION, R.string.earth_surface_gravity,        R.string.earth_surface_gravity_short),
-        DefaultUnit(MyUnitIDS.mars_surface_gravity,         BigDecimal.valueOf(3.71E+18),    UnitGroup.ACCELERATION, R.string.mars_surface_gravity,         R.string.mars_surface_gravity_short),
-        DefaultUnit(MyUnitIDS.jupiter_surface_gravity,      BigDecimal.valueOf(2.479E+19),   UnitGroup.ACCELERATION, R.string.jupiter_surface_gravity,      R.string.jupiter_surface_gravity_short),
-        DefaultUnit(MyUnitIDS.saturn_surface_gravity,       BigDecimal.valueOf(1.044E+19),   UnitGroup.ACCELERATION, R.string.saturn_surface_gravity,       R.string.saturn_surface_gravity_short),
-        DefaultUnit(MyUnitIDS.uranus_surface_gravity,       BigDecimal.valueOf(8.87E+18),    UnitGroup.ACCELERATION, R.string.uranus_surface_gravity,       R.string.uranus_surface_gravity_short),
-        DefaultUnit(MyUnitIDS.neptune_surface_gravity,      BigDecimal.valueOf(1.115E+19),   UnitGroup.ACCELERATION, R.string.neptune_surface_gravity,      R.string.neptune_surface_gravity_short),
-        DefaultUnit(MyUnitIDS.sun_surface_gravity,          BigDecimal.valueOf(2.74E+20),    UnitGroup.ACCELERATION, R.string.sun_surface_gravity,          R.string.sun_surface_gravity_short),
+        NormalUnit(MyUnitIDS.attometer_per_square_second,  BigDecimal.valueOf(1),           UnitGroup.ACCELERATION, R.string.attometer_per_square_second,  R.string.attometer_per_square_second_short),
+        NormalUnit(MyUnitIDS.femtometer_per_square_second, BigDecimal.valueOf(1E+3),        UnitGroup.ACCELERATION, R.string.femtometer_per_square_second, R.string.femtometer_per_square_second_short),
+        NormalUnit(MyUnitIDS.picometer_per_square_second,  BigDecimal.valueOf(1E+6),        UnitGroup.ACCELERATION, R.string.picometer_per_square_second,  R.string.picometer_per_square_second_short),
+        NormalUnit(MyUnitIDS.nanometer_per_square_second,  BigDecimal.valueOf(1E+9),        UnitGroup.ACCELERATION, R.string.nanometer_per_square_second,  R.string.nanometer_per_square_second_short),
+        NormalUnit(MyUnitIDS.micrometer_per_square_second, BigDecimal.valueOf(1E+12),       UnitGroup.ACCELERATION, R.string.micrometer_per_square_second, R.string.micrometer_per_square_second_short),
+        NormalUnit(MyUnitIDS.millimeter_per_square_second, BigDecimal.valueOf(1E+15),       UnitGroup.ACCELERATION, R.string.millimeter_per_square_second, R.string.millimeter_per_square_second_short),
+        NormalUnit(MyUnitIDS.centimeter_per_square_second, BigDecimal.valueOf(1E+16),       UnitGroup.ACCELERATION, R.string.centimeter_per_square_second, R.string.centimeter_per_square_second_short),
+        NormalUnit(MyUnitIDS.decimeter_per_square_second,  BigDecimal.valueOf(1E+17),       UnitGroup.ACCELERATION, R.string.decimeter_per_square_second,  R.string.decimeter_per_square_second_short),
+        NormalUnit(MyUnitIDS.meter_per_square_second,      BigDecimal.valueOf(1E+18),       UnitGroup.ACCELERATION, R.string.meter_per_square_second,      R.string.meter_per_square_second_short),
+        NormalUnit(MyUnitIDS.kilometer_per_square_second,  BigDecimal.valueOf(1E+21),       UnitGroup.ACCELERATION, R.string.kilometer_per_square_second,  R.string.kilometer_per_square_second_short),
+        NormalUnit(MyUnitIDS.dekameter_per_square_second,  BigDecimal.valueOf(1E+19),       UnitGroup.ACCELERATION, R.string.dekameter_per_square_second,  R.string.dekameter_per_square_second_short),
+        NormalUnit(MyUnitIDS.hectometer_per_square_second, BigDecimal.valueOf(1E+20),       UnitGroup.ACCELERATION, R.string.hectometer_per_square_second, R.string.hectometer_per_square_second_short),
+        NormalUnit(MyUnitIDS.gal,                          BigDecimal.valueOf(1E+16),       UnitGroup.ACCELERATION, R.string.gal,                          R.string.gal_short),
+        NormalUnit(MyUnitIDS.mercury_surface_gravity,      BigDecimal.valueOf(3.7E+18),     UnitGroup.ACCELERATION, R.string.mercury_surface_gravity,      R.string.mercury_surface_gravity_short),
+        NormalUnit(MyUnitIDS.venus_surface_gravity,        BigDecimal.valueOf(8.87E+18),    UnitGroup.ACCELERATION, R.string.venus_surface_gravity,        R.string.venus_surface_gravity_short),
+        NormalUnit(MyUnitIDS.earth_surface_gravity,        BigDecimal.valueOf(9.80655E+18), UnitGroup.ACCELERATION, R.string.earth_surface_gravity,        R.string.earth_surface_gravity_short),
+        NormalUnit(MyUnitIDS.mars_surface_gravity,         BigDecimal.valueOf(3.71E+18),    UnitGroup.ACCELERATION, R.string.mars_surface_gravity,         R.string.mars_surface_gravity_short),
+        NormalUnit(MyUnitIDS.jupiter_surface_gravity,      BigDecimal.valueOf(2.479E+19),   UnitGroup.ACCELERATION, R.string.jupiter_surface_gravity,      R.string.jupiter_surface_gravity_short),
+        NormalUnit(MyUnitIDS.saturn_surface_gravity,       BigDecimal.valueOf(1.044E+19),   UnitGroup.ACCELERATION, R.string.saturn_surface_gravity,       R.string.saturn_surface_gravity_short),
+        NormalUnit(MyUnitIDS.uranus_surface_gravity,       BigDecimal.valueOf(8.87E+18),    UnitGroup.ACCELERATION, R.string.uranus_surface_gravity,       R.string.uranus_surface_gravity_short),
+        NormalUnit(MyUnitIDS.neptune_surface_gravity,      BigDecimal.valueOf(1.115E+19),   UnitGroup.ACCELERATION, R.string.neptune_surface_gravity,      R.string.neptune_surface_gravity_short),
+        NormalUnit(MyUnitIDS.sun_surface_gravity,          BigDecimal.valueOf(2.74E+20),    UnitGroup.ACCELERATION, R.string.sun_surface_gravity,          R.string.sun_surface_gravity_short),
     )
-}
\ No newline at end of file
+}
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Angle.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Angle.kt
index 269f60e8..92a12dd4 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Angle.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Angle.kt
@@ -19,19 +19,19 @@
 package com.sadellie.unitto.data.units.collections
 
 import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.DefaultUnit
 import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.NormalUnit
 import com.sadellie.unitto.data.units.MyUnitIDS
 import java.math.BigDecimal
 
 internal val angleCollection: List<AbstractUnit> by lazy {
     listOf(
-        DefaultUnit(MyUnitIDS.angle_second,  BigDecimal.valueOf(1),              UnitGroup.ANGLE,    R.string.angle_second,  R.string.angle_second_short),
-        DefaultUnit(MyUnitIDS.angle_minute,  BigDecimal.valueOf(60),             UnitGroup.ANGLE,    R.string.angle_minute,  R.string.angle_minute_short),
-        DefaultUnit(MyUnitIDS.degree,        BigDecimal.valueOf(3600),           UnitGroup.ANGLE,    R.string.degree,        R.string.degree_short),
-        DefaultUnit(MyUnitIDS.radian,        BigDecimal.valueOf(206264.8062471), UnitGroup.ANGLE,    R.string.radian,        R.string.radian_short),
-        DefaultUnit(MyUnitIDS.sextant,       BigDecimal.valueOf(216000),         UnitGroup.ANGLE,    R.string.sextant,       R.string.sextant_short),
-        DefaultUnit(MyUnitIDS.turn,          BigDecimal.valueOf(1296000),        UnitGroup.ANGLE,    R.string.turn,          R.string.turn_short),
+        NormalUnit(MyUnitIDS.angle_second,  BigDecimal.valueOf(1),              UnitGroup.ANGLE,    R.string.angle_second,  R.string.angle_second_short),
+        NormalUnit(MyUnitIDS.angle_minute,  BigDecimal.valueOf(60),             UnitGroup.ANGLE,    R.string.angle_minute,  R.string.angle_minute_short),
+        NormalUnit(MyUnitIDS.degree,        BigDecimal.valueOf(3600),           UnitGroup.ANGLE,    R.string.degree,        R.string.degree_short),
+        NormalUnit(MyUnitIDS.radian,        BigDecimal.valueOf(206264.8062471), UnitGroup.ANGLE,    R.string.radian,        R.string.radian_short),
+        NormalUnit(MyUnitIDS.sextant,       BigDecimal.valueOf(216000),         UnitGroup.ANGLE,    R.string.sextant,       R.string.sextant_short),
+        NormalUnit(MyUnitIDS.turn,          BigDecimal.valueOf(1296000),        UnitGroup.ANGLE,    R.string.turn,          R.string.turn_short),
     )
-}
\ No newline at end of file
+}
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Area.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Area.kt
index f224ca18..4a467941 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Area.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Area.kt
@@ -19,27 +19,27 @@
 package com.sadellie.unitto.data.units.collections
 
 import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.DefaultUnit
 import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.NormalUnit
 import com.sadellie.unitto.data.units.MyUnitIDS
 import java.math.BigDecimal
 
 internal val areaCollection: List<AbstractUnit> by lazy {
     listOf(
-        DefaultUnit(MyUnitIDS.cent,                      BigDecimal.valueOf(6.083246572E+33),        UnitGroup.AREA, R.string.cent,                      R.string.cent_short),
-        DefaultUnit(MyUnitIDS.acre,                      BigDecimal.valueOf(6.083246572E+31),        UnitGroup.AREA, R.string.acre,                      R.string.acre_short),
-        DefaultUnit(MyUnitIDS.hectare,                   BigDecimal.valueOf(1.503202964E+32),        UnitGroup.AREA, R.string.hectare,                   R.string.hectare_short ),
-        DefaultUnit(MyUnitIDS.square_foot,               BigDecimal.valueOf(1.396521251E+27),        UnitGroup.AREA, R.string.square_foot,               R.string.square_foot_short),
-        DefaultUnit(MyUnitIDS.square_mile,               BigDecimal.valueOf(3.893277806E+34),        UnitGroup.AREA, R.string.square_mile,               R.string.square_mile_short),
-        DefaultUnit(MyUnitIDS.square_yard,               BigDecimal.valueOf(1.256869126E+28),        UnitGroup.AREA, R.string.square_yard,               R.string.square_yard_short),
-        DefaultUnit(MyUnitIDS.square_inch,               BigDecimal.valueOf(9.698064247E+24),        UnitGroup.AREA, R.string.square_inch,               R.string.square_inch_short),
-        DefaultUnit(MyUnitIDS.square_micrometer,         BigDecimal.valueOf(1.503202964E+16),        UnitGroup.AREA, R.string.square_micrometer,         R.string.square_micrometer_short),
-        DefaultUnit(MyUnitIDS.square_millimeter,         BigDecimal.valueOf(1.503202964E+22),        UnitGroup.AREA, R.string.square_millimeter,         R.string.square_millimeter_short),
-        DefaultUnit(MyUnitIDS.square_centimeter,         BigDecimal.valueOf(1.503202964E+24),        UnitGroup.AREA, R.string.square_centimeter,         R.string.square_centimeter_short),
-        DefaultUnit(MyUnitIDS.square_decimeter,          BigDecimal.valueOf(1.503202964E+26),        UnitGroup.AREA, R.string.square_decimeter,          R.string.square_decimeter_short),
-        DefaultUnit(MyUnitIDS.square_meter,              BigDecimal.valueOf(1.503202964E+28),        UnitGroup.AREA, R.string.square_meter,              R.string.square_meter_short),
-        DefaultUnit(MyUnitIDS.square_kilometer,          BigDecimal.valueOf(1.503202964E+34),        UnitGroup.AREA, R.string.square_kilometer,          R.string.square_kilometer_short),
-        DefaultUnit(MyUnitIDS.electron_cross_section,    BigDecimal.valueOf(1.0),                    UnitGroup.AREA, R.string.electron_cross_section,    R.string.electron_cross_section_short),
+        NormalUnit(MyUnitIDS.cent,                      BigDecimal.valueOf(6.083246572E+33),        UnitGroup.AREA, R.string.cent,                      R.string.cent_short),
+        NormalUnit(MyUnitIDS.acre,                      BigDecimal.valueOf(6.083246572E+31),        UnitGroup.AREA, R.string.acre,                      R.string.acre_short),
+        NormalUnit(MyUnitIDS.hectare,                   BigDecimal.valueOf(1.503202964E+32),        UnitGroup.AREA, R.string.hectare,                   R.string.hectare_short ),
+        NormalUnit(MyUnitIDS.square_foot,               BigDecimal.valueOf(1.396521251E+27),        UnitGroup.AREA, R.string.square_foot,               R.string.square_foot_short),
+        NormalUnit(MyUnitIDS.square_mile,               BigDecimal.valueOf(3.893277806E+34),        UnitGroup.AREA, R.string.square_mile,               R.string.square_mile_short),
+        NormalUnit(MyUnitIDS.square_yard,               BigDecimal.valueOf(1.256869126E+28),        UnitGroup.AREA, R.string.square_yard,               R.string.square_yard_short),
+        NormalUnit(MyUnitIDS.square_inch,               BigDecimal.valueOf(9.698064247E+24),        UnitGroup.AREA, R.string.square_inch,               R.string.square_inch_short),
+        NormalUnit(MyUnitIDS.square_micrometer,         BigDecimal.valueOf(1.503202964E+16),        UnitGroup.AREA, R.string.square_micrometer,         R.string.square_micrometer_short),
+        NormalUnit(MyUnitIDS.square_millimeter,         BigDecimal.valueOf(1.503202964E+22),        UnitGroup.AREA, R.string.square_millimeter,         R.string.square_millimeter_short),
+        NormalUnit(MyUnitIDS.square_centimeter,         BigDecimal.valueOf(1.503202964E+24),        UnitGroup.AREA, R.string.square_centimeter,         R.string.square_centimeter_short),
+        NormalUnit(MyUnitIDS.square_decimeter,          BigDecimal.valueOf(1.503202964E+26),        UnitGroup.AREA, R.string.square_decimeter,          R.string.square_decimeter_short),
+        NormalUnit(MyUnitIDS.square_meter,              BigDecimal.valueOf(1.503202964E+28),        UnitGroup.AREA, R.string.square_meter,              R.string.square_meter_short),
+        NormalUnit(MyUnitIDS.square_kilometer,          BigDecimal.valueOf(1.503202964E+34),        UnitGroup.AREA, R.string.square_kilometer,          R.string.square_kilometer_short),
+        NormalUnit(MyUnitIDS.electron_cross_section,    BigDecimal.valueOf(1.0),                    UnitGroup.AREA, R.string.electron_cross_section,    R.string.electron_cross_section_short),
     )
-}
\ No newline at end of file
+}
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Capacitance.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Capacitance.kt
deleted file mode 100644
index c865a7c8..00000000
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Capacitance.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Unitto is a unit converter for Android
- * Copyright (c) 2023 Elshan Agaev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.sadellie.unitto.data.units.collections
-
-import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.DefaultUnit
-import com.sadellie.unitto.data.model.UnitGroup
-import com.sadellie.unitto.data.units.MyUnitIDS
-import java.math.BigDecimal
-
-internal val electrostaticCapacitance: List<AbstractUnit> by lazy {
-    listOf(
-        DefaultUnit(MyUnitIDS.attofarad,     BigDecimal.valueOf(1),              UnitGroup.ELECTROSTATIC_CAPACITANCE,    R.string.attofarad,     R.string.attofarad_short),
-        DefaultUnit(MyUnitIDS.picofarad,     BigDecimal.valueOf(1E+6),           UnitGroup.ELECTROSTATIC_CAPACITANCE,    R.string.picofarad,     R.string.picofarad_short),
-        DefaultUnit(MyUnitIDS.statfarad,     BigDecimal.valueOf(1112650.0561),   UnitGroup.ELECTROSTATIC_CAPACITANCE,    R.string.statfarad,     R.string.statfarad_short),
-        DefaultUnit(MyUnitIDS.nanofarad,     BigDecimal.valueOf(1E+9),           UnitGroup.ELECTROSTATIC_CAPACITANCE,    R.string.nanofarad,     R.string.nanofarad_short),
-        DefaultUnit(MyUnitIDS.microfarad,    BigDecimal.valueOf(1E+12),          UnitGroup.ELECTROSTATIC_CAPACITANCE,    R.string.microfarad,    R.string.microfarad_short),
-        DefaultUnit(MyUnitIDS.millifarad,    BigDecimal.valueOf(1E+15),          UnitGroup.ELECTROSTATIC_CAPACITANCE,    R.string.millifarad,    R.string.millifarad_short),
-        DefaultUnit(MyUnitIDS.farad,         BigDecimal.valueOf(1E+18),          UnitGroup.ELECTROSTATIC_CAPACITANCE,    R.string.farad,         R.string.farad_short),
-        DefaultUnit(MyUnitIDS.kilofarad,     BigDecimal.valueOf(1E+21),          UnitGroup.ELECTROSTATIC_CAPACITANCE,    R.string.kilofarad,     R.string.kilofarad_short),
-        DefaultUnit(MyUnitIDS.megafarad,     BigDecimal.valueOf(1E+24),          UnitGroup.ELECTROSTATIC_CAPACITANCE,    R.string.megafarad,     R.string.megafarad_short),
-        DefaultUnit(MyUnitIDS.gigafarad,     BigDecimal.valueOf(1E+27),          UnitGroup.ELECTROSTATIC_CAPACITANCE,    R.string.gigafarad,     R.string.gigafarad_short),
-        DefaultUnit(MyUnitIDS.petafarad,     BigDecimal.valueOf(1E+33),          UnitGroup.ELECTROSTATIC_CAPACITANCE,    R.string.petafarad,     R.string.petafarad_short),
-        DefaultUnit(MyUnitIDS.exafarad,      BigDecimal.valueOf(1E+36),          UnitGroup.ELECTROSTATIC_CAPACITANCE,    R.string.exafarad,      R.string.exafarad_short),
-    )
-}
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Currency.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Currency.kt
index 9b9cf6a0..7a586471 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Currency.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Currency.kt
@@ -19,221 +19,221 @@
 package com.sadellie.unitto.data.units.collections
 
 import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.DefaultUnit
 import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.ReverseUnit
 import com.sadellie.unitto.data.units.MyUnitIDS
 import java.math.BigDecimal
 
 internal val currencyCollection: List<AbstractUnit> by lazy {
     listOf(
-        DefaultUnit(MyUnitIDS.currency_1inch,    BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_1inch,    R.string.currency_1inch_short),
-        DefaultUnit(MyUnitIDS.currency_ada,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_ada,      R.string.currency_ada_short),
-        DefaultUnit(MyUnitIDS.currency_aed,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_aed,      R.string.currency_aed_short),
-        DefaultUnit(MyUnitIDS.currency_afn,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_afn,      R.string.currency_afn_short),
-        DefaultUnit(MyUnitIDS.currency_algo,     BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_algo,     R.string.currency_algo_short),
-        DefaultUnit(MyUnitIDS.currency_all,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_all,      R.string.currency_all_short),
-        DefaultUnit(MyUnitIDS.currency_amd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_amd,      R.string.currency_amd_short),
-        DefaultUnit(MyUnitIDS.currency_ang,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_ang,      R.string.currency_ang_short),
-        DefaultUnit(MyUnitIDS.currency_aoa,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_aoa,      R.string.currency_aoa_short),
-        DefaultUnit(MyUnitIDS.currency_ars,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_ars,      R.string.currency_ars_short),
-        DefaultUnit(MyUnitIDS.currency_atom,     BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_atom,     R.string.currency_atom_short),
-        DefaultUnit(MyUnitIDS.currency_aud,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_aud,      R.string.currency_aud_short),
-        DefaultUnit(MyUnitIDS.currency_avax,     BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_avax,     R.string.currency_avax_short),
-        DefaultUnit(MyUnitIDS.currency_awg,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_awg,      R.string.currency_awg_short),
-        DefaultUnit(MyUnitIDS.currency_azn,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_azn,      R.string.currency_azn_short),
-        DefaultUnit(MyUnitIDS.currency_bam,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_bam,      R.string.currency_bam_short),
-        DefaultUnit(MyUnitIDS.currency_bbd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_bbd,      R.string.currency_bbd_short),
-        DefaultUnit(MyUnitIDS.currency_bch,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_bch,      R.string.currency_bch_short),
-        DefaultUnit(MyUnitIDS.currency_bdt,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_bdt,      R.string.currency_bdt_short),
-        DefaultUnit(MyUnitIDS.currency_bgn,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_bgn,      R.string.currency_bgn_short),
-        DefaultUnit(MyUnitIDS.currency_bhd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_bhd,      R.string.currency_bhd_short),
-        DefaultUnit(MyUnitIDS.currency_bif,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_bif,      R.string.currency_bif_short),
-        DefaultUnit(MyUnitIDS.currency_bmd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_bmd,      R.string.currency_bmd_short),
-        DefaultUnit(MyUnitIDS.currency_bnb,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_bnb,      R.string.currency_bnb_short),
-        DefaultUnit(MyUnitIDS.currency_bnd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_bnd,      R.string.currency_bnd_short),
-        DefaultUnit(MyUnitIDS.currency_bob,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_bob,      R.string.currency_bob_short),
-        DefaultUnit(MyUnitIDS.currency_brl,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_brl,      R.string.currency_brl_short),
-        DefaultUnit(MyUnitIDS.currency_bsd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_bsd,      R.string.currency_bsd_short),
-        DefaultUnit(MyUnitIDS.currency_btc,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_btc,      R.string.currency_btc_short),
-        DefaultUnit(MyUnitIDS.currency_btn,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_btn,      R.string.currency_btn_short),
-        DefaultUnit(MyUnitIDS.currency_busd,     BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_busd,     R.string.currency_busd_short),
-        DefaultUnit(MyUnitIDS.currency_bwp,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_bwp,      R.string.currency_bwp_short),
-        DefaultUnit(MyUnitIDS.currency_byn,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_byn,      R.string.currency_byn_short),
-        DefaultUnit(MyUnitIDS.currency_byr,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_byr,      R.string.currency_byr_short),
-        DefaultUnit(MyUnitIDS.currency_bzd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_bzd,      R.string.currency_bzd_short),
-        DefaultUnit(MyUnitIDS.currency_cad,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_cad,      R.string.currency_cad_short),
-        DefaultUnit(MyUnitIDS.currency_cdf,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_cdf,      R.string.currency_cdf_short),
-        DefaultUnit(MyUnitIDS.currency_chf,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_chf,      R.string.currency_chf_short),
-        DefaultUnit(MyUnitIDS.currency_chz,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_chz,      R.string.currency_chz_short),
-        DefaultUnit(MyUnitIDS.currency_clf,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_clf,      R.string.currency_clf_short),
-        DefaultUnit(MyUnitIDS.currency_clp,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_clp,      R.string.currency_clp_short),
-        DefaultUnit(MyUnitIDS.currency_cny,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_cny,      R.string.currency_cny_short),
-        DefaultUnit(MyUnitIDS.currency_cop,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_cop,      R.string.currency_cop_short),
-        DefaultUnit(MyUnitIDS.currency_crc,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_crc,      R.string.currency_crc_short),
-        DefaultUnit(MyUnitIDS.currency_cro,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_cro,      R.string.currency_cro_short),
-        DefaultUnit(MyUnitIDS.currency_cuc,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_cuc,      R.string.currency_cuc_short),
-        DefaultUnit(MyUnitIDS.currency_cup,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_cup,      R.string.currency_cup_short),
-        DefaultUnit(MyUnitIDS.currency_cve,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_cve,      R.string.currency_cve_short),
-        DefaultUnit(MyUnitIDS.currency_czk,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_czk,      R.string.currency_czk_short),
-        DefaultUnit(MyUnitIDS.currency_dai,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_dai,      R.string.currency_dai_short),
-        DefaultUnit(MyUnitIDS.currency_djf,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_djf,      R.string.currency_djf_short),
-        DefaultUnit(MyUnitIDS.currency_dkk,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_dkk,      R.string.currency_dkk_short),
-        DefaultUnit(MyUnitIDS.currency_doge,     BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_doge,     R.string.currency_doge_short),
-        DefaultUnit(MyUnitIDS.currency_dop,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_dop,      R.string.currency_dop_short),
-        DefaultUnit(MyUnitIDS.currency_dot,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_dot,      R.string.currency_dot_short),
-        DefaultUnit(MyUnitIDS.currency_dzd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_dzd,      R.string.currency_dzd_short),
-        DefaultUnit(MyUnitIDS.currency_egld,     BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_egld,     R.string.currency_egld_short),
-        DefaultUnit(MyUnitIDS.currency_egp,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_egp,      R.string.currency_egp_short),
-        DefaultUnit(MyUnitIDS.currency_enj,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_enj,      R.string.currency_enj_short),
-        DefaultUnit(MyUnitIDS.currency_ern,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_ern,      R.string.currency_ern_short),
-        DefaultUnit(MyUnitIDS.currency_etb,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_etb,      R.string.currency_etb_short),
-        DefaultUnit(MyUnitIDS.currency_etc,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_etc,      R.string.currency_etc_short),
-        DefaultUnit(MyUnitIDS.currency_eth,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_eth,      R.string.currency_eth_short),
-        DefaultUnit(MyUnitIDS.currency_eur,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_eur,      R.string.currency_eur_short),
-        DefaultUnit(MyUnitIDS.currency_fil,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_fil,      R.string.currency_fil_short),
-        DefaultUnit(MyUnitIDS.currency_fjd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_fjd,      R.string.currency_fjd_short),
-        DefaultUnit(MyUnitIDS.currency_fkp,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_fkp,      R.string.currency_fkp_short),
-        DefaultUnit(MyUnitIDS.currency_ftt,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_ftt,      R.string.currency_ftt_short),
-        DefaultUnit(MyUnitIDS.currency_gbp,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_gbp,      R.string.currency_gbp_short),
-        DefaultUnit(MyUnitIDS.currency_gel,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_gel,      R.string.currency_gel_short),
-        DefaultUnit(MyUnitIDS.currency_ggp,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_ggp,      R.string.currency_ggp_short),
-        DefaultUnit(MyUnitIDS.currency_ghs,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_ghs,      R.string.currency_ghs_short),
-        DefaultUnit(MyUnitIDS.currency_gip,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_gip,      R.string.currency_gip_short),
-        DefaultUnit(MyUnitIDS.currency_gmd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_gmd,      R.string.currency_gmd_short),
-        DefaultUnit(MyUnitIDS.currency_gnf,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_gnf,      R.string.currency_gnf_short),
-        DefaultUnit(MyUnitIDS.currency_grt,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_grt,      R.string.currency_grt_short),
-        DefaultUnit(MyUnitIDS.currency_gtq,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_gtq,      R.string.currency_gtq_short),
-        DefaultUnit(MyUnitIDS.currency_gyd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_gyd,      R.string.currency_gyd_short),
-        DefaultUnit(MyUnitIDS.currency_hkd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_hkd,      R.string.currency_hkd_short),
-        DefaultUnit(MyUnitIDS.currency_hnl,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_hnl,      R.string.currency_hnl_short),
-        DefaultUnit(MyUnitIDS.currency_hrk,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_hrk,      R.string.currency_hrk_short),
-        DefaultUnit(MyUnitIDS.currency_htg,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_htg,      R.string.currency_htg_short),
-        DefaultUnit(MyUnitIDS.currency_huf,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_huf,      R.string.currency_huf_short),
-        DefaultUnit(MyUnitIDS.currency_icp,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_icp,      R.string.currency_icp_short),
-        DefaultUnit(MyUnitIDS.currency_idr,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_idr,      R.string.currency_idr_short),
-        DefaultUnit(MyUnitIDS.currency_ils,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_ils,      R.string.currency_ils_short),
-        DefaultUnit(MyUnitIDS.currency_imp,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_imp,      R.string.currency_imp_short),
-        DefaultUnit(MyUnitIDS.currency_inj,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_inj,      R.string.currency_inj_short),
-        DefaultUnit(MyUnitIDS.currency_inr,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_inr,      R.string.currency_inr_short),
-        DefaultUnit(MyUnitIDS.currency_iqd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_iqd,      R.string.currency_iqd_short),
-        DefaultUnit(MyUnitIDS.currency_irr,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_irr,      R.string.currency_irr_short),
-        DefaultUnit(MyUnitIDS.currency_isk,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_isk,      R.string.currency_isk_short),
-        DefaultUnit(MyUnitIDS.currency_jep,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_jep,      R.string.currency_jep_short),
-        DefaultUnit(MyUnitIDS.currency_jmd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_jmd,      R.string.currency_jmd_short),
-        DefaultUnit(MyUnitIDS.currency_jod,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_jod,      R.string.currency_jod_short),
-        DefaultUnit(MyUnitIDS.currency_jpy,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_jpy,      R.string.currency_jpy_short),
-        DefaultUnit(MyUnitIDS.currency_kes,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_kes,      R.string.currency_kes_short),
-        DefaultUnit(MyUnitIDS.currency_kgs,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_kgs,      R.string.currency_kgs_short),
-        DefaultUnit(MyUnitIDS.currency_khr,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_khr,      R.string.currency_khr_short),
-        DefaultUnit(MyUnitIDS.currency_kmf,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_kmf,      R.string.currency_kmf_short),
-        DefaultUnit(MyUnitIDS.currency_kpw,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_kpw,      R.string.currency_kpw_short),
-        DefaultUnit(MyUnitIDS.currency_krw,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_krw,      R.string.currency_krw_short),
-        DefaultUnit(MyUnitIDS.currency_ksm,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_ksm,      R.string.currency_ksm_short),
-        DefaultUnit(MyUnitIDS.currency_kwd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_kwd,      R.string.currency_kwd_short),
-        DefaultUnit(MyUnitIDS.currency_kyd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_kyd,      R.string.currency_kyd_short),
-        DefaultUnit(MyUnitIDS.currency_kzt,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_kzt,      R.string.currency_kzt_short),
-        DefaultUnit(MyUnitIDS.currency_lak,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_lak,      R.string.currency_lak_short),
-        DefaultUnit(MyUnitIDS.currency_lbp,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_lbp,      R.string.currency_lbp_short),
-        DefaultUnit(MyUnitIDS.currency_link,     BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_link,     R.string.currency_link_short),
-        DefaultUnit(MyUnitIDS.currency_lkr,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_lkr,      R.string.currency_lkr_short),
-        DefaultUnit(MyUnitIDS.currency_lrd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_lrd,      R.string.currency_lrd_short),
-        DefaultUnit(MyUnitIDS.currency_lsl,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_lsl,      R.string.currency_lsl_short),
-        DefaultUnit(MyUnitIDS.currency_ltc,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_ltc,      R.string.currency_ltc_short),
-        DefaultUnit(MyUnitIDS.currency_ltl,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_ltl,      R.string.currency_ltl_short),
-        DefaultUnit(MyUnitIDS.currency_luna,     BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_luna,     R.string.currency_luna_short),
-        DefaultUnit(MyUnitIDS.currency_lvl,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_lvl,      R.string.currency_lvl_short),
-        DefaultUnit(MyUnitIDS.currency_lyd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_lyd,      R.string.currency_lyd_short),
-        DefaultUnit(MyUnitIDS.currency_mad,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_mad,      R.string.currency_mad_short),
-        DefaultUnit(MyUnitIDS.currency_matic,    BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_matic,    R.string.currency_matic_short),
-        DefaultUnit(MyUnitIDS.currency_mdl,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_mdl,      R.string.currency_mdl_short),
-        DefaultUnit(MyUnitIDS.currency_mga,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_mga,      R.string.currency_mga_short),
-        DefaultUnit(MyUnitIDS.currency_mkd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_mkd,      R.string.currency_mkd_short),
-        DefaultUnit(MyUnitIDS.currency_mmk,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_mmk,      R.string.currency_mmk_short),
-        DefaultUnit(MyUnitIDS.currency_mnt,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_mnt,      R.string.currency_mnt_short),
-        DefaultUnit(MyUnitIDS.currency_mop,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_mop,      R.string.currency_mop_short),
-        DefaultUnit(MyUnitIDS.currency_mro,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_mro,      R.string.currency_mro_short),
-        DefaultUnit(MyUnitIDS.currency_mur,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_mur,      R.string.currency_mur_short),
-        DefaultUnit(MyUnitIDS.currency_mvr,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_mvr,      R.string.currency_mvr_short),
-        DefaultUnit(MyUnitIDS.currency_mwk,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_mwk,      R.string.currency_mwk_short),
-        DefaultUnit(MyUnitIDS.currency_mxn,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_mxn,      R.string.currency_mxn_short),
-        DefaultUnit(MyUnitIDS.currency_myr,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_myr,      R.string.currency_myr_short),
-        DefaultUnit(MyUnitIDS.currency_mzn,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_mzn,      R.string.currency_mzn_short),
-        DefaultUnit(MyUnitIDS.currency_nad,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_nad,      R.string.currency_nad_short),
-        DefaultUnit(MyUnitIDS.currency_ngn,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_ngn,      R.string.currency_ngn_short),
-        DefaultUnit(MyUnitIDS.currency_nio,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_nio,      R.string.currency_nio_short),
-        DefaultUnit(MyUnitIDS.currency_nok,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_nok,      R.string.currency_nok_short),
-        DefaultUnit(MyUnitIDS.currency_npr,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_npr,      R.string.currency_npr_short),
-        DefaultUnit(MyUnitIDS.currency_nzd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_nzd,      R.string.currency_nzd_short),
-        DefaultUnit(MyUnitIDS.currency_omr,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_omr,      R.string.currency_omr_short),
-        DefaultUnit(MyUnitIDS.currency_one,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_one,      R.string.currency_one_short),
-        DefaultUnit(MyUnitIDS.currency_pab,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_pab,      R.string.currency_pab_short),
-        DefaultUnit(MyUnitIDS.currency_pen,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_pen,      R.string.currency_pen_short),
-        DefaultUnit(MyUnitIDS.currency_pgk,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_pgk,      R.string.currency_pgk_short),
-        DefaultUnit(MyUnitIDS.currency_php,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_php,      R.string.currency_php_short),
-        DefaultUnit(MyUnitIDS.currency_pkr,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_pkr,      R.string.currency_pkr_short),
-        DefaultUnit(MyUnitIDS.currency_pln,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_pln,      R.string.currency_pln_short),
-        DefaultUnit(MyUnitIDS.currency_pyg,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_pyg,      R.string.currency_pyg_short),
-        DefaultUnit(MyUnitIDS.currency_qar,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_qar,      R.string.currency_qar_short),
-        DefaultUnit(MyUnitIDS.currency_ron,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_ron,      R.string.currency_ron_short),
-        DefaultUnit(MyUnitIDS.currency_rsd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_rsd,      R.string.currency_rsd_short),
-        DefaultUnit(MyUnitIDS.currency_rub,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_rub,      R.string.currency_rub_short),
-        DefaultUnit(MyUnitIDS.currency_rwf,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_rwf,      R.string.currency_rwf_short),
-        DefaultUnit(MyUnitIDS.currency_sar,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_sar,      R.string.currency_sar_short),
-        DefaultUnit(MyUnitIDS.currency_sbd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_sbd,      R.string.currency_sbd_short),
-        DefaultUnit(MyUnitIDS.currency_scr,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_scr,      R.string.currency_scr_short),
-        DefaultUnit(MyUnitIDS.currency_sdg,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_sdg,      R.string.currency_sdg_short),
-        DefaultUnit(MyUnitIDS.currency_sek,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_sek,      R.string.currency_sek_short),
-        DefaultUnit(MyUnitIDS.currency_sgd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_sgd,      R.string.currency_sgd_short),
-        DefaultUnit(MyUnitIDS.currency_shib,     BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_shib,     R.string.currency_shib_short),
-        DefaultUnit(MyUnitIDS.currency_shp,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_shp,      R.string.currency_shp_short),
-        DefaultUnit(MyUnitIDS.currency_sll,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_sll,      R.string.currency_sll_short),
-        DefaultUnit(MyUnitIDS.currency_sol,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_sol,      R.string.currency_sol_short),
-        DefaultUnit(MyUnitIDS.currency_sos,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_sos,      R.string.currency_sos_short),
-        DefaultUnit(MyUnitIDS.currency_srd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_srd,      R.string.currency_srd_short),
-        DefaultUnit(MyUnitIDS.currency_std,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_std,      R.string.currency_std_short),
-        DefaultUnit(MyUnitIDS.currency_svc,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_svc,      R.string.currency_svc_short),
-        DefaultUnit(MyUnitIDS.currency_syp,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_syp,      R.string.currency_syp_short),
-        DefaultUnit(MyUnitIDS.currency_szl,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_szl,      R.string.currency_szl_short),
-        DefaultUnit(MyUnitIDS.currency_thb,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_thb,      R.string.currency_thb_short),
-        DefaultUnit(MyUnitIDS.currency_theta,    BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_theta,    R.string.currency_theta_short),
-        DefaultUnit(MyUnitIDS.currency_tjs,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_tjs,      R.string.currency_tjs_short),
-        DefaultUnit(MyUnitIDS.currency_tmt,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_tmt,      R.string.currency_tmt_short),
-        DefaultUnit(MyUnitIDS.currency_tnd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_tnd,      R.string.currency_tnd_short),
-        DefaultUnit(MyUnitIDS.currency_top,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_top,      R.string.currency_top_short),
-        DefaultUnit(MyUnitIDS.currency_trx,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_trx,      R.string.currency_trx_short),
-        DefaultUnit(MyUnitIDS.currency_try,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_try,      R.string.currency_try_short),
-        DefaultUnit(MyUnitIDS.currency_ttd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_ttd,      R.string.currency_ttd_short),
-        DefaultUnit(MyUnitIDS.currency_twd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_twd,      R.string.currency_twd_short),
-        DefaultUnit(MyUnitIDS.currency_tzs,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_tzs,      R.string.currency_tzs_short),
-        DefaultUnit(MyUnitIDS.currency_uah,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_uah,      R.string.currency_uah_short),
-        DefaultUnit(MyUnitIDS.currency_ugx,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_ugx,      R.string.currency_ugx_short),
-        DefaultUnit(MyUnitIDS.currency_uni,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_uni,      R.string.currency_uni_short),
-        DefaultUnit(MyUnitIDS.currency_usd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_usd,      R.string.currency_usd_short),
-        DefaultUnit(MyUnitIDS.currency_usdc,     BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_usdc,     R.string.currency_usdc_short),
-        DefaultUnit(MyUnitIDS.currency_usdt,     BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_usdt,     R.string.currency_usdt_short),
-        DefaultUnit(MyUnitIDS.currency_uyu,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_uyu,      R.string.currency_uyu_short),
-        DefaultUnit(MyUnitIDS.currency_uzs,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_uzs,      R.string.currency_uzs_short),
-        DefaultUnit(MyUnitIDS.currency_vef,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_vef,      R.string.currency_vef_short),
-        DefaultUnit(MyUnitIDS.currency_vet,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_vet,      R.string.currency_vet_short),
-        DefaultUnit(MyUnitIDS.currency_vnd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_vnd,      R.string.currency_vnd_short),
-        DefaultUnit(MyUnitIDS.currency_vuv,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_vuv,      R.string.currency_vuv_short),
-        DefaultUnit(MyUnitIDS.currency_wbtc,     BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_wbtc,     R.string.currency_wbtc_short),
-        DefaultUnit(MyUnitIDS.currency_wst,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_wst,      R.string.currency_wst_short),
-        DefaultUnit(MyUnitIDS.currency_xaf,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_xaf,      R.string.currency_xaf_short),
-        DefaultUnit(MyUnitIDS.currency_xag,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_xag,      R.string.currency_xag_short),
-        DefaultUnit(MyUnitIDS.currency_xau,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_xau,      R.string.currency_xau_short),
-        DefaultUnit(MyUnitIDS.currency_xcd,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_xcd,      R.string.currency_xcd_short),
-        DefaultUnit(MyUnitIDS.currency_xdr,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_xdr,      R.string.currency_xdr_short),
-        DefaultUnit(MyUnitIDS.currency_xlm,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_xlm,      R.string.currency_xlm_short),
-        DefaultUnit(MyUnitIDS.currency_xmr,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_xmr,      R.string.currency_xmr_short),
-        DefaultUnit(MyUnitIDS.currency_xof,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_xof,      R.string.currency_xof_short),
-        DefaultUnit(MyUnitIDS.currency_xpf,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_xpf,      R.string.currency_xpf_short),
-        DefaultUnit(MyUnitIDS.currency_xrp,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_xrp,      R.string.currency_xrp_short),
-        DefaultUnit(MyUnitIDS.currency_yer,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_yer,      R.string.currency_yer_short),
-        DefaultUnit(MyUnitIDS.currency_zar,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_zar,      R.string.currency_zar_short),
-        DefaultUnit(MyUnitIDS.currency_zmk,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_zmk,      R.string.currency_zmk_short),
-        DefaultUnit(MyUnitIDS.currency_zmw,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_zmw,      R.string.currency_zmw_short),
-        DefaultUnit(MyUnitIDS.currency_zwl,      BigDecimal.ONE, UnitGroup.CURRENCY, R.string.currency_zwl,      R.string.currency_zwl_short),
+        ReverseUnit(MyUnitIDS.currency_1inch,    BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_1inch,    R.string.currency_1inch_short),
+        ReverseUnit(MyUnitIDS.currency_ada,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_ada,      R.string.currency_ada_short),
+        ReverseUnit(MyUnitIDS.currency_aed,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_aed,      R.string.currency_aed_short),
+        ReverseUnit(MyUnitIDS.currency_afn,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_afn,      R.string.currency_afn_short),
+        ReverseUnit(MyUnitIDS.currency_algo,     BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_algo,     R.string.currency_algo_short),
+        ReverseUnit(MyUnitIDS.currency_all,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_all,      R.string.currency_all_short),
+        ReverseUnit(MyUnitIDS.currency_amd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_amd,      R.string.currency_amd_short),
+        ReverseUnit(MyUnitIDS.currency_ang,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_ang,      R.string.currency_ang_short),
+        ReverseUnit(MyUnitIDS.currency_aoa,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_aoa,      R.string.currency_aoa_short),
+        ReverseUnit(MyUnitIDS.currency_ars,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_ars,      R.string.currency_ars_short),
+        ReverseUnit(MyUnitIDS.currency_atom,     BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_atom,     R.string.currency_atom_short),
+        ReverseUnit(MyUnitIDS.currency_aud,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_aud,      R.string.currency_aud_short),
+        ReverseUnit(MyUnitIDS.currency_avax,     BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_avax,     R.string.currency_avax_short),
+        ReverseUnit(MyUnitIDS.currency_awg,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_awg,      R.string.currency_awg_short),
+        ReverseUnit(MyUnitIDS.currency_azn,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_azn,      R.string.currency_azn_short),
+        ReverseUnit(MyUnitIDS.currency_bam,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_bam,      R.string.currency_bam_short),
+        ReverseUnit(MyUnitIDS.currency_bbd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_bbd,      R.string.currency_bbd_short),
+        ReverseUnit(MyUnitIDS.currency_bch,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_bch,      R.string.currency_bch_short),
+        ReverseUnit(MyUnitIDS.currency_bdt,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_bdt,      R.string.currency_bdt_short),
+        ReverseUnit(MyUnitIDS.currency_bgn,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_bgn,      R.string.currency_bgn_short),
+        ReverseUnit(MyUnitIDS.currency_bhd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_bhd,      R.string.currency_bhd_short),
+        ReverseUnit(MyUnitIDS.currency_bif,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_bif,      R.string.currency_bif_short),
+        ReverseUnit(MyUnitIDS.currency_bmd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_bmd,      R.string.currency_bmd_short),
+        ReverseUnit(MyUnitIDS.currency_bnb,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_bnb,      R.string.currency_bnb_short),
+        ReverseUnit(MyUnitIDS.currency_bnd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_bnd,      R.string.currency_bnd_short),
+        ReverseUnit(MyUnitIDS.currency_bob,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_bob,      R.string.currency_bob_short),
+        ReverseUnit(MyUnitIDS.currency_brl,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_brl,      R.string.currency_brl_short),
+        ReverseUnit(MyUnitIDS.currency_bsd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_bsd,      R.string.currency_bsd_short),
+        ReverseUnit(MyUnitIDS.currency_btc,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_btc,      R.string.currency_btc_short),
+        ReverseUnit(MyUnitIDS.currency_btn,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_btn,      R.string.currency_btn_short),
+        ReverseUnit(MyUnitIDS.currency_busd,     BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_busd,     R.string.currency_busd_short),
+        ReverseUnit(MyUnitIDS.currency_bwp,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_bwp,      R.string.currency_bwp_short),
+        ReverseUnit(MyUnitIDS.currency_byn,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_byn,      R.string.currency_byn_short),
+        ReverseUnit(MyUnitIDS.currency_byr,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_byr,      R.string.currency_byr_short),
+        ReverseUnit(MyUnitIDS.currency_bzd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_bzd,      R.string.currency_bzd_short),
+        ReverseUnit(MyUnitIDS.currency_cad,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_cad,      R.string.currency_cad_short),
+        ReverseUnit(MyUnitIDS.currency_cdf,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_cdf,      R.string.currency_cdf_short),
+        ReverseUnit(MyUnitIDS.currency_chf,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_chf,      R.string.currency_chf_short),
+        ReverseUnit(MyUnitIDS.currency_chz,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_chz,      R.string.currency_chz_short),
+        ReverseUnit(MyUnitIDS.currency_clf,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_clf,      R.string.currency_clf_short),
+        ReverseUnit(MyUnitIDS.currency_clp,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_clp,      R.string.currency_clp_short),
+        ReverseUnit(MyUnitIDS.currency_cny,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_cny,      R.string.currency_cny_short),
+        ReverseUnit(MyUnitIDS.currency_cop,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_cop,      R.string.currency_cop_short),
+        ReverseUnit(MyUnitIDS.currency_crc,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_crc,      R.string.currency_crc_short),
+        ReverseUnit(MyUnitIDS.currency_cro,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_cro,      R.string.currency_cro_short),
+        ReverseUnit(MyUnitIDS.currency_cuc,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_cuc,      R.string.currency_cuc_short),
+        ReverseUnit(MyUnitIDS.currency_cup,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_cup,      R.string.currency_cup_short),
+        ReverseUnit(MyUnitIDS.currency_cve,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_cve,      R.string.currency_cve_short),
+        ReverseUnit(MyUnitIDS.currency_czk,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_czk,      R.string.currency_czk_short),
+        ReverseUnit(MyUnitIDS.currency_dai,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_dai,      R.string.currency_dai_short),
+        ReverseUnit(MyUnitIDS.currency_djf,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_djf,      R.string.currency_djf_short),
+        ReverseUnit(MyUnitIDS.currency_dkk,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_dkk,      R.string.currency_dkk_short),
+        ReverseUnit(MyUnitIDS.currency_doge,     BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_doge,     R.string.currency_doge_short),
+        ReverseUnit(MyUnitIDS.currency_dop,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_dop,      R.string.currency_dop_short),
+        ReverseUnit(MyUnitIDS.currency_dot,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_dot,      R.string.currency_dot_short),
+        ReverseUnit(MyUnitIDS.currency_dzd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_dzd,      R.string.currency_dzd_short),
+        ReverseUnit(MyUnitIDS.currency_egld,     BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_egld,     R.string.currency_egld_short),
+        ReverseUnit(MyUnitIDS.currency_egp,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_egp,      R.string.currency_egp_short),
+        ReverseUnit(MyUnitIDS.currency_enj,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_enj,      R.string.currency_enj_short),
+        ReverseUnit(MyUnitIDS.currency_ern,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_ern,      R.string.currency_ern_short),
+        ReverseUnit(MyUnitIDS.currency_etb,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_etb,      R.string.currency_etb_short),
+        ReverseUnit(MyUnitIDS.currency_etc,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_etc,      R.string.currency_etc_short),
+        ReverseUnit(MyUnitIDS.currency_eth,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_eth,      R.string.currency_eth_short),
+        ReverseUnit(MyUnitIDS.currency_eur,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_eur,      R.string.currency_eur_short),
+        ReverseUnit(MyUnitIDS.currency_fil,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_fil,      R.string.currency_fil_short),
+        ReverseUnit(MyUnitIDS.currency_fjd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_fjd,      R.string.currency_fjd_short),
+        ReverseUnit(MyUnitIDS.currency_fkp,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_fkp,      R.string.currency_fkp_short),
+        ReverseUnit(MyUnitIDS.currency_ftt,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_ftt,      R.string.currency_ftt_short),
+        ReverseUnit(MyUnitIDS.currency_gbp,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_gbp,      R.string.currency_gbp_short),
+        ReverseUnit(MyUnitIDS.currency_gel,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_gel,      R.string.currency_gel_short),
+        ReverseUnit(MyUnitIDS.currency_ggp,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_ggp,      R.string.currency_ggp_short),
+        ReverseUnit(MyUnitIDS.currency_ghs,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_ghs,      R.string.currency_ghs_short),
+        ReverseUnit(MyUnitIDS.currency_gip,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_gip,      R.string.currency_gip_short),
+        ReverseUnit(MyUnitIDS.currency_gmd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_gmd,      R.string.currency_gmd_short),
+        ReverseUnit(MyUnitIDS.currency_gnf,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_gnf,      R.string.currency_gnf_short),
+        ReverseUnit(MyUnitIDS.currency_grt,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_grt,      R.string.currency_grt_short),
+        ReverseUnit(MyUnitIDS.currency_gtq,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_gtq,      R.string.currency_gtq_short),
+        ReverseUnit(MyUnitIDS.currency_gyd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_gyd,      R.string.currency_gyd_short),
+        ReverseUnit(MyUnitIDS.currency_hkd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_hkd,      R.string.currency_hkd_short),
+        ReverseUnit(MyUnitIDS.currency_hnl,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_hnl,      R.string.currency_hnl_short),
+        ReverseUnit(MyUnitIDS.currency_hrk,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_hrk,      R.string.currency_hrk_short),
+        ReverseUnit(MyUnitIDS.currency_htg,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_htg,      R.string.currency_htg_short),
+        ReverseUnit(MyUnitIDS.currency_huf,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_huf,      R.string.currency_huf_short),
+        ReverseUnit(MyUnitIDS.currency_icp,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_icp,      R.string.currency_icp_short),
+        ReverseUnit(MyUnitIDS.currency_idr,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_idr,      R.string.currency_idr_short),
+        ReverseUnit(MyUnitIDS.currency_ils,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_ils,      R.string.currency_ils_short),
+        ReverseUnit(MyUnitIDS.currency_imp,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_imp,      R.string.currency_imp_short),
+        ReverseUnit(MyUnitIDS.currency_inj,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_inj,      R.string.currency_inj_short),
+        ReverseUnit(MyUnitIDS.currency_inr,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_inr,      R.string.currency_inr_short),
+        ReverseUnit(MyUnitIDS.currency_iqd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_iqd,      R.string.currency_iqd_short),
+        ReverseUnit(MyUnitIDS.currency_irr,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_irr,      R.string.currency_irr_short),
+        ReverseUnit(MyUnitIDS.currency_isk,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_isk,      R.string.currency_isk_short),
+        ReverseUnit(MyUnitIDS.currency_jep,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_jep,      R.string.currency_jep_short),
+        ReverseUnit(MyUnitIDS.currency_jmd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_jmd,      R.string.currency_jmd_short),
+        ReverseUnit(MyUnitIDS.currency_jod,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_jod,      R.string.currency_jod_short),
+        ReverseUnit(MyUnitIDS.currency_jpy,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_jpy,      R.string.currency_jpy_short),
+        ReverseUnit(MyUnitIDS.currency_kes,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_kes,      R.string.currency_kes_short),
+        ReverseUnit(MyUnitIDS.currency_kgs,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_kgs,      R.string.currency_kgs_short),
+        ReverseUnit(MyUnitIDS.currency_khr,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_khr,      R.string.currency_khr_short),
+        ReverseUnit(MyUnitIDS.currency_kmf,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_kmf,      R.string.currency_kmf_short),
+        ReverseUnit(MyUnitIDS.currency_kpw,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_kpw,      R.string.currency_kpw_short),
+        ReverseUnit(MyUnitIDS.currency_krw,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_krw,      R.string.currency_krw_short),
+        ReverseUnit(MyUnitIDS.currency_ksm,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_ksm,      R.string.currency_ksm_short),
+        ReverseUnit(MyUnitIDS.currency_kwd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_kwd,      R.string.currency_kwd_short),
+        ReverseUnit(MyUnitIDS.currency_kyd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_kyd,      R.string.currency_kyd_short),
+        ReverseUnit(MyUnitIDS.currency_kzt,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_kzt,      R.string.currency_kzt_short),
+        ReverseUnit(MyUnitIDS.currency_lak,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_lak,      R.string.currency_lak_short),
+        ReverseUnit(MyUnitIDS.currency_lbp,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_lbp,      R.string.currency_lbp_short),
+        ReverseUnit(MyUnitIDS.currency_link,     BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_link,     R.string.currency_link_short),
+        ReverseUnit(MyUnitIDS.currency_lkr,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_lkr,      R.string.currency_lkr_short),
+        ReverseUnit(MyUnitIDS.currency_lrd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_lrd,      R.string.currency_lrd_short),
+        ReverseUnit(MyUnitIDS.currency_lsl,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_lsl,      R.string.currency_lsl_short),
+        ReverseUnit(MyUnitIDS.currency_ltc,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_ltc,      R.string.currency_ltc_short),
+        ReverseUnit(MyUnitIDS.currency_ltl,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_ltl,      R.string.currency_ltl_short),
+        ReverseUnit(MyUnitIDS.currency_luna,     BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_luna,     R.string.currency_luna_short),
+        ReverseUnit(MyUnitIDS.currency_lvl,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_lvl,      R.string.currency_lvl_short),
+        ReverseUnit(MyUnitIDS.currency_lyd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_lyd,      R.string.currency_lyd_short),
+        ReverseUnit(MyUnitIDS.currency_mad,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_mad,      R.string.currency_mad_short),
+        ReverseUnit(MyUnitIDS.currency_matic,    BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_matic,    R.string.currency_matic_short),
+        ReverseUnit(MyUnitIDS.currency_mdl,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_mdl,      R.string.currency_mdl_short),
+        ReverseUnit(MyUnitIDS.currency_mga,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_mga,      R.string.currency_mga_short),
+        ReverseUnit(MyUnitIDS.currency_mkd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_mkd,      R.string.currency_mkd_short),
+        ReverseUnit(MyUnitIDS.currency_mmk,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_mmk,      R.string.currency_mmk_short),
+        ReverseUnit(MyUnitIDS.currency_mnt,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_mnt,      R.string.currency_mnt_short),
+        ReverseUnit(MyUnitIDS.currency_mop,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_mop,      R.string.currency_mop_short),
+        ReverseUnit(MyUnitIDS.currency_mro,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_mro,      R.string.currency_mro_short),
+        ReverseUnit(MyUnitIDS.currency_mur,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_mur,      R.string.currency_mur_short),
+        ReverseUnit(MyUnitIDS.currency_mvr,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_mvr,      R.string.currency_mvr_short),
+        ReverseUnit(MyUnitIDS.currency_mwk,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_mwk,      R.string.currency_mwk_short),
+        ReverseUnit(MyUnitIDS.currency_mxn,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_mxn,      R.string.currency_mxn_short),
+        ReverseUnit(MyUnitIDS.currency_myr,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_myr,      R.string.currency_myr_short),
+        ReverseUnit(MyUnitIDS.currency_mzn,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_mzn,      R.string.currency_mzn_short),
+        ReverseUnit(MyUnitIDS.currency_nad,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_nad,      R.string.currency_nad_short),
+        ReverseUnit(MyUnitIDS.currency_ngn,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_ngn,      R.string.currency_ngn_short),
+        ReverseUnit(MyUnitIDS.currency_nio,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_nio,      R.string.currency_nio_short),
+        ReverseUnit(MyUnitIDS.currency_nok,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_nok,      R.string.currency_nok_short),
+        ReverseUnit(MyUnitIDS.currency_npr,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_npr,      R.string.currency_npr_short),
+        ReverseUnit(MyUnitIDS.currency_nzd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_nzd,      R.string.currency_nzd_short),
+        ReverseUnit(MyUnitIDS.currency_omr,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_omr,      R.string.currency_omr_short),
+        ReverseUnit(MyUnitIDS.currency_one,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_one,      R.string.currency_one_short),
+        ReverseUnit(MyUnitIDS.currency_pab,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_pab,      R.string.currency_pab_short),
+        ReverseUnit(MyUnitIDS.currency_pen,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_pen,      R.string.currency_pen_short),
+        ReverseUnit(MyUnitIDS.currency_pgk,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_pgk,      R.string.currency_pgk_short),
+        ReverseUnit(MyUnitIDS.currency_php,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_php,      R.string.currency_php_short),
+        ReverseUnit(MyUnitIDS.currency_pkr,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_pkr,      R.string.currency_pkr_short),
+        ReverseUnit(MyUnitIDS.currency_pln,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_pln,      R.string.currency_pln_short),
+        ReverseUnit(MyUnitIDS.currency_pyg,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_pyg,      R.string.currency_pyg_short),
+        ReverseUnit(MyUnitIDS.currency_qar,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_qar,      R.string.currency_qar_short),
+        ReverseUnit(MyUnitIDS.currency_ron,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_ron,      R.string.currency_ron_short),
+        ReverseUnit(MyUnitIDS.currency_rsd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_rsd,      R.string.currency_rsd_short),
+        ReverseUnit(MyUnitIDS.currency_rub,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_rub,      R.string.currency_rub_short),
+        ReverseUnit(MyUnitIDS.currency_rwf,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_rwf,      R.string.currency_rwf_short),
+        ReverseUnit(MyUnitIDS.currency_sar,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_sar,      R.string.currency_sar_short),
+        ReverseUnit(MyUnitIDS.currency_sbd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_sbd,      R.string.currency_sbd_short),
+        ReverseUnit(MyUnitIDS.currency_scr,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_scr,      R.string.currency_scr_short),
+        ReverseUnit(MyUnitIDS.currency_sdg,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_sdg,      R.string.currency_sdg_short),
+        ReverseUnit(MyUnitIDS.currency_sek,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_sek,      R.string.currency_sek_short),
+        ReverseUnit(MyUnitIDS.currency_sgd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_sgd,      R.string.currency_sgd_short),
+        ReverseUnit(MyUnitIDS.currency_shib,     BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_shib,     R.string.currency_shib_short),
+        ReverseUnit(MyUnitIDS.currency_shp,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_shp,      R.string.currency_shp_short),
+        ReverseUnit(MyUnitIDS.currency_sll,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_sll,      R.string.currency_sll_short),
+        ReverseUnit(MyUnitIDS.currency_sol,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_sol,      R.string.currency_sol_short),
+        ReverseUnit(MyUnitIDS.currency_sos,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_sos,      R.string.currency_sos_short),
+        ReverseUnit(MyUnitIDS.currency_srd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_srd,      R.string.currency_srd_short),
+        ReverseUnit(MyUnitIDS.currency_std,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_std,      R.string.currency_std_short),
+        ReverseUnit(MyUnitIDS.currency_svc,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_svc,      R.string.currency_svc_short),
+        ReverseUnit(MyUnitIDS.currency_syp,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_syp,      R.string.currency_syp_short),
+        ReverseUnit(MyUnitIDS.currency_szl,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_szl,      R.string.currency_szl_short),
+        ReverseUnit(MyUnitIDS.currency_thb,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_thb,      R.string.currency_thb_short),
+        ReverseUnit(MyUnitIDS.currency_theta,    BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_theta,    R.string.currency_theta_short),
+        ReverseUnit(MyUnitIDS.currency_tjs,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_tjs,      R.string.currency_tjs_short),
+        ReverseUnit(MyUnitIDS.currency_tmt,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_tmt,      R.string.currency_tmt_short),
+        ReverseUnit(MyUnitIDS.currency_tnd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_tnd,      R.string.currency_tnd_short),
+        ReverseUnit(MyUnitIDS.currency_top,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_top,      R.string.currency_top_short),
+        ReverseUnit(MyUnitIDS.currency_trx,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_trx,      R.string.currency_trx_short),
+        ReverseUnit(MyUnitIDS.currency_try,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_try,      R.string.currency_try_short),
+        ReverseUnit(MyUnitIDS.currency_ttd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_ttd,      R.string.currency_ttd_short),
+        ReverseUnit(MyUnitIDS.currency_twd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_twd,      R.string.currency_twd_short),
+        ReverseUnit(MyUnitIDS.currency_tzs,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_tzs,      R.string.currency_tzs_short),
+        ReverseUnit(MyUnitIDS.currency_uah,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_uah,      R.string.currency_uah_short),
+        ReverseUnit(MyUnitIDS.currency_ugx,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_ugx,      R.string.currency_ugx_short),
+        ReverseUnit(MyUnitIDS.currency_uni,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_uni,      R.string.currency_uni_short),
+        ReverseUnit(MyUnitIDS.currency_usd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_usd,      R.string.currency_usd_short),
+        ReverseUnit(MyUnitIDS.currency_usdc,     BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_usdc,     R.string.currency_usdc_short),
+        ReverseUnit(MyUnitIDS.currency_usdt,     BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_usdt,     R.string.currency_usdt_short),
+        ReverseUnit(MyUnitIDS.currency_uyu,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_uyu,      R.string.currency_uyu_short),
+        ReverseUnit(MyUnitIDS.currency_uzs,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_uzs,      R.string.currency_uzs_short),
+        ReverseUnit(MyUnitIDS.currency_vef,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_vef,      R.string.currency_vef_short),
+        ReverseUnit(MyUnitIDS.currency_vet,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_vet,      R.string.currency_vet_short),
+        ReverseUnit(MyUnitIDS.currency_vnd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_vnd,      R.string.currency_vnd_short),
+        ReverseUnit(MyUnitIDS.currency_vuv,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_vuv,      R.string.currency_vuv_short),
+        ReverseUnit(MyUnitIDS.currency_wbtc,     BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_wbtc,     R.string.currency_wbtc_short),
+        ReverseUnit(MyUnitIDS.currency_wst,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_wst,      R.string.currency_wst_short),
+        ReverseUnit(MyUnitIDS.currency_xaf,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_xaf,      R.string.currency_xaf_short),
+        ReverseUnit(MyUnitIDS.currency_xag,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_xag,      R.string.currency_xag_short),
+        ReverseUnit(MyUnitIDS.currency_xau,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_xau,      R.string.currency_xau_short),
+        ReverseUnit(MyUnitIDS.currency_xcd,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_xcd,      R.string.currency_xcd_short),
+        ReverseUnit(MyUnitIDS.currency_xdr,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_xdr,      R.string.currency_xdr_short),
+        ReverseUnit(MyUnitIDS.currency_xlm,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_xlm,      R.string.currency_xlm_short),
+        ReverseUnit(MyUnitIDS.currency_xmr,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_xmr,      R.string.currency_xmr_short),
+        ReverseUnit(MyUnitIDS.currency_xof,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_xof,      R.string.currency_xof_short),
+        ReverseUnit(MyUnitIDS.currency_xpf,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_xpf,      R.string.currency_xpf_short),
+        ReverseUnit(MyUnitIDS.currency_xrp,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_xrp,      R.string.currency_xrp_short),
+        ReverseUnit(MyUnitIDS.currency_yer,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_yer,      R.string.currency_yer_short),
+        ReverseUnit(MyUnitIDS.currency_zar,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_zar,      R.string.currency_zar_short),
+        ReverseUnit(MyUnitIDS.currency_zmk,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_zmk,      R.string.currency_zmk_short),
+        ReverseUnit(MyUnitIDS.currency_zmw,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_zmw,      R.string.currency_zmw_short),
+        ReverseUnit(MyUnitIDS.currency_zwl,      BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.currency_zwl,      R.string.currency_zwl_short),
     )
-}
\ No newline at end of file
+}
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Data.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Data.kt
index 9efc0382..b3ec3a35 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Data.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Data.kt
@@ -19,33 +19,33 @@
 package com.sadellie.unitto.data.units.collections
 
 import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.DefaultUnit
 import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.NormalUnit
 import com.sadellie.unitto.data.units.MyUnitIDS
 import java.math.BigDecimal
 
 internal val dataCollection: List<AbstractUnit> by lazy {
     listOf(
-        DefaultUnit(MyUnitIDS.bit,       BigDecimal.valueOf(1),                          UnitGroup.DATA, R.string.bit,       R.string.bit_short),
-        DefaultUnit(MyUnitIDS.kibibit,   BigDecimal.valueOf(1_024),                      UnitGroup.DATA, R.string.kibibit,   R.string.kibibit_short),
-        DefaultUnit(MyUnitIDS.kilobit,   BigDecimal.valueOf(1_000),                      UnitGroup.DATA, R.string.kilobit,   R.string.kilobit_short),
-        DefaultUnit(MyUnitIDS.megabit,   BigDecimal.valueOf(1_000_000),                  UnitGroup.DATA, R.string.megabit,   R.string.megabit_short),
-        DefaultUnit(MyUnitIDS.mebibit,   BigDecimal.valueOf(1_048_576),                  UnitGroup.DATA, R.string.mebibit,   R.string.mebibit_short),
-        DefaultUnit(MyUnitIDS.gigabit,   BigDecimal.valueOf(1_000_000_000),              UnitGroup.DATA, R.string.gigabit,   R.string.gigabit_short),
-        DefaultUnit(MyUnitIDS.gibibit,   BigDecimal.valueOf(1_073_741_824),              UnitGroup.DATA, R.string.gibibit,   R.string.gibibit_short),
-        DefaultUnit(MyUnitIDS.terabit,   BigDecimal.valueOf(1_000_000_000_000),          UnitGroup.DATA, R.string.terabit,   R.string.terabit_short),
-        DefaultUnit(MyUnitIDS.petabit,   BigDecimal.valueOf(1_000_000_000_000_000),      UnitGroup.DATA, R.string.petabit,   R.string.petabit_short),
-        DefaultUnit(MyUnitIDS.exabit,    BigDecimal.valueOf(1_000_000_000_000_000_000),  UnitGroup.DATA, R.string.exabit,    R.string.exabit_short),
-        DefaultUnit(MyUnitIDS.byte,      BigDecimal.valueOf(8),                          UnitGroup.DATA, R.string.byte_,     R.string.byte_short),
-        DefaultUnit(MyUnitIDS.kibibyte,  BigDecimal.valueOf(8_192),                      UnitGroup.DATA, R.string.kibibyte,  R.string.kibibyte_short),
-        DefaultUnit(MyUnitIDS.kilobyte,  BigDecimal.valueOf(8_000),                      UnitGroup.DATA, R.string.kilobyte,  R.string.kilobyte_short),
-        DefaultUnit(MyUnitIDS.megabyte,  BigDecimal.valueOf(8_000_000),                  UnitGroup.DATA, R.string.megabyte,  R.string.megabyte_short),
-        DefaultUnit(MyUnitIDS.mebibyte,  BigDecimal.valueOf(8_388_608),                  UnitGroup.DATA, R.string.mebibyte,  R.string.mebibyte_short),
-        DefaultUnit(MyUnitIDS.gigabyte,  BigDecimal.valueOf(8_000_000_000),              UnitGroup.DATA, R.string.gigabyte,  R.string.gigabyte_short),
-        DefaultUnit(MyUnitIDS.gibibyte,  BigDecimal.valueOf(8_589_934_592),              UnitGroup.DATA, R.string.gibibyte,  R.string.gibibyte_short),
-        DefaultUnit(MyUnitIDS.terabyte,  BigDecimal.valueOf(8_000_000_000_000),          UnitGroup.DATA, R.string.terabyte,  R.string.terabyte_short),
-        DefaultUnit(MyUnitIDS.petabyte,  BigDecimal.valueOf(8_000_000_000_000_000),      UnitGroup.DATA, R.string.petabyte,  R.string.petabyte_short),
-        DefaultUnit(MyUnitIDS.exabyte,   BigDecimal.valueOf(8_000_000_000_000_000_000),  UnitGroup.DATA, R.string.exabyte,   R.string.exabyte_short),
+        NormalUnit(MyUnitIDS.bit,       BigDecimal.valueOf(1),                          UnitGroup.DATA, R.string.bit,       R.string.bit_short),
+        NormalUnit(MyUnitIDS.kibibit,   BigDecimal.valueOf(1_024),                      UnitGroup.DATA, R.string.kibibit,   R.string.kibibit_short),
+        NormalUnit(MyUnitIDS.kilobit,   BigDecimal.valueOf(1_000),                      UnitGroup.DATA, R.string.kilobit,   R.string.kilobit_short),
+        NormalUnit(MyUnitIDS.megabit,   BigDecimal.valueOf(1_000_000),                  UnitGroup.DATA, R.string.megabit,   R.string.megabit_short),
+        NormalUnit(MyUnitIDS.mebibit,   BigDecimal.valueOf(1_048_576),                  UnitGroup.DATA, R.string.mebibit,   R.string.mebibit_short),
+        NormalUnit(MyUnitIDS.gigabit,   BigDecimal.valueOf(1_000_000_000),              UnitGroup.DATA, R.string.gigabit,   R.string.gigabit_short),
+        NormalUnit(MyUnitIDS.gibibit,   BigDecimal.valueOf(1_073_741_824),              UnitGroup.DATA, R.string.gibibit,   R.string.gibibit_short),
+        NormalUnit(MyUnitIDS.terabit,   BigDecimal.valueOf(1_000_000_000_000),          UnitGroup.DATA, R.string.terabit,   R.string.terabit_short),
+        NormalUnit(MyUnitIDS.petabit,   BigDecimal.valueOf(1_000_000_000_000_000),      UnitGroup.DATA, R.string.petabit,   R.string.petabit_short),
+        NormalUnit(MyUnitIDS.exabit,    BigDecimal.valueOf(1_000_000_000_000_000_000),  UnitGroup.DATA, R.string.exabit,    R.string.exabit_short),
+        NormalUnit(MyUnitIDS.byte,      BigDecimal.valueOf(8),                          UnitGroup.DATA, R.string.byte_,     R.string.byte_short),
+        NormalUnit(MyUnitIDS.kibibyte,  BigDecimal.valueOf(8_192),                      UnitGroup.DATA, R.string.kibibyte,  R.string.kibibyte_short),
+        NormalUnit(MyUnitIDS.kilobyte,  BigDecimal.valueOf(8_000),                      UnitGroup.DATA, R.string.kilobyte,  R.string.kilobyte_short),
+        NormalUnit(MyUnitIDS.megabyte,  BigDecimal.valueOf(8_000_000),                  UnitGroup.DATA, R.string.megabyte,  R.string.megabyte_short),
+        NormalUnit(MyUnitIDS.mebibyte,  BigDecimal.valueOf(8_388_608),                  UnitGroup.DATA, R.string.mebibyte,  R.string.mebibyte_short),
+        NormalUnit(MyUnitIDS.gigabyte,  BigDecimal.valueOf(8_000_000_000),              UnitGroup.DATA, R.string.gigabyte,  R.string.gigabyte_short),
+        NormalUnit(MyUnitIDS.gibibyte,  BigDecimal.valueOf(8_589_934_592),              UnitGroup.DATA, R.string.gibibyte,  R.string.gibibyte_short),
+        NormalUnit(MyUnitIDS.terabyte,  BigDecimal.valueOf(8_000_000_000_000),          UnitGroup.DATA, R.string.terabyte,  R.string.terabyte_short),
+        NormalUnit(MyUnitIDS.petabyte,  BigDecimal.valueOf(8_000_000_000_000_000),      UnitGroup.DATA, R.string.petabyte,  R.string.petabyte_short),
+        NormalUnit(MyUnitIDS.exabyte,   BigDecimal.valueOf(8_000_000_000_000_000_000),  UnitGroup.DATA, R.string.exabyte,   R.string.exabyte_short),
     )
-}
\ No newline at end of file
+}
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/DataTransfer.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/DataTransfer.kt
index 974e0796..a642d7de 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/DataTransfer.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/DataTransfer.kt
@@ -19,33 +19,33 @@
 package com.sadellie.unitto.data.units.collections
 
 import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.DefaultUnit
 import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.NormalUnit
 import com.sadellie.unitto.data.units.MyUnitIDS
 import java.math.BigDecimal
 
 internal val dataTransferCollection: List<AbstractUnit> by lazy {
     listOf(
-        DefaultUnit(MyUnitIDS.bit_per_second,        BigDecimal.valueOf(1),                          UnitGroup.DATA_TRANSFER, R.string.bit_per_second,        R.string.bit_per_second_short),
-        DefaultUnit(MyUnitIDS.kibibit_per_second,    BigDecimal.valueOf(1_024),                      UnitGroup.DATA_TRANSFER, R.string.kibibit_per_second,    R.string.kibibit_per_second_short),
-        DefaultUnit(MyUnitIDS.kilobit_per_second,    BigDecimal.valueOf(1_000),                      UnitGroup.DATA_TRANSFER, R.string.kilobit_per_second,    R.string.kilobit_per_second_short),
-        DefaultUnit(MyUnitIDS.megabit_per_second,    BigDecimal.valueOf(1_000_000),                  UnitGroup.DATA_TRANSFER, R.string.megabit_per_second,    R.string.megabit_per_second_short),
-        DefaultUnit(MyUnitIDS.mebibit_per_second,    BigDecimal.valueOf(1_048_576),                  UnitGroup.DATA_TRANSFER, R.string.mebibit_per_second,    R.string.mebibit_per_second_short),
-        DefaultUnit(MyUnitIDS.gigabit_per_second,    BigDecimal.valueOf(1_000_000_000),              UnitGroup.DATA_TRANSFER, R.string.gigabit_per_second,    R.string.gigabit_per_second_short),
-        DefaultUnit(MyUnitIDS.gibibit_per_second,    BigDecimal.valueOf(1_073_741_824),              UnitGroup.DATA_TRANSFER, R.string.gibibit_per_second,    R.string.gibibit_per_second_short),
-        DefaultUnit(MyUnitIDS.terabit_per_second,    BigDecimal.valueOf(1_000_000_000_000),          UnitGroup.DATA_TRANSFER, R.string.terabit_per_second,    R.string.terabit_per_second_short),
-        DefaultUnit(MyUnitIDS.petabit_per_second,    BigDecimal.valueOf(1_000_000_000_000_000),      UnitGroup.DATA_TRANSFER, R.string.petabit_per_second,    R.string.petabit_per_second_short),
-        DefaultUnit(MyUnitIDS.exabit_per_second,     BigDecimal.valueOf(1_000_000_000_000_000_000),  UnitGroup.DATA_TRANSFER, R.string.exabit_per_second,     R.string.exabit_per_second_short),
-        DefaultUnit(MyUnitIDS.byte_per_second,       BigDecimal.valueOf(8),                          UnitGroup.DATA_TRANSFER, R.string.byte_per_second,       R.string.byte_per_second_short),
-        DefaultUnit(MyUnitIDS.kibibyte_per_second,   BigDecimal.valueOf(8_192),                      UnitGroup.DATA_TRANSFER, R.string.kibibyte_per_second,   R.string.kibibyte_per_second_short),
-        DefaultUnit(MyUnitIDS.kilobyte_per_second,   BigDecimal.valueOf(8_000),                      UnitGroup.DATA_TRANSFER, R.string.kilobyte_per_second,   R.string.kilobyte_per_second_short),
-        DefaultUnit(MyUnitIDS.megabyte_per_second,   BigDecimal.valueOf(8_000_000),                  UnitGroup.DATA_TRANSFER, R.string.megabyte_per_second,   R.string.megabyte_per_second_short),
-        DefaultUnit(MyUnitIDS.mebibyte_per_second,   BigDecimal.valueOf(8_388_608),                  UnitGroup.DATA_TRANSFER, R.string.mebibyte_per_second,   R.string.mebibyte_per_second_short),
-        DefaultUnit(MyUnitIDS.gigabyte_per_second,   BigDecimal.valueOf(8_000_000_000),              UnitGroup.DATA_TRANSFER, R.string.gigabyte_per_second,   R.string.gigabyte_per_second_short),
-        DefaultUnit(MyUnitIDS.gibibyte_per_second,   BigDecimal.valueOf(8_589_934_592),              UnitGroup.DATA_TRANSFER, R.string.gibibyte_per_second,   R.string.gibibyte_per_second_short),
-        DefaultUnit(MyUnitIDS.terabyte_per_second,   BigDecimal.valueOf(8_000_000_000_000),          UnitGroup.DATA_TRANSFER, R.string.terabyte_per_second,   R.string.terabyte_per_second_short),
-        DefaultUnit(MyUnitIDS.petabyte_per_second,   BigDecimal.valueOf(8_000_000_000_000_000),      UnitGroup.DATA_TRANSFER, R.string.petabyte_per_second,   R.string.petabyte_per_second_short),
-        DefaultUnit(MyUnitIDS.exabyte_per_second,    BigDecimal.valueOf(8_000_000_000_000_000_000),  UnitGroup.DATA_TRANSFER, R.string.exabyte_per_second,    R.string.exabyte_per_second_short),
+        NormalUnit(MyUnitIDS.bit_per_second,        BigDecimal.valueOf(1),                          UnitGroup.DATA_TRANSFER, R.string.bit_per_second,        R.string.bit_per_second_short),
+        NormalUnit(MyUnitIDS.kibibit_per_second,    BigDecimal.valueOf(1_024),                      UnitGroup.DATA_TRANSFER, R.string.kibibit_per_second,    R.string.kibibit_per_second_short),
+        NormalUnit(MyUnitIDS.kilobit_per_second,    BigDecimal.valueOf(1_000),                      UnitGroup.DATA_TRANSFER, R.string.kilobit_per_second,    R.string.kilobit_per_second_short),
+        NormalUnit(MyUnitIDS.megabit_per_second,    BigDecimal.valueOf(1_000_000),                  UnitGroup.DATA_TRANSFER, R.string.megabit_per_second,    R.string.megabit_per_second_short),
+        NormalUnit(MyUnitIDS.mebibit_per_second,    BigDecimal.valueOf(1_048_576),                  UnitGroup.DATA_TRANSFER, R.string.mebibit_per_second,    R.string.mebibit_per_second_short),
+        NormalUnit(MyUnitIDS.gigabit_per_second,    BigDecimal.valueOf(1_000_000_000),              UnitGroup.DATA_TRANSFER, R.string.gigabit_per_second,    R.string.gigabit_per_second_short),
+        NormalUnit(MyUnitIDS.gibibit_per_second,    BigDecimal.valueOf(1_073_741_824),              UnitGroup.DATA_TRANSFER, R.string.gibibit_per_second,    R.string.gibibit_per_second_short),
+        NormalUnit(MyUnitIDS.terabit_per_second,    BigDecimal.valueOf(1_000_000_000_000),          UnitGroup.DATA_TRANSFER, R.string.terabit_per_second,    R.string.terabit_per_second_short),
+        NormalUnit(MyUnitIDS.petabit_per_second,    BigDecimal.valueOf(1_000_000_000_000_000),      UnitGroup.DATA_TRANSFER, R.string.petabit_per_second,    R.string.petabit_per_second_short),
+        NormalUnit(MyUnitIDS.exabit_per_second,     BigDecimal.valueOf(1_000_000_000_000_000_000),  UnitGroup.DATA_TRANSFER, R.string.exabit_per_second,     R.string.exabit_per_second_short),
+        NormalUnit(MyUnitIDS.byte_per_second,       BigDecimal.valueOf(8),                          UnitGroup.DATA_TRANSFER, R.string.byte_per_second,       R.string.byte_per_second_short),
+        NormalUnit(MyUnitIDS.kibibyte_per_second,   BigDecimal.valueOf(8_192),                      UnitGroup.DATA_TRANSFER, R.string.kibibyte_per_second,   R.string.kibibyte_per_second_short),
+        NormalUnit(MyUnitIDS.kilobyte_per_second,   BigDecimal.valueOf(8_000),                      UnitGroup.DATA_TRANSFER, R.string.kilobyte_per_second,   R.string.kilobyte_per_second_short),
+        NormalUnit(MyUnitIDS.megabyte_per_second,   BigDecimal.valueOf(8_000_000),                  UnitGroup.DATA_TRANSFER, R.string.megabyte_per_second,   R.string.megabyte_per_second_short),
+        NormalUnit(MyUnitIDS.mebibyte_per_second,   BigDecimal.valueOf(8_388_608),                  UnitGroup.DATA_TRANSFER, R.string.mebibyte_per_second,   R.string.mebibyte_per_second_short),
+        NormalUnit(MyUnitIDS.gigabyte_per_second,   BigDecimal.valueOf(8_000_000_000),              UnitGroup.DATA_TRANSFER, R.string.gigabyte_per_second,   R.string.gigabyte_per_second_short),
+        NormalUnit(MyUnitIDS.gibibyte_per_second,   BigDecimal.valueOf(8_589_934_592),              UnitGroup.DATA_TRANSFER, R.string.gibibyte_per_second,   R.string.gibibyte_per_second_short),
+        NormalUnit(MyUnitIDS.terabyte_per_second,   BigDecimal.valueOf(8_000_000_000_000),          UnitGroup.DATA_TRANSFER, R.string.terabyte_per_second,   R.string.terabyte_per_second_short),
+        NormalUnit(MyUnitIDS.petabyte_per_second,   BigDecimal.valueOf(8_000_000_000_000_000),      UnitGroup.DATA_TRANSFER, R.string.petabyte_per_second,   R.string.petabyte_per_second_short),
+        NormalUnit(MyUnitIDS.exabyte_per_second,    BigDecimal.valueOf(8_000_000_000_000_000_000),  UnitGroup.DATA_TRANSFER, R.string.exabyte_per_second,    R.string.exabyte_per_second_short),
     )
-}
\ No newline at end of file
+}
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/ElectrostaticCapacitance.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/ElectrostaticCapacitance.kt
new file mode 100644
index 00000000..f004a9cc
--- /dev/null
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/ElectrostaticCapacitance.kt
@@ -0,0 +1,43 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.data.units.collections
+
+import com.sadellie.unitto.core.base.R
+import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.NormalUnit
+import com.sadellie.unitto.data.units.MyUnitIDS
+import java.math.BigDecimal
+
+internal val electrostaticCapacitance: List<AbstractUnit> by lazy {
+    listOf(
+        NormalUnit(MyUnitIDS.attofarad,     BigDecimal.valueOf(1),              UnitGroup.ELECTROSTATIC_CAPACITANCE,    R.string.attofarad,     R.string.attofarad_short),
+        NormalUnit(MyUnitIDS.picofarad,     BigDecimal.valueOf(1E+6),           UnitGroup.ELECTROSTATIC_CAPACITANCE,    R.string.picofarad,     R.string.picofarad_short),
+        NormalUnit(MyUnitIDS.statfarad,     BigDecimal.valueOf(1112650.0561),   UnitGroup.ELECTROSTATIC_CAPACITANCE,    R.string.statfarad,     R.string.statfarad_short),
+        NormalUnit(MyUnitIDS.nanofarad,     BigDecimal.valueOf(1E+9),           UnitGroup.ELECTROSTATIC_CAPACITANCE,    R.string.nanofarad,     R.string.nanofarad_short),
+        NormalUnit(MyUnitIDS.microfarad,    BigDecimal.valueOf(1E+12),          UnitGroup.ELECTROSTATIC_CAPACITANCE,    R.string.microfarad,    R.string.microfarad_short),
+        NormalUnit(MyUnitIDS.millifarad,    BigDecimal.valueOf(1E+15),          UnitGroup.ELECTROSTATIC_CAPACITANCE,    R.string.millifarad,    R.string.millifarad_short),
+        NormalUnit(MyUnitIDS.farad,         BigDecimal.valueOf(1E+18),          UnitGroup.ELECTROSTATIC_CAPACITANCE,    R.string.farad,         R.string.farad_short),
+        NormalUnit(MyUnitIDS.kilofarad,     BigDecimal.valueOf(1E+21),          UnitGroup.ELECTROSTATIC_CAPACITANCE,    R.string.kilofarad,     R.string.kilofarad_short),
+        NormalUnit(MyUnitIDS.megafarad,     BigDecimal.valueOf(1E+24),          UnitGroup.ELECTROSTATIC_CAPACITANCE,    R.string.megafarad,     R.string.megafarad_short),
+        NormalUnit(MyUnitIDS.gigafarad,     BigDecimal.valueOf(1E+27),          UnitGroup.ELECTROSTATIC_CAPACITANCE,    R.string.gigafarad,     R.string.gigafarad_short),
+        NormalUnit(MyUnitIDS.petafarad,     BigDecimal.valueOf(1E+33),          UnitGroup.ELECTROSTATIC_CAPACITANCE,    R.string.petafarad,     R.string.petafarad_short),
+        NormalUnit(MyUnitIDS.exafarad,      BigDecimal.valueOf(1E+36),          UnitGroup.ELECTROSTATIC_CAPACITANCE,    R.string.exafarad,      R.string.exafarad_short),
+    )
+}
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Energy.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Energy.kt
index 939db2db..13e3c56e 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Energy.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Energy.kt
@@ -19,26 +19,26 @@
 package com.sadellie.unitto.data.units.collections
 
 import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.DefaultUnit
 import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.NormalUnit
 import com.sadellie.unitto.data.units.MyUnitIDS
 import java.math.BigDecimal
 
 internal val energyCollection: List<AbstractUnit> by lazy {
     listOf(
-        DefaultUnit(MyUnitIDS.electron_volt,             BigDecimal.valueOf(0.160217733),   UnitGroup.ENERGY,   R.string.electron_volt,             R.string.electron_volt_short),
-        DefaultUnit(MyUnitIDS.attojoule,                 BigDecimal.valueOf(1),             UnitGroup.ENERGY,   R.string.attojoule,                 R.string.attojoule_short),
-        DefaultUnit(MyUnitIDS.joule,                     BigDecimal.valueOf(1E+18),         UnitGroup.ENERGY,   R.string.joule,                     R.string.joule_short),
-        DefaultUnit(MyUnitIDS.kilojoule,                 BigDecimal.valueOf(1E+21),         UnitGroup.ENERGY,   R.string.kilojoule,                 R.string.kilojoule_short),
-        DefaultUnit(MyUnitIDS.megajoule,                 BigDecimal.valueOf(1E+24),         UnitGroup.ENERGY,   R.string.megajoule,                 R.string.megajoule_short),
-        DefaultUnit(MyUnitIDS.gigajoule,                 BigDecimal.valueOf(1E+27),         UnitGroup.ENERGY,   R.string.gigajoule,                 R.string.gigajoule_short),
-        DefaultUnit(MyUnitIDS.energy_ton,                BigDecimal.valueOf(4.184E+27),     UnitGroup.ENERGY,   R.string.energy_ton,                R.string.energy_ton_short),
-        DefaultUnit(MyUnitIDS.kiloton,                   BigDecimal.valueOf(4.184E+30),     UnitGroup.ENERGY,   R.string.kiloton,                   R.string.kiloton_short),
-        DefaultUnit(MyUnitIDS.megaton,                   BigDecimal.valueOf(4.184E+33),     UnitGroup.ENERGY,   R.string.megaton,                   R.string.megaton_short),
-        DefaultUnit(MyUnitIDS.gigaton,                   BigDecimal.valueOf(4.184E+36),     UnitGroup.ENERGY,   R.string.gigaton,                   R.string.gigaton_short),
-        DefaultUnit(MyUnitIDS.energy_horse_power_metric, BigDecimal.valueOf(2.6477955E+24), UnitGroup.ENERGY,   R.string.energy_horse_power_metric, R.string.energy_horse_power_metric_short),
-        DefaultUnit(MyUnitIDS.calorie_th,                BigDecimal.valueOf(4184E+15),      UnitGroup.ENERGY,   R.string.calorie_th,                R.string.calorie_th_short),
-        DefaultUnit(MyUnitIDS.kilocalorie_th,            BigDecimal.valueOf(4184E+18),      UnitGroup.ENERGY,   R.string.kilocalorie_th,            R.string.kilocalorie_th_short),
+        NormalUnit(MyUnitIDS.electron_volt,             BigDecimal.valueOf(0.160217733),   UnitGroup.ENERGY,   R.string.electron_volt,             R.string.electron_volt_short),
+        NormalUnit(MyUnitIDS.attojoule,                 BigDecimal.valueOf(1),             UnitGroup.ENERGY,   R.string.attojoule,                 R.string.attojoule_short),
+        NormalUnit(MyUnitIDS.joule,                     BigDecimal.valueOf(1E+18),         UnitGroup.ENERGY,   R.string.joule,                     R.string.joule_short),
+        NormalUnit(MyUnitIDS.kilojoule,                 BigDecimal.valueOf(1E+21),         UnitGroup.ENERGY,   R.string.kilojoule,                 R.string.kilojoule_short),
+        NormalUnit(MyUnitIDS.megajoule,                 BigDecimal.valueOf(1E+24),         UnitGroup.ENERGY,   R.string.megajoule,                 R.string.megajoule_short),
+        NormalUnit(MyUnitIDS.gigajoule,                 BigDecimal.valueOf(1E+27),         UnitGroup.ENERGY,   R.string.gigajoule,                 R.string.gigajoule_short),
+        NormalUnit(MyUnitIDS.energy_ton,                BigDecimal.valueOf(4.184E+27),     UnitGroup.ENERGY,   R.string.energy_ton,                R.string.energy_ton_short),
+        NormalUnit(MyUnitIDS.kiloton,                   BigDecimal.valueOf(4.184E+30),     UnitGroup.ENERGY,   R.string.kiloton,                   R.string.kiloton_short),
+        NormalUnit(MyUnitIDS.megaton,                   BigDecimal.valueOf(4.184E+33),     UnitGroup.ENERGY,   R.string.megaton,                   R.string.megaton_short),
+        NormalUnit(MyUnitIDS.gigaton,                   BigDecimal.valueOf(4.184E+36),     UnitGroup.ENERGY,   R.string.gigaton,                   R.string.gigaton_short),
+        NormalUnit(MyUnitIDS.energy_horse_power_metric, BigDecimal.valueOf(2.6477955E+24), UnitGroup.ENERGY,   R.string.energy_horse_power_metric, R.string.energy_horse_power_metric_short),
+        NormalUnit(MyUnitIDS.calorie_th,                BigDecimal.valueOf(4184E+15),      UnitGroup.ENERGY,   R.string.calorie_th,                R.string.calorie_th_short),
+        NormalUnit(MyUnitIDS.kilocalorie_th,            BigDecimal.valueOf(4184E+18),      UnitGroup.ENERGY,   R.string.kilocalorie_th,            R.string.kilocalorie_th_short),
     )
-}
\ No newline at end of file
+}
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/FlowRate.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/FlowRate.kt
index 962819b2..0602cb5c 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/FlowRate.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/FlowRate.kt
@@ -19,34 +19,34 @@
 package com.sadellie.unitto.data.units.collections
 
 import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.FlowRateUnit
 import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.ReverseUnit
 import com.sadellie.unitto.data.units.MyUnitIDS
 import java.math.BigDecimal
 
 val flowRateCollection: List<AbstractUnit> by lazy {
     listOf(
-        FlowRateUnit(MyUnitIDS.liter_per_hour,                BigDecimal.valueOf(3600000),          UnitGroup.FLOW_RATE, R.string.liter_per_hour,               R.string.liter_per_hour_short),
-        FlowRateUnit(MyUnitIDS.liter_per_minute,              BigDecimal.valueOf(60000),            UnitGroup.FLOW_RATE, R.string.liter_per_minute,             R.string.liter_per_minute_short),
-        FlowRateUnit(MyUnitIDS.liter_per_second,              BigDecimal.valueOf(1000),             UnitGroup.FLOW_RATE, R.string.liter_per_second,             R.string.liter_per_second_short),
-        FlowRateUnit(MyUnitIDS.milliliter_per_hour,           BigDecimal.valueOf(3600000000),       UnitGroup.FLOW_RATE, R.string.milliliter_per_hour,          R.string.milliliter_per_hour_short),
-        FlowRateUnit(MyUnitIDS.milliliter_per_minute,         BigDecimal.valueOf(60000000),         UnitGroup.FLOW_RATE, R.string.milliliter_per_minute,        R.string.milliliter_per_minute_short),
-        FlowRateUnit(MyUnitIDS.milliliter_per_second,         BigDecimal.valueOf(1000000),          UnitGroup.FLOW_RATE, R.string.milliliter_per_second,        R.string.milliliter_per_second_short),
-        FlowRateUnit(MyUnitIDS.cubic_meter_per_hour,          BigDecimal.valueOf(3600),             UnitGroup.FLOW_RATE, R.string.cubic_meter_per_hour,         R.string.cubic_meter_per_hour_short),
-        FlowRateUnit(MyUnitIDS.cubic_meter_per_minute,        BigDecimal.valueOf(60),               UnitGroup.FLOW_RATE, R.string.cubic_meter_per_minute,       R.string.cubic_meter_per_minute_short),
-        FlowRateUnit(MyUnitIDS.cubic_meter_per_second,        BigDecimal.valueOf(1),                UnitGroup.FLOW_RATE, R.string.cubic_meter_per_second,       R.string.cubic_meter_per_second_short),
-        FlowRateUnit(MyUnitIDS.cubic_millimeter_per_hour,     BigDecimal.valueOf(3600000000000),    UnitGroup.FLOW_RATE, R.string.cubic_millimeter_per_hour,    R.string.cubic_millimeter_per_hour_short),
-        FlowRateUnit(MyUnitIDS.cubic_millimeter_per_minute,   BigDecimal.valueOf(60000000000),      UnitGroup.FLOW_RATE, R.string.cubic_millimeter_per_minute,  R.string.cubic_millimeter_per_minute_short),
-        FlowRateUnit(MyUnitIDS.cubic_millimeter_per_second,   BigDecimal.valueOf(1000000000),       UnitGroup.FLOW_RATE, R.string.cubic_millimeter_per_second,  R.string.cubic_millimeter_per_second_short),
-        FlowRateUnit(MyUnitIDS.cubic_foot_per_hour,           BigDecimal.valueOf(127132.80019736),  UnitGroup.FLOW_RATE, R.string.cubic_foot_per_hour,          R.string.cubic_foot_per_hour_short),
-        FlowRateUnit(MyUnitIDS.cubic_foot_per_minute,         BigDecimal.valueOf(2118.8800032893),  UnitGroup.FLOW_RATE, R.string.cubic_foot_per_minute,        R.string.cubic_foot_per_minute_short),
-        FlowRateUnit(MyUnitIDS.cubic_foot_per_second,         BigDecimal.valueOf(35.314666721489),  UnitGroup.FLOW_RATE, R.string.cubic_foot_per_second,        R.string.cubic_foot_per_second_short),
-        FlowRateUnit(MyUnitIDS.gallons_per_hour_us,           BigDecimal.valueOf(951019.38848933),  UnitGroup.FLOW_RATE, R.string.gallon_per_hour_us,           R.string.gallon_per_hour_us_short),
-        FlowRateUnit(MyUnitIDS.gallons_per_minute_us,         BigDecimal.valueOf(15850.323141489),  UnitGroup.FLOW_RATE, R.string.gallon_per_minute_us,         R.string.gallon_per_minute_us_short),
-        FlowRateUnit(MyUnitIDS.gallons_per_second_us,         BigDecimal.valueOf(264.17205235815),  UnitGroup.FLOW_RATE, R.string.gallon_per_second_us,         R.string.gallon_per_second_us_short),
-        FlowRateUnit(MyUnitIDS.gallons_per_hour_imperial,     BigDecimal.valueOf(791889.29387672),  UnitGroup.FLOW_RATE, R.string.gallon_per_hour_imperial,     R.string.gallon_per_hour_imperial_short),
-        FlowRateUnit(MyUnitIDS.gallons_per_minute_imperial,   BigDecimal.valueOf(13198.154897945),  UnitGroup.FLOW_RATE, R.string.gallon_per_minute_imperial,   R.string.gallon_per_minute_imperial_short),
-        FlowRateUnit(MyUnitIDS.gallons_per_second_imperial,   BigDecimal.valueOf(219.96924829909),  UnitGroup.FLOW_RATE, R.string.gallon_per_second_imperial,   R.string.gallon_per_second_imperial_short),
+        ReverseUnit(MyUnitIDS.liter_per_hour,                BigDecimal.valueOf(3600000),          UnitGroup.FLOW_RATE, R.string.liter_per_hour,               R.string.liter_per_hour_short),
+        ReverseUnit(MyUnitIDS.liter_per_minute,              BigDecimal.valueOf(60000),            UnitGroup.FLOW_RATE, R.string.liter_per_minute,             R.string.liter_per_minute_short),
+        ReverseUnit(MyUnitIDS.liter_per_second,              BigDecimal.valueOf(1000),             UnitGroup.FLOW_RATE, R.string.liter_per_second,             R.string.liter_per_second_short),
+        ReverseUnit(MyUnitIDS.milliliter_per_hour,           BigDecimal.valueOf(3600000000),       UnitGroup.FLOW_RATE, R.string.milliliter_per_hour,          R.string.milliliter_per_hour_short),
+        ReverseUnit(MyUnitIDS.milliliter_per_minute,         BigDecimal.valueOf(60000000),         UnitGroup.FLOW_RATE, R.string.milliliter_per_minute,        R.string.milliliter_per_minute_short),
+        ReverseUnit(MyUnitIDS.milliliter_per_second,         BigDecimal.valueOf(1000000),          UnitGroup.FLOW_RATE, R.string.milliliter_per_second,        R.string.milliliter_per_second_short),
+        ReverseUnit(MyUnitIDS.cubic_meter_per_hour,          BigDecimal.valueOf(3600),             UnitGroup.FLOW_RATE, R.string.cubic_meter_per_hour,         R.string.cubic_meter_per_hour_short),
+        ReverseUnit(MyUnitIDS.cubic_meter_per_minute,        BigDecimal.valueOf(60),               UnitGroup.FLOW_RATE, R.string.cubic_meter_per_minute,       R.string.cubic_meter_per_minute_short),
+        ReverseUnit(MyUnitIDS.cubic_meter_per_second,        BigDecimal.valueOf(1),                UnitGroup.FLOW_RATE, R.string.cubic_meter_per_second,       R.string.cubic_meter_per_second_short),
+        ReverseUnit(MyUnitIDS.cubic_millimeter_per_hour,     BigDecimal.valueOf(3600000000000),    UnitGroup.FLOW_RATE, R.string.cubic_millimeter_per_hour,    R.string.cubic_millimeter_per_hour_short),
+        ReverseUnit(MyUnitIDS.cubic_millimeter_per_minute,   BigDecimal.valueOf(60000000000),      UnitGroup.FLOW_RATE, R.string.cubic_millimeter_per_minute,  R.string.cubic_millimeter_per_minute_short),
+        ReverseUnit(MyUnitIDS.cubic_millimeter_per_second,   BigDecimal.valueOf(1000000000),       UnitGroup.FLOW_RATE, R.string.cubic_millimeter_per_second,  R.string.cubic_millimeter_per_second_short),
+        ReverseUnit(MyUnitIDS.cubic_foot_per_hour,           BigDecimal.valueOf(127132.80019736),  UnitGroup.FLOW_RATE, R.string.cubic_foot_per_hour,          R.string.cubic_foot_per_hour_short),
+        ReverseUnit(MyUnitIDS.cubic_foot_per_minute,         BigDecimal.valueOf(2118.8800032893),  UnitGroup.FLOW_RATE, R.string.cubic_foot_per_minute,        R.string.cubic_foot_per_minute_short),
+        ReverseUnit(MyUnitIDS.cubic_foot_per_second,         BigDecimal.valueOf(35.314666721489),  UnitGroup.FLOW_RATE, R.string.cubic_foot_per_second,        R.string.cubic_foot_per_second_short),
+        ReverseUnit(MyUnitIDS.gallons_per_hour_us,           BigDecimal.valueOf(951019.38848933),  UnitGroup.FLOW_RATE, R.string.gallon_per_hour_us,           R.string.gallon_per_hour_us_short),
+        ReverseUnit(MyUnitIDS.gallons_per_minute_us,         BigDecimal.valueOf(15850.323141489),  UnitGroup.FLOW_RATE, R.string.gallon_per_minute_us,         R.string.gallon_per_minute_us_short),
+        ReverseUnit(MyUnitIDS.gallons_per_second_us,         BigDecimal.valueOf(264.17205235815),  UnitGroup.FLOW_RATE, R.string.gallon_per_second_us,         R.string.gallon_per_second_us_short),
+        ReverseUnit(MyUnitIDS.gallons_per_hour_imperial,     BigDecimal.valueOf(791889.29387672),  UnitGroup.FLOW_RATE, R.string.gallon_per_hour_imperial,     R.string.gallon_per_hour_imperial_short),
+        ReverseUnit(MyUnitIDS.gallons_per_minute_imperial,   BigDecimal.valueOf(13198.154897945),  UnitGroup.FLOW_RATE, R.string.gallon_per_minute_imperial,   R.string.gallon_per_minute_imperial_short),
+        ReverseUnit(MyUnitIDS.gallons_per_second_imperial,   BigDecimal.valueOf(219.96924829909),  UnitGroup.FLOW_RATE, R.string.gallon_per_second_imperial,   R.string.gallon_per_second_imperial_short),
     )
 }
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Flux.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Flux.kt
index a4a3a758..d569adc3 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Flux.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Flux.kt
@@ -19,20 +19,20 @@
 package com.sadellie.unitto.data.units.collections
 
 import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.DefaultUnit
 import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.NormalUnit
 import com.sadellie.unitto.data.units.MyUnitIDS
 import java.math.BigDecimal
 
 internal val fluxCollection: List<AbstractUnit> by lazy {
     listOf(
-        DefaultUnit(MyUnitIDS.maxwell,    BigDecimal.valueOf(1),                     UnitGroup.FLUX, R.string.maxwell,       R.string.maxwell_short),
-        DefaultUnit(MyUnitIDS.microweber, BigDecimal.valueOf(100),                   UnitGroup.FLUX, R.string.microweber,    R.string.microweber_short),
-        DefaultUnit(MyUnitIDS.milliweber, BigDecimal.valueOf(100000),                UnitGroup.FLUX, R.string.milliweber,    R.string.milliweber_short),
-        DefaultUnit(MyUnitIDS.weber,      BigDecimal.valueOf(100000000),             UnitGroup.FLUX, R.string.weber,         R.string.weber_short),
-        DefaultUnit(MyUnitIDS.kiloweber,  BigDecimal.valueOf(100000000000),          UnitGroup.FLUX, R.string.kiloweber,     R.string.kiloweber_short),
-        DefaultUnit(MyUnitIDS.megaweber,  BigDecimal.valueOf(100000000000000),       UnitGroup.FLUX, R.string.megaweber,     R.string.megaweber_short),
-        DefaultUnit(MyUnitIDS.gigaweber,  BigDecimal.valueOf(100000000000000000),    UnitGroup.FLUX, R.string.gigaweber,     R.string.gigaweber_short),
+        NormalUnit(MyUnitIDS.maxwell,    BigDecimal.valueOf(1),                     UnitGroup.FLUX, R.string.maxwell,       R.string.maxwell_short),
+        NormalUnit(MyUnitIDS.microweber, BigDecimal.valueOf(100),                   UnitGroup.FLUX, R.string.microweber,    R.string.microweber_short),
+        NormalUnit(MyUnitIDS.milliweber, BigDecimal.valueOf(100000),                UnitGroup.FLUX, R.string.milliweber,    R.string.milliweber_short),
+        NormalUnit(MyUnitIDS.weber,      BigDecimal.valueOf(100000000),             UnitGroup.FLUX, R.string.weber,         R.string.weber_short),
+        NormalUnit(MyUnitIDS.kiloweber,  BigDecimal.valueOf(100000000000),          UnitGroup.FLUX, R.string.kiloweber,     R.string.kiloweber_short),
+        NormalUnit(MyUnitIDS.megaweber,  BigDecimal.valueOf(100000000000000),       UnitGroup.FLUX, R.string.megaweber,     R.string.megaweber_short),
+        NormalUnit(MyUnitIDS.gigaweber,  BigDecimal.valueOf(100000000000000000),    UnitGroup.FLUX, R.string.gigaweber,     R.string.gigaweber_short),
     )
-}
\ No newline at end of file
+}
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Force.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Force.kt
index 7f9d41db..8f29278e 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Force.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Force.kt
@@ -19,28 +19,28 @@
 package com.sadellie.unitto.data.units.collections
 
 import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.DefaultUnit
 import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.NormalUnit
 import com.sadellie.unitto.data.units.MyUnitIDS
 import java.math.BigDecimal
 
 val forceCollection: List<AbstractUnit> by lazy {
     listOf(
-        DefaultUnit(MyUnitIDS.attonewton,            BigDecimal.valueOf(1),                      UnitGroup.FORCE,    R.string.attonewton,            R.string.attonewton_short),
-        DefaultUnit(MyUnitIDS.dyne,                  BigDecimal.valueOf(1E+13),                  UnitGroup.FORCE,    R.string.dyne,                  R.string.dyne_short),
-        DefaultUnit(MyUnitIDS.millinewton,           BigDecimal.valueOf(1E+15),                  UnitGroup.FORCE,    R.string.millinewton,           R.string.millinewton_short),
-        DefaultUnit(MyUnitIDS.joule_per_centimeter,  BigDecimal.valueOf(1E+16),                  UnitGroup.FORCE,    R.string.joule_per_centimeter,  R.string.joule_per_centimeter_short),
-        DefaultUnit(MyUnitIDS.newton,                BigDecimal.valueOf(1E+18),                  UnitGroup.FORCE,    R.string.newton,                R.string.newton_short),
-        DefaultUnit(MyUnitIDS.joule_per_meter,       BigDecimal.valueOf(1E+18),                  UnitGroup.FORCE,    R.string.joule_per_meter,       R.string.joule_per_meter_short),
-        DefaultUnit(MyUnitIDS.kilonewton,            BigDecimal.valueOf(1E+21),                  UnitGroup.FORCE,    R.string.kilonewton,            R.string.kilonewton_short),
-        DefaultUnit(MyUnitIDS.gram_force,            BigDecimal.valueOf(9.80665E+15),            UnitGroup.FORCE,    R.string.gram_force,            R.string.gram_force_short),
-        DefaultUnit(MyUnitIDS.kilogram_force,        BigDecimal.valueOf(9.80665E+18),            UnitGroup.FORCE,    R.string.kilogram_force,        R.string.kilogram_force_short),
-        DefaultUnit(MyUnitIDS.ton_force,             BigDecimal.valueOf(9.80665E+21),            UnitGroup.FORCE,    R.string.ton_force,             R.string.ton_force_short),
-        DefaultUnit(MyUnitIDS.ounce_force,           BigDecimal.valueOf(2.78013850953423008E17), UnitGroup.FORCE,    R.string.ounce_force,           R.string.ounce_force_short),
-        DefaultUnit(MyUnitIDS.pound_force,           BigDecimal.valueOf(4.4482216152550001E18),  UnitGroup.FORCE,    R.string.pound_force,           R.string.pound_force_short),
-        DefaultUnit(MyUnitIDS.kilopound_force,       BigDecimal.valueOf(4.448221615255E+21),     UnitGroup.FORCE,    R.string.kilopound_force,       R.string.kilopound_force_short),
-        DefaultUnit(MyUnitIDS.pond,                  BigDecimal.valueOf(9.80665E+15),            UnitGroup.FORCE,    R.string.pond,                  R.string.pond_short),
-        DefaultUnit(MyUnitIDS.kilopond,              BigDecimal.valueOf(9.80665E+18),            UnitGroup.FORCE,    R.string.kilopond,              R.string.kilopond_short),
+        NormalUnit(MyUnitIDS.attonewton,            BigDecimal.valueOf(1),                      UnitGroup.FORCE,    R.string.attonewton,            R.string.attonewton_short),
+        NormalUnit(MyUnitIDS.dyne,                  BigDecimal.valueOf(1E+13),                  UnitGroup.FORCE,    R.string.dyne,                  R.string.dyne_short),
+        NormalUnit(MyUnitIDS.millinewton,           BigDecimal.valueOf(1E+15),                  UnitGroup.FORCE,    R.string.millinewton,           R.string.millinewton_short),
+        NormalUnit(MyUnitIDS.joule_per_centimeter,  BigDecimal.valueOf(1E+16),                  UnitGroup.FORCE,    R.string.joule_per_centimeter,  R.string.joule_per_centimeter_short),
+        NormalUnit(MyUnitIDS.newton,                BigDecimal.valueOf(1E+18),                  UnitGroup.FORCE,    R.string.newton,                R.string.newton_short),
+        NormalUnit(MyUnitIDS.joule_per_meter,       BigDecimal.valueOf(1E+18),                  UnitGroup.FORCE,    R.string.joule_per_meter,       R.string.joule_per_meter_short),
+        NormalUnit(MyUnitIDS.kilonewton,            BigDecimal.valueOf(1E+21),                  UnitGroup.FORCE,    R.string.kilonewton,            R.string.kilonewton_short),
+        NormalUnit(MyUnitIDS.gram_force,            BigDecimal.valueOf(9.80665E+15),            UnitGroup.FORCE,    R.string.gram_force,            R.string.gram_force_short),
+        NormalUnit(MyUnitIDS.kilogram_force,        BigDecimal.valueOf(9.80665E+18),            UnitGroup.FORCE,    R.string.kilogram_force,        R.string.kilogram_force_short),
+        NormalUnit(MyUnitIDS.ton_force,             BigDecimal.valueOf(9.80665E+21),            UnitGroup.FORCE,    R.string.ton_force,             R.string.ton_force_short),
+        NormalUnit(MyUnitIDS.ounce_force,           BigDecimal.valueOf(2.78013850953423008E17), UnitGroup.FORCE,    R.string.ounce_force,           R.string.ounce_force_short),
+        NormalUnit(MyUnitIDS.pound_force,           BigDecimal.valueOf(4.4482216152550001E18),  UnitGroup.FORCE,    R.string.pound_force,           R.string.pound_force_short),
+        NormalUnit(MyUnitIDS.kilopound_force,       BigDecimal.valueOf(4.448221615255E+21),     UnitGroup.FORCE,    R.string.kilopound_force,       R.string.kilopound_force_short),
+        NormalUnit(MyUnitIDS.pond,                  BigDecimal.valueOf(9.80665E+15),            UnitGroup.FORCE,    R.string.pond,                  R.string.pond_short),
+        NormalUnit(MyUnitIDS.kilopond,              BigDecimal.valueOf(9.80665E+18),            UnitGroup.FORCE,    R.string.kilopond,              R.string.kilopond_short),
     )
 }
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/FuelConsumption.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/FuelConsumption.kt
new file mode 100644
index 00000000..cfe6ceaa
--- /dev/null
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/FuelConsumption.kt
@@ -0,0 +1,42 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.data.units.collections
+
+import com.sadellie.unitto.core.base.R
+import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.FuelBackward
+import com.sadellie.unitto.data.model.unit.FuelForward
+import com.sadellie.unitto.data.units.MyUnitIDS
+import java.math.BigDecimal
+
+val fuelConsumptionCollection: List<AbstractUnit> by lazy {
+    listOf(
+        FuelForward(MyUnitIDS.kilometer_per_liter, BigDecimal.valueOf(1), UnitGroup.FUEL_CONSUMPTION, R.string.km_per_l, R.string.km_per_l_short),
+        FuelBackward(MyUnitIDS.liter_per_kilometer, BigDecimal.valueOf(1), UnitGroup.FUEL_CONSUMPTION, R.string.l_per_km, R.string.l_per_km_short),
+        FuelBackward(MyUnitIDS.liter_per_100_kilometer, BigDecimal.valueOf(100), UnitGroup.FUEL_CONSUMPTION, R.string.l_per_100_km, R.string.l_per_100_km_short),
+        FuelForward(MyUnitIDS.mile_per_gallon_uk, BigDecimal.valueOf(0.35400619), UnitGroup.FUEL_CONSUMPTION, R.string.mi_per_gallon_uk, R.string.mi_per_gallon_uk_short),
+        FuelForward(MyUnitIDS.mile_per_gallon_us, BigDecimal.valueOf(0.4251437075), UnitGroup.FUEL_CONSUMPTION, R.string.mi_per_gallon_us, R.string.mi_per_gallon_us_short),
+        FuelForward(MyUnitIDS.mile_us_per_liter, BigDecimal.valueOf(1.609344), UnitGroup.FUEL_CONSUMPTION, R.string.mi_us_per_l, R.string.mi_us_per_l_short),
+        FuelBackward(MyUnitIDS.gallon_us_per_mile, BigDecimal.valueOf(0.4251437075), UnitGroup.FUEL_CONSUMPTION, R.string.gallon_us_per_mile, R.string.gallon_us_per_mile_short),
+        FuelBackward(MyUnitIDS.gallon_uk_per_mile, BigDecimal.valueOf(0.35400619), UnitGroup.FUEL_CONSUMPTION, R.string.gallon_uk_per_mile, R.string.gallon_uk_per_mile_short),
+        FuelBackward(MyUnitIDS.gallon_us_per_100_mile, BigDecimal.valueOf(42.51437075), UnitGroup.FUEL_CONSUMPTION, R.string.gallon_us_per_100_mile, R.string.gallon_us_per_100_mile_short),
+        FuelBackward(MyUnitIDS.gallon_uk_per_100_mile, BigDecimal.valueOf(35.400618996), UnitGroup.FUEL_CONSUMPTION, R.string.gallon_uk_per_100_mile, R.string.gallon_uk_per_100_mile_short),
+    )
+}
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Length.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Length.kt
index 6710164f..530d9477 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Length.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Length.kt
@@ -19,39 +19,39 @@
 package com.sadellie.unitto.data.units.collections
 
 import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.DefaultUnit
 import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.NormalUnit
 import com.sadellie.unitto.data.units.MyUnitIDS
 import java.math.BigDecimal
 
 internal val lengthCollection: List<AbstractUnit> by lazy {
     listOf(
-        DefaultUnit(MyUnitIDS.attometer,                 BigDecimal.valueOf(1.0),                             UnitGroup.LENGTH, R.string.attometer,                 R.string.attometer_short),
-        DefaultUnit(MyUnitIDS.nanometer,                 BigDecimal.valueOf(1.0E+9),                          UnitGroup.LENGTH, R.string.nanometer,                 R.string.nanometer_short),
-        DefaultUnit(MyUnitIDS.micrometer,                BigDecimal.valueOf(1.0E+12),                         UnitGroup.LENGTH, R.string.micrometer,                R.string.micrometer_short),
-        DefaultUnit(MyUnitIDS.millimeter,                BigDecimal.valueOf(1.0E+15),                         UnitGroup.LENGTH, R.string.millimeter,                R.string.millimeter_short),
-        DefaultUnit(MyUnitIDS.centimeter,                BigDecimal.valueOf(1.0E+16),                         UnitGroup.LENGTH, R.string.centimeter,                R.string.centimeter_short),
-        DefaultUnit(MyUnitIDS.decimeter,                 BigDecimal.valueOf(1.0E+17),                         UnitGroup.LENGTH, R.string.decimeter,                 R.string.decimeter_short),
-        DefaultUnit(MyUnitIDS.meter,                     BigDecimal.valueOf(1.0E+18),                         UnitGroup.LENGTH, R.string.meter,                     R.string.meter_short),
-        DefaultUnit(MyUnitIDS.kilometer,                 BigDecimal.valueOf(1.0E+21),                         UnitGroup.LENGTH, R.string.kilometer,                 R.string.kilometer_short),
-        DefaultUnit(MyUnitIDS.nautical_mile,             BigDecimal.valueOf(1.852E+21),                         UnitGroup.LENGTH, R.string.nautical_mile,             R.string.nautical_mile_short),
-        DefaultUnit(MyUnitIDS.inch,                      BigDecimal.valueOf(25_400_000_000_000_000),          UnitGroup.LENGTH, R.string.inch,                      R.string.inch_short),
-        DefaultUnit(MyUnitIDS.foot,                      BigDecimal.valueOf(304_800_000_000_002_200),         UnitGroup.LENGTH, R.string.foot,                      R.string.foot_short),
-        DefaultUnit(MyUnitIDS.yard,                      BigDecimal.valueOf(914_400_000_000_006_400),         UnitGroup.LENGTH, R.string.yard,                      R.string.yard_short),
-        DefaultUnit(MyUnitIDS.mile,                      BigDecimal.valueOf(1_609_344_000_000_010_500_000.0), UnitGroup.LENGTH, R.string.mile,                      R.string.mile_short),
-        DefaultUnit(MyUnitIDS.light_year,                BigDecimal.valueOf(9.460730472E+33),                 UnitGroup.LENGTH, R.string.light_year,                R.string.light_year_short),
-        DefaultUnit(MyUnitIDS.parsec,                    BigDecimal.valueOf(3.08567758149136E+34),            UnitGroup.LENGTH, R.string.parsec,                    R.string.parsec_short),
-        DefaultUnit(MyUnitIDS.kiloparsec,                BigDecimal.valueOf(3.08567758149136E+37),            UnitGroup.LENGTH, R.string.kiloparsec,                R.string.kiloparsec_short),
-        DefaultUnit(MyUnitIDS.megaparsec,                BigDecimal.valueOf(3.08567758149136E+40),            UnitGroup.LENGTH, R.string.megaparsec,                R.string.megaparsec_short),
-        DefaultUnit(MyUnitIDS.mercury_equatorial_radius, BigDecimal.valueOf(2.4397E+24),                      UnitGroup.LENGTH, R.string.mercury_equatorial_radius, R.string.mercury_equatorial_radius_short),
-        DefaultUnit(MyUnitIDS.venus_equatorial_radius,   BigDecimal.valueOf(6.0518E+24),                      UnitGroup.LENGTH, R.string.venus_equatorial_radius,   R.string.venus_equatorial_radius_short),
-        DefaultUnit(MyUnitIDS.earth_equatorial_radius,   BigDecimal.valueOf(6.371E+24),                       UnitGroup.LENGTH, R.string.earth_equatorial_radius,   R.string.earth_equatorial_radius_short),
-        DefaultUnit(MyUnitIDS.mars_equatorial_radius,    BigDecimal.valueOf(3.3895E+24),                      UnitGroup.LENGTH, R.string.mars_equatorial_radius,    R.string.mars_equatorial_radius_short),
-        DefaultUnit(MyUnitIDS.jupiter_equatorial_radius, BigDecimal.valueOf(6.9911E+25),                      UnitGroup.LENGTH, R.string.jupiter_equatorial_radius, R.string.jupiter_equatorial_radius_short),
-        DefaultUnit(MyUnitIDS.saturn_equatorial_radius,  BigDecimal.valueOf(5.8232E+25),                      UnitGroup.LENGTH, R.string.saturn_equatorial_radius,  R.string.saturn_equatorial_radius_short),
-        DefaultUnit(MyUnitIDS.uranus_equatorial_radius,  BigDecimal.valueOf(2.5362E+25),                      UnitGroup.LENGTH, R.string.uranus_equatorial_radius,  R.string.uranus_equatorial_radius_short),
-        DefaultUnit(MyUnitIDS.neptune_equatorial_radius, BigDecimal.valueOf(2.4622E+25),                      UnitGroup.LENGTH, R.string.neptune_equatorial_radius, R.string.neptune_equatorial_radius_short),
-        DefaultUnit(MyUnitIDS.sun_equatorial_radius,     BigDecimal.valueOf(6.95508E+26),                     UnitGroup.LENGTH, R.string.sun_equatorial_radius,     R.string.sun_equatorial_radius_short),
+        NormalUnit(MyUnitIDS.attometer,                 BigDecimal.valueOf(1.0),                             UnitGroup.LENGTH, R.string.attometer,                 R.string.attometer_short),
+        NormalUnit(MyUnitIDS.nanometer,                 BigDecimal.valueOf(1.0E+9),                          UnitGroup.LENGTH, R.string.nanometer,                 R.string.nanometer_short),
+        NormalUnit(MyUnitIDS.micrometer,                BigDecimal.valueOf(1.0E+12),                         UnitGroup.LENGTH, R.string.micrometer,                R.string.micrometer_short),
+        NormalUnit(MyUnitIDS.millimeter,                BigDecimal.valueOf(1.0E+15),                         UnitGroup.LENGTH, R.string.millimeter,                R.string.millimeter_short),
+        NormalUnit(MyUnitIDS.centimeter,                BigDecimal.valueOf(1.0E+16),                         UnitGroup.LENGTH, R.string.centimeter,                R.string.centimeter_short),
+        NormalUnit(MyUnitIDS.decimeter,                 BigDecimal.valueOf(1.0E+17),                         UnitGroup.LENGTH, R.string.decimeter,                 R.string.decimeter_short),
+        NormalUnit(MyUnitIDS.meter,                     BigDecimal.valueOf(1.0E+18),                         UnitGroup.LENGTH, R.string.meter,                     R.string.meter_short),
+        NormalUnit(MyUnitIDS.kilometer,                 BigDecimal.valueOf(1.0E+21),                         UnitGroup.LENGTH, R.string.kilometer,                 R.string.kilometer_short),
+        NormalUnit(MyUnitIDS.nautical_mile,             BigDecimal.valueOf(1.852E+21),                         UnitGroup.LENGTH, R.string.nautical_mile,             R.string.nautical_mile_short),
+        NormalUnit(MyUnitIDS.inch,                      BigDecimal.valueOf(25_400_000_000_000_000),          UnitGroup.LENGTH, R.string.inch,                      R.string.inch_short),
+        NormalUnit(MyUnitIDS.foot,                      BigDecimal.valueOf(304_800_000_000_002_200),         UnitGroup.LENGTH, R.string.foot,                      R.string.foot_short),
+        NormalUnit(MyUnitIDS.yard,                      BigDecimal.valueOf(914_400_000_000_006_400),         UnitGroup.LENGTH, R.string.yard,                      R.string.yard_short),
+        NormalUnit(MyUnitIDS.mile,                      BigDecimal.valueOf(1_609_344_000_000_010_500_000.0), UnitGroup.LENGTH, R.string.mile,                      R.string.mile_short),
+        NormalUnit(MyUnitIDS.light_year,                BigDecimal.valueOf(9.460730472E+33),                 UnitGroup.LENGTH, R.string.light_year,                R.string.light_year_short),
+        NormalUnit(MyUnitIDS.parsec,                    BigDecimal.valueOf(3.08567758149136E+34),            UnitGroup.LENGTH, R.string.parsec,                    R.string.parsec_short),
+        NormalUnit(MyUnitIDS.kiloparsec,                BigDecimal.valueOf(3.08567758149136E+37),            UnitGroup.LENGTH, R.string.kiloparsec,                R.string.kiloparsec_short),
+        NormalUnit(MyUnitIDS.megaparsec,                BigDecimal.valueOf(3.08567758149136E+40),            UnitGroup.LENGTH, R.string.megaparsec,                R.string.megaparsec_short),
+        NormalUnit(MyUnitIDS.mercury_equatorial_radius, BigDecimal.valueOf(2.4397E+24),                      UnitGroup.LENGTH, R.string.mercury_equatorial_radius, R.string.mercury_equatorial_radius_short),
+        NormalUnit(MyUnitIDS.venus_equatorial_radius,   BigDecimal.valueOf(6.0518E+24),                      UnitGroup.LENGTH, R.string.venus_equatorial_radius,   R.string.venus_equatorial_radius_short),
+        NormalUnit(MyUnitIDS.earth_equatorial_radius,   BigDecimal.valueOf(6.371E+24),                       UnitGroup.LENGTH, R.string.earth_equatorial_radius,   R.string.earth_equatorial_radius_short),
+        NormalUnit(MyUnitIDS.mars_equatorial_radius,    BigDecimal.valueOf(3.3895E+24),                      UnitGroup.LENGTH, R.string.mars_equatorial_radius,    R.string.mars_equatorial_radius_short),
+        NormalUnit(MyUnitIDS.jupiter_equatorial_radius, BigDecimal.valueOf(6.9911E+25),                      UnitGroup.LENGTH, R.string.jupiter_equatorial_radius, R.string.jupiter_equatorial_radius_short),
+        NormalUnit(MyUnitIDS.saturn_equatorial_radius,  BigDecimal.valueOf(5.8232E+25),                      UnitGroup.LENGTH, R.string.saturn_equatorial_radius,  R.string.saturn_equatorial_radius_short),
+        NormalUnit(MyUnitIDS.uranus_equatorial_radius,  BigDecimal.valueOf(2.5362E+25),                      UnitGroup.LENGTH, R.string.uranus_equatorial_radius,  R.string.uranus_equatorial_radius_short),
+        NormalUnit(MyUnitIDS.neptune_equatorial_radius, BigDecimal.valueOf(2.4622E+25),                      UnitGroup.LENGTH, R.string.neptune_equatorial_radius, R.string.neptune_equatorial_radius_short),
+        NormalUnit(MyUnitIDS.sun_equatorial_radius,     BigDecimal.valueOf(6.95508E+26),                     UnitGroup.LENGTH, R.string.sun_equatorial_radius,     R.string.sun_equatorial_radius_short),
     )
-}
\ No newline at end of file
+}
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Luminance.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Luminance.kt
index 38f9aa54..928c3624 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Luminance.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Luminance.kt
@@ -19,32 +19,32 @@
 package com.sadellie.unitto.data.units.collections
 
 import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.DefaultUnit
 import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.NormalUnit
 import com.sadellie.unitto.data.units.MyUnitIDS
 import java.math.BigDecimal
 
 val luminanceCollection: List<AbstractUnit> by lazy {
     listOf(
-        DefaultUnit(MyUnitIDS.candela_per_square_meter,                     BigDecimal.valueOf(31415926.5359),      UnitGroup.LUMINANCE,    R.string.candela_per_square_meter,                  R.string.candela_per_square_meter_short),
-        DefaultUnit(MyUnitIDS.candela_per_square_centimeter,                BigDecimal.valueOf(314159265359),       UnitGroup.LUMINANCE,    R.string.candela_per_square_centimeter,             R.string.candela_per_square_centimeter_short),
-        DefaultUnit(MyUnitIDS.candela_per_square_foot,                      BigDecimal.valueOf(338158218.89),       UnitGroup.LUMINANCE,    R.string.candela_per_square_foot,                   R.string.candela_per_square_foot_short),
-        DefaultUnit(MyUnitIDS.candela_per_square_inch,                      BigDecimal.valueOf(48694783520),        UnitGroup.LUMINANCE,    R.string.candela_per_square_inch,                   R.string.candela_per_square_inch_short),
-        DefaultUnit(MyUnitIDS.kilocandela_per_square_meter,                 BigDecimal.valueOf(31415926535.9),      UnitGroup.LUMINANCE,    R.string.kilocandela_per_square_meter,              R.string.kilocandela_per_square_meter_short),
-        DefaultUnit(MyUnitIDS.stilb,                                        BigDecimal.valueOf(314159265359),       UnitGroup.LUMINANCE,    R.string.stilb,                                     R.string.stilb_short),
-        DefaultUnit(MyUnitIDS.lumen_per_square_meter_per_steradian,         BigDecimal.valueOf(31415926.5359),      UnitGroup.LUMINANCE,    R.string.lumen_per_square_meter_per_steradian,      R.string.lumen_per_square_meter_per_steradian_short),
-        DefaultUnit(MyUnitIDS.lumen_per_square_centimeter_per_steradian,    BigDecimal.valueOf(314159265359),       UnitGroup.LUMINANCE,    R.string.lumen_per_square_centimeter_per_steradian, R.string.lumen_per_square_centimeter_per_steradian_short),
-        DefaultUnit(MyUnitIDS.lumen_per_square_foot_per_steradian,          BigDecimal.valueOf(338158218.89),       UnitGroup.LUMINANCE,    R.string.lumen_per_square_foot_per_steradian,       R.string.lumen_per_square_foot_per_steradian_short),
-        DefaultUnit(MyUnitIDS.watt_per_square_centimeter_per_steradian,     BigDecimal.valueOf(214570778240185),    UnitGroup.LUMINANCE,    R.string.watt_per_square_centimeter_per_steradian,  R.string.watt_per_square_centimeter_per_steradian_short),
-        DefaultUnit(MyUnitIDS.nit,                                          BigDecimal.valueOf(31415926.5359),      UnitGroup.LUMINANCE,    R.string.nit,                                       R.string.nit_short),
-        DefaultUnit(MyUnitIDS.millinit,                                     BigDecimal.valueOf(31415.9265359),      UnitGroup.LUMINANCE,    R.string.millinit,                                  R.string.millinit_short),
-        DefaultUnit(MyUnitIDS.lambert,                                      BigDecimal.valueOf(100000000000),       UnitGroup.LUMINANCE,    R.string.lambert,                                   R.string.lambert_short),
-        DefaultUnit(MyUnitIDS.millilambert,                                 BigDecimal.valueOf(100000000),          UnitGroup.LUMINANCE,    R.string.millilambert,                              R.string.millilambert_short),
-        DefaultUnit(MyUnitIDS.foot_lambert,                                 BigDecimal.valueOf(107639104.167),      UnitGroup.LUMINANCE,    R.string.foot_lambert,                              R.string.foot_lambert_short),
-        DefaultUnit(MyUnitIDS.apostilb,                                     BigDecimal.valueOf(10000000),           UnitGroup.LUMINANCE,    R.string.apostilb,                                  R.string.apostilb_short),
-        DefaultUnit(MyUnitIDS.blondel,                                      BigDecimal.valueOf(10000000),           UnitGroup.LUMINANCE,    R.string.blondel,                                   R.string.blondel_short),
-        DefaultUnit(MyUnitIDS.skot,                                         BigDecimal.valueOf(10000),              UnitGroup.LUMINANCE,    R.string.skot,                                      R.string.skot_short),
-        DefaultUnit(MyUnitIDS.bril,                                         BigDecimal.valueOf(1),                  UnitGroup.LUMINANCE,    R.string.bril,                                      R.string.bril_short),
+        NormalUnit(MyUnitIDS.candela_per_square_meter,                     BigDecimal.valueOf(31415926.5359),      UnitGroup.LUMINANCE,    R.string.candela_per_square_meter,                  R.string.candela_per_square_meter_short),
+        NormalUnit(MyUnitIDS.candela_per_square_centimeter,                BigDecimal.valueOf(314159265359),       UnitGroup.LUMINANCE,    R.string.candela_per_square_centimeter,             R.string.candela_per_square_centimeter_short),
+        NormalUnit(MyUnitIDS.candela_per_square_foot,                      BigDecimal.valueOf(338158218.89),       UnitGroup.LUMINANCE,    R.string.candela_per_square_foot,                   R.string.candela_per_square_foot_short),
+        NormalUnit(MyUnitIDS.candela_per_square_inch,                      BigDecimal.valueOf(48694783520),        UnitGroup.LUMINANCE,    R.string.candela_per_square_inch,                   R.string.candela_per_square_inch_short),
+        NormalUnit(MyUnitIDS.kilocandela_per_square_meter,                 BigDecimal.valueOf(31415926535.9),      UnitGroup.LUMINANCE,    R.string.kilocandela_per_square_meter,              R.string.kilocandela_per_square_meter_short),
+        NormalUnit(MyUnitIDS.stilb,                                        BigDecimal.valueOf(314159265359),       UnitGroup.LUMINANCE,    R.string.stilb,                                     R.string.stilb_short),
+        NormalUnit(MyUnitIDS.lumen_per_square_meter_per_steradian,         BigDecimal.valueOf(31415926.5359),      UnitGroup.LUMINANCE,    R.string.lumen_per_square_meter_per_steradian,      R.string.lumen_per_square_meter_per_steradian_short),
+        NormalUnit(MyUnitIDS.lumen_per_square_centimeter_per_steradian,    BigDecimal.valueOf(314159265359),       UnitGroup.LUMINANCE,    R.string.lumen_per_square_centimeter_per_steradian, R.string.lumen_per_square_centimeter_per_steradian_short),
+        NormalUnit(MyUnitIDS.lumen_per_square_foot_per_steradian,          BigDecimal.valueOf(338158218.89),       UnitGroup.LUMINANCE,    R.string.lumen_per_square_foot_per_steradian,       R.string.lumen_per_square_foot_per_steradian_short),
+        NormalUnit(MyUnitIDS.watt_per_square_centimeter_per_steradian,     BigDecimal.valueOf(214570778240185),    UnitGroup.LUMINANCE,    R.string.watt_per_square_centimeter_per_steradian,  R.string.watt_per_square_centimeter_per_steradian_short),
+        NormalUnit(MyUnitIDS.nit,                                          BigDecimal.valueOf(31415926.5359),      UnitGroup.LUMINANCE,    R.string.nit,                                       R.string.nit_short),
+        NormalUnit(MyUnitIDS.millinit,                                     BigDecimal.valueOf(31415.9265359),      UnitGroup.LUMINANCE,    R.string.millinit,                                  R.string.millinit_short),
+        NormalUnit(MyUnitIDS.lambert,                                      BigDecimal.valueOf(100000000000),       UnitGroup.LUMINANCE,    R.string.lambert,                                   R.string.lambert_short),
+        NormalUnit(MyUnitIDS.millilambert,                                 BigDecimal.valueOf(100000000),          UnitGroup.LUMINANCE,    R.string.millilambert,                              R.string.millilambert_short),
+        NormalUnit(MyUnitIDS.foot_lambert,                                 BigDecimal.valueOf(107639104.167),      UnitGroup.LUMINANCE,    R.string.foot_lambert,                              R.string.foot_lambert_short),
+        NormalUnit(MyUnitIDS.apostilb,                                     BigDecimal.valueOf(10000000),           UnitGroup.LUMINANCE,    R.string.apostilb,                                  R.string.apostilb_short),
+        NormalUnit(MyUnitIDS.blondel,                                      BigDecimal.valueOf(10000000),           UnitGroup.LUMINANCE,    R.string.blondel,                                   R.string.blondel_short),
+        NormalUnit(MyUnitIDS.skot,                                         BigDecimal.valueOf(10000),              UnitGroup.LUMINANCE,    R.string.skot,                                      R.string.skot_short),
+        NormalUnit(MyUnitIDS.bril,                                         BigDecimal.valueOf(1),                  UnitGroup.LUMINANCE,    R.string.bril,                                      R.string.bril_short),
     )
 }
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Mass.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Mass.kt
index 731a24bb..c88c73c3 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Mass.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Mass.kt
@@ -19,33 +19,33 @@
 package com.sadellie.unitto.data.units.collections
 
 import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.DefaultUnit
 import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.NormalUnit
 import com.sadellie.unitto.data.units.MyUnitIDS
 import java.math.BigDecimal
 
 internal val massCollection: List<AbstractUnit> by lazy {
     listOf(
-        DefaultUnit(MyUnitIDS.electron_mass_rest, BigDecimal.valueOf(9.1093897E-28), UnitGroup.MASS, R.string.electron_mass_rest, R.string.electron_mass_rest_short),
-        DefaultUnit(MyUnitIDS.atomic_mass_unit,   BigDecimal.valueOf(1.6605402E-24), UnitGroup.MASS, R.string.atomic_mass_unit,   R.string.atomic_mass_unit_short),
-        DefaultUnit(MyUnitIDS.microgram,          BigDecimal(1E-6),                  UnitGroup.MASS, R.string.microgram,          R.string.microgram_short),
-        DefaultUnit(MyUnitIDS.milligram,          BigDecimal.valueOf(1E-3),          UnitGroup.MASS, R.string.milligram,          R.string.milligram_short),
-        DefaultUnit(MyUnitIDS.gram,               BigDecimal.valueOf(1),             UnitGroup.MASS, R.string.gram,               R.string.gram_short),
-        DefaultUnit(MyUnitIDS.kilogram,           BigDecimal.valueOf(1E+3),          UnitGroup.MASS, R.string.kilogram,           R.string.kilogram_short),
-        DefaultUnit(MyUnitIDS.metric_ton,         BigDecimal.valueOf(1E+6),          UnitGroup.MASS, R.string.metric_ton,         R.string.metric_ton_short),
-        DefaultUnit(MyUnitIDS.imperial_ton,       BigDecimal.valueOf(1016046.9088),  UnitGroup.MASS, R.string.imperial_ton,       R.string.imperial_ton_short),
-        DefaultUnit(MyUnitIDS.ounce,              BigDecimal.valueOf(28.349523125),  UnitGroup.MASS, R.string.ounce,              R.string.ounce_short),
-        DefaultUnit(MyUnitIDS.carat,              BigDecimal.valueOf(0.2),           UnitGroup.MASS, R.string.carat,              R.string.carat_short),
-        DefaultUnit(MyUnitIDS.pound,              BigDecimal.valueOf(453.59237),     UnitGroup.MASS, R.string.pound,              R.string.pound_short),
-        DefaultUnit(MyUnitIDS.mercury_mass,       BigDecimal.valueOf(3.30104E+26),   UnitGroup.MASS, R.string.mercury_mass,       R.string.mercury_mass_short),
-        DefaultUnit(MyUnitIDS.venus_mass,         BigDecimal.valueOf(4.86732E+27),   UnitGroup.MASS, R.string.venus_mass,         R.string.venus_mass_short),
-        DefaultUnit(MyUnitIDS.earth_mass,         BigDecimal.valueOf(5.97219E+27),   UnitGroup.MASS, R.string.earth_mass,         R.string.earth_mass_short),
-        DefaultUnit(MyUnitIDS.mars_mass,          BigDecimal.valueOf(6.41693E+26),   UnitGroup.MASS, R.string.mars_mass,          R.string.mars_mass_short),
-        DefaultUnit(MyUnitIDS.jupiter_mass,       BigDecimal.valueOf(1.89813E+30),   UnitGroup.MASS, R.string.jupiter_mass,       R.string.jupiter_mass_short),
-        DefaultUnit(MyUnitIDS.saturn_mass,        BigDecimal.valueOf(5.68319E+29),   UnitGroup.MASS, R.string.saturn_mass,        R.string.saturn_mass_short),
-        DefaultUnit(MyUnitIDS.uranus_mass,        BigDecimal.valueOf(8.68103E+28),   UnitGroup.MASS, R.string.uranus_mass,        R.string.uranus_mass_short),
-        DefaultUnit(MyUnitIDS.neptune_mass,       BigDecimal.valueOf(1.0241E+29),    UnitGroup.MASS, R.string.neptune_mass,       R.string.neptune_mass_short),
-        DefaultUnit(MyUnitIDS.sun_mass,           BigDecimal.valueOf(1.9891E+33),    UnitGroup.MASS, R.string.sun_mass,           R.string.sun_mass_short),
+        NormalUnit(MyUnitIDS.electron_mass_rest, BigDecimal.valueOf(9.1093897E-28), UnitGroup.MASS, R.string.electron_mass_rest, R.string.electron_mass_rest_short),
+        NormalUnit(MyUnitIDS.atomic_mass_unit,   BigDecimal.valueOf(1.6605402E-24), UnitGroup.MASS, R.string.atomic_mass_unit,   R.string.atomic_mass_unit_short),
+        NormalUnit(MyUnitIDS.microgram,          BigDecimal(1E-6),                  UnitGroup.MASS, R.string.microgram,          R.string.microgram_short),
+        NormalUnit(MyUnitIDS.milligram,          BigDecimal.valueOf(1E-3),          UnitGroup.MASS, R.string.milligram,          R.string.milligram_short),
+        NormalUnit(MyUnitIDS.gram,               BigDecimal.valueOf(1),             UnitGroup.MASS, R.string.gram,               R.string.gram_short),
+        NormalUnit(MyUnitIDS.kilogram,           BigDecimal.valueOf(1E+3),          UnitGroup.MASS, R.string.kilogram,           R.string.kilogram_short),
+        NormalUnit(MyUnitIDS.metric_ton,         BigDecimal.valueOf(1E+6),          UnitGroup.MASS, R.string.metric_ton,         R.string.metric_ton_short),
+        NormalUnit(MyUnitIDS.imperial_ton,       BigDecimal.valueOf(1016046.9088),  UnitGroup.MASS, R.string.imperial_ton,       R.string.imperial_ton_short),
+        NormalUnit(MyUnitIDS.ounce,              BigDecimal.valueOf(28.349523125),  UnitGroup.MASS, R.string.ounce,              R.string.ounce_short),
+        NormalUnit(MyUnitIDS.carat,              BigDecimal.valueOf(0.2),           UnitGroup.MASS, R.string.carat,              R.string.carat_short),
+        NormalUnit(MyUnitIDS.pound,              BigDecimal.valueOf(453.59237),     UnitGroup.MASS, R.string.pound,              R.string.pound_short),
+        NormalUnit(MyUnitIDS.mercury_mass,       BigDecimal.valueOf(3.30104E+26),   UnitGroup.MASS, R.string.mercury_mass,       R.string.mercury_mass_short),
+        NormalUnit(MyUnitIDS.venus_mass,         BigDecimal.valueOf(4.86732E+27),   UnitGroup.MASS, R.string.venus_mass,         R.string.venus_mass_short),
+        NormalUnit(MyUnitIDS.earth_mass,         BigDecimal.valueOf(5.97219E+27),   UnitGroup.MASS, R.string.earth_mass,         R.string.earth_mass_short),
+        NormalUnit(MyUnitIDS.mars_mass,          BigDecimal.valueOf(6.41693E+26),   UnitGroup.MASS, R.string.mars_mass,          R.string.mars_mass_short),
+        NormalUnit(MyUnitIDS.jupiter_mass,       BigDecimal.valueOf(1.89813E+30),   UnitGroup.MASS, R.string.jupiter_mass,       R.string.jupiter_mass_short),
+        NormalUnit(MyUnitIDS.saturn_mass,        BigDecimal.valueOf(5.68319E+29),   UnitGroup.MASS, R.string.saturn_mass,        R.string.saturn_mass_short),
+        NormalUnit(MyUnitIDS.uranus_mass,        BigDecimal.valueOf(8.68103E+28),   UnitGroup.MASS, R.string.uranus_mass,        R.string.uranus_mass_short),
+        NormalUnit(MyUnitIDS.neptune_mass,       BigDecimal.valueOf(1.0241E+29),    UnitGroup.MASS, R.string.neptune_mass,       R.string.neptune_mass_short),
+        NormalUnit(MyUnitIDS.sun_mass,           BigDecimal.valueOf(1.9891E+33),    UnitGroup.MASS, R.string.sun_mass,           R.string.sun_mass_short),
     )
-}
\ No newline at end of file
+}
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/NumberBase.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/NumberBase.kt
index da6bcfbf..3f9ee372 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/NumberBase.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/NumberBase.kt
@@ -19,27 +19,28 @@
 package com.sadellie.unitto.data.units.collections
 
 import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.NumberBaseUnit
 import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.NumberBaseUnit
 import com.sadellie.unitto.data.units.MyUnitIDS
+import java.math.BigDecimal
 
 internal val numberBaseCollection: List<AbstractUnit> by lazy {
     listOf(
-        NumberBaseUnit(MyUnitIDS.binary,        2,  UnitGroup.NUMBER_BASE,  R.string.binary,        R.string.binary_short),
-        NumberBaseUnit(MyUnitIDS.ternary,       3,  UnitGroup.NUMBER_BASE,  R.string.ternary,       R.string.ternary_short),
-        NumberBaseUnit(MyUnitIDS.quaternary,    4,  UnitGroup.NUMBER_BASE,  R.string.quaternary,    R.string.quaternary_short),
-        NumberBaseUnit(MyUnitIDS.quinary,       5,  UnitGroup.NUMBER_BASE,  R.string.quinary,       R.string.quinary_short),
-        NumberBaseUnit(MyUnitIDS.senary,        6,  UnitGroup.NUMBER_BASE,  R.string.senary,        R.string.senary_short),
-        NumberBaseUnit(MyUnitIDS.septenary,     7,  UnitGroup.NUMBER_BASE,  R.string.septenary,     R.string.septenary_short),
-        NumberBaseUnit(MyUnitIDS.octal,         8,  UnitGroup.NUMBER_BASE,  R.string.octal,         R.string.octal_short),
-        NumberBaseUnit(MyUnitIDS.nonary,        9,  UnitGroup.NUMBER_BASE,  R.string.nonary,        R.string.nonary_short),
-        NumberBaseUnit(MyUnitIDS.decimal,       10, UnitGroup.NUMBER_BASE,  R.string.decimal,       R.string.decimal_short),
-        NumberBaseUnit(MyUnitIDS.undecimal,     11, UnitGroup.NUMBER_BASE,  R.string.undecimal,     R.string.undecimal_short),
-        NumberBaseUnit(MyUnitIDS.duodecimal,    12, UnitGroup.NUMBER_BASE,  R.string.duodecimal,    R.string.duodecimal_short),
-        NumberBaseUnit(MyUnitIDS.tridecimal,    13, UnitGroup.NUMBER_BASE,  R.string.tridecimal,    R.string.tridecimal_short),
-        NumberBaseUnit(MyUnitIDS.tetradecimal,  14, UnitGroup.NUMBER_BASE,  R.string.tetradecimal,  R.string.tetradecimal_short),
-        NumberBaseUnit(MyUnitIDS.pentadecimal,  15, UnitGroup.NUMBER_BASE,  R.string.pentadecimal,  R.string.pentadecimal_short),
-        NumberBaseUnit(MyUnitIDS.hexadecimal,   16, UnitGroup.NUMBER_BASE,  R.string.hexadecimal,   R.string.hexadecimal_short),
+        NumberBaseUnit(MyUnitIDS.binary,        BigDecimal.valueOf(2.0),  UnitGroup.NUMBER_BASE,  R.string.binary,        R.string.binary_short),
+        NumberBaseUnit(MyUnitIDS.ternary,       BigDecimal.valueOf(3.0),  UnitGroup.NUMBER_BASE,  R.string.ternary,       R.string.ternary_short),
+        NumberBaseUnit(MyUnitIDS.quaternary,    BigDecimal.valueOf(4.0),  UnitGroup.NUMBER_BASE,  R.string.quaternary,    R.string.quaternary_short),
+        NumberBaseUnit(MyUnitIDS.quinary,       BigDecimal.valueOf(5.0),  UnitGroup.NUMBER_BASE,  R.string.quinary,       R.string.quinary_short),
+        NumberBaseUnit(MyUnitIDS.senary,        BigDecimal.valueOf(6.0),  UnitGroup.NUMBER_BASE,  R.string.senary,        R.string.senary_short),
+        NumberBaseUnit(MyUnitIDS.septenary,     BigDecimal.valueOf(7.0),  UnitGroup.NUMBER_BASE,  R.string.septenary,     R.string.septenary_short),
+        NumberBaseUnit(MyUnitIDS.octal,         BigDecimal.valueOf(8.0),  UnitGroup.NUMBER_BASE,  R.string.octal,         R.string.octal_short),
+        NumberBaseUnit(MyUnitIDS.nonary,        BigDecimal.valueOf(9.0),  UnitGroup.NUMBER_BASE,  R.string.nonary,        R.string.nonary_short),
+        NumberBaseUnit(MyUnitIDS.decimal,       BigDecimal.valueOf(10.0), UnitGroup.NUMBER_BASE,  R.string.decimal,       R.string.decimal_short),
+        NumberBaseUnit(MyUnitIDS.undecimal,     BigDecimal.valueOf(11.0), UnitGroup.NUMBER_BASE,  R.string.undecimal,     R.string.undecimal_short),
+        NumberBaseUnit(MyUnitIDS.duodecimal,    BigDecimal.valueOf(12.0), UnitGroup.NUMBER_BASE,  R.string.duodecimal,    R.string.duodecimal_short),
+        NumberBaseUnit(MyUnitIDS.tridecimal,    BigDecimal.valueOf(13.0), UnitGroup.NUMBER_BASE,  R.string.tridecimal,    R.string.tridecimal_short),
+        NumberBaseUnit(MyUnitIDS.tetradecimal,  BigDecimal.valueOf(14.0), UnitGroup.NUMBER_BASE,  R.string.tetradecimal,  R.string.tetradecimal_short),
+        NumberBaseUnit(MyUnitIDS.pentadecimal,  BigDecimal.valueOf(15.0), UnitGroup.NUMBER_BASE,  R.string.pentadecimal,  R.string.pentadecimal_short),
+        NumberBaseUnit(MyUnitIDS.hexadecimal,   BigDecimal.valueOf(16.0), UnitGroup.NUMBER_BASE,  R.string.hexadecimal,   R.string.hexadecimal_short),
     )
-}
\ No newline at end of file
+}
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Power.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Power.kt
index abc23823..9e014f30 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Power.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Power.kt
@@ -19,18 +19,18 @@
 package com.sadellie.unitto.data.units.collections
 
 import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.DefaultUnit
 import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.NormalUnit
 import com.sadellie.unitto.data.units.MyUnitIDS
 import java.math.BigDecimal
 
 internal val powerCollection: List<AbstractUnit> by lazy {
     listOf(
-        DefaultUnit(MyUnitIDS.attowatt,                  BigDecimal.valueOf(1),                              UnitGroup.POWER,    R.string.attowatt,                  R.string.attowatt_short),
-        DefaultUnit(MyUnitIDS.watt,                      BigDecimal.valueOf(1_000_000_000_000_000_000),      UnitGroup.POWER,    R.string.watt,                      R.string.watt_short),
-        DefaultUnit(MyUnitIDS.kilowatt,                  BigDecimal.valueOf(1.0E+21),                        UnitGroup.POWER,    R.string.kilowatt,                  R.string.kilowatt_short),
-        DefaultUnit(MyUnitIDS.megawatt,                  BigDecimal.valueOf(1.0E+24),                        UnitGroup.POWER,    R.string.megawatt,                  R.string.megawatt_short),
-        DefaultUnit(MyUnitIDS.horse_power_mechanical,    BigDecimal.valueOf(745_699_871_582_285_700_000.0),  UnitGroup.POWER,    R.string.horse_power_mechanical,    R.string.horse_power_mechanical_short),
+        NormalUnit(MyUnitIDS.attowatt,                  BigDecimal.valueOf(1),                              UnitGroup.POWER,    R.string.attowatt,                  R.string.attowatt_short),
+        NormalUnit(MyUnitIDS.watt,                      BigDecimal.valueOf(1_000_000_000_000_000_000),      UnitGroup.POWER,    R.string.watt,                      R.string.watt_short),
+        NormalUnit(MyUnitIDS.kilowatt,                  BigDecimal.valueOf(1.0E+21),                        UnitGroup.POWER,    R.string.kilowatt,                  R.string.kilowatt_short),
+        NormalUnit(MyUnitIDS.megawatt,                  BigDecimal.valueOf(1.0E+24),                        UnitGroup.POWER,    R.string.megawatt,                  R.string.megawatt_short),
+        NormalUnit(MyUnitIDS.horse_power_mechanical,    BigDecimal.valueOf(745_699_871_582_285_700_000.0),  UnitGroup.POWER,    R.string.horse_power_mechanical,    R.string.horse_power_mechanical_short),
     )
-}
\ No newline at end of file
+}
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Prefix.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Prefix.kt
index eb7d2854..aa461b50 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Prefix.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Prefix.kt
@@ -19,38 +19,38 @@
 package com.sadellie.unitto.data.units.collections
 
 import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.DefaultUnit
 import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.NormalUnit
 import com.sadellie.unitto.data.units.MyUnitIDS
 import java.math.BigDecimal
 
 val prefixCollection: List<AbstractUnit> by lazy {
     listOf(
-        DefaultUnit(MyUnitIDS.prefix_quetta, BigDecimal.valueOf(1E+30),  UnitGroup.PREFIX, R.string.prefix_quetta,   R.string.prefix_quetta_short),
-        DefaultUnit(MyUnitIDS.prefix_ronna,  BigDecimal.valueOf(1E+27),  UnitGroup.PREFIX, R.string.prefix_ronna,    R.string.prefix_ronna_short),
-        DefaultUnit(MyUnitIDS.prefix_yotta,  BigDecimal.valueOf(1E+24),  UnitGroup.PREFIX, R.string.prefix_yotta,    R.string.prefix_yotta_short),
-        DefaultUnit(MyUnitIDS.prefix_zetta,  BigDecimal.valueOf(1E+21),  UnitGroup.PREFIX, R.string.prefix_zetta,    R.string.prefix_zetta_short),
-        DefaultUnit(MyUnitIDS.prefix_exa,    BigDecimal.valueOf(1E+18),  UnitGroup.PREFIX, R.string.prefix_exa,      R.string.prefix_exa_short),
-        DefaultUnit(MyUnitIDS.prefix_peta,   BigDecimal.valueOf(1E+15),  UnitGroup.PREFIX, R.string.prefix_peta,     R.string.prefix_peta_short),
-        DefaultUnit(MyUnitIDS.prefix_tera,   BigDecimal.valueOf(1E+12),  UnitGroup.PREFIX, R.string.prefix_tera,     R.string.prefix_tera_short),
-        DefaultUnit(MyUnitIDS.prefix_giga,   BigDecimal.valueOf(1E+9),   UnitGroup.PREFIX, R.string.prefix_giga,     R.string.prefix_giga_short),
-        DefaultUnit(MyUnitIDS.prefix_mega,   BigDecimal.valueOf(1E+6),   UnitGroup.PREFIX, R.string.prefix_mega,     R.string.prefix_mega_short),
-        DefaultUnit(MyUnitIDS.prefix_kilo,   BigDecimal.valueOf(1E+3),   UnitGroup.PREFIX, R.string.prefix_kilo,     R.string.prefix_kilo_short),
-        DefaultUnit(MyUnitIDS.prefix_hecto,  BigDecimal.valueOf(1E+2),   UnitGroup.PREFIX, R.string.prefix_hecto,    R.string.prefix_hecto_short),
-        DefaultUnit(MyUnitIDS.prefix_deca,   BigDecimal.valueOf(1E+1),   UnitGroup.PREFIX, R.string.prefix_deca,     R.string.prefix_deca_short),
-        DefaultUnit(MyUnitIDS.prefix_base,   BigDecimal.valueOf(1E+0),   UnitGroup.PREFIX, R.string.prefix_base,     R.string.prefix_base_short),
-        DefaultUnit(MyUnitIDS.prefix_deci,   BigDecimal.valueOf(1E-1),   UnitGroup.PREFIX, R.string.prefix_deci,     R.string.prefix_deci_short),
-        DefaultUnit(MyUnitIDS.prefix_centi,  BigDecimal.valueOf(1E-2),   UnitGroup.PREFIX, R.string.prefix_centi,    R.string.prefix_centi_short),
-        DefaultUnit(MyUnitIDS.prefix_milli,  BigDecimal.valueOf(1E-3),   UnitGroup.PREFIX, R.string.prefix_milli,    R.string.prefix_milli_short),
-        DefaultUnit(MyUnitIDS.prefix_micro,  BigDecimal.valueOf(1E-6),   UnitGroup.PREFIX, R.string.prefix_micro,    R.string.prefix_micro_short),
-        DefaultUnit(MyUnitIDS.prefix_nano,   BigDecimal.valueOf(1E-9),   UnitGroup.PREFIX, R.string.prefix_nano,     R.string.prefix_nano_short),
-        DefaultUnit(MyUnitIDS.prefix_pico,   BigDecimal.valueOf(1E-12),  UnitGroup.PREFIX, R.string.prefix_pico,     R.string.prefix_pico_short),
-        DefaultUnit(MyUnitIDS.prefix_femto,  BigDecimal.valueOf(1E-15),  UnitGroup.PREFIX, R.string.prefix_femto,    R.string.prefix_femto_short),
-        DefaultUnit(MyUnitIDS.prefix_atto,   BigDecimal.valueOf(1E-18),  UnitGroup.PREFIX, R.string.prefix_atto,     R.string.prefix_atto_short),
-        DefaultUnit(MyUnitIDS.prefix_zepto,  BigDecimal.valueOf(1E-21),  UnitGroup.PREFIX, R.string.prefix_zepto,    R.string.prefix_zepto_short),
-        DefaultUnit(MyUnitIDS.prefix_yocto,  BigDecimal.valueOf(1E-24),  UnitGroup.PREFIX, R.string.prefix_yocto,    R.string.prefix_yocto_short),
-        DefaultUnit(MyUnitIDS.prefix_ronto,  BigDecimal.valueOf(1E-27),  UnitGroup.PREFIX, R.string.prefix_ronto,    R.string.prefix_ronto_short),
-        DefaultUnit(MyUnitIDS.prefix_quecto, BigDecimal.valueOf(1E-30),  UnitGroup.PREFIX, R.string.prefix_quecto,   R.string.prefix_quecto_short),
+        NormalUnit(MyUnitIDS.prefix_quetta, BigDecimal.valueOf(1E+30),  UnitGroup.PREFIX, R.string.prefix_quetta,   R.string.prefix_quetta_short),
+        NormalUnit(MyUnitIDS.prefix_ronna,  BigDecimal.valueOf(1E+27),  UnitGroup.PREFIX, R.string.prefix_ronna,    R.string.prefix_ronna_short),
+        NormalUnit(MyUnitIDS.prefix_yotta,  BigDecimal.valueOf(1E+24),  UnitGroup.PREFIX, R.string.prefix_yotta,    R.string.prefix_yotta_short),
+        NormalUnit(MyUnitIDS.prefix_zetta,  BigDecimal.valueOf(1E+21),  UnitGroup.PREFIX, R.string.prefix_zetta,    R.string.prefix_zetta_short),
+        NormalUnit(MyUnitIDS.prefix_exa,    BigDecimal.valueOf(1E+18),  UnitGroup.PREFIX, R.string.prefix_exa,      R.string.prefix_exa_short),
+        NormalUnit(MyUnitIDS.prefix_peta,   BigDecimal.valueOf(1E+15),  UnitGroup.PREFIX, R.string.prefix_peta,     R.string.prefix_peta_short),
+        NormalUnit(MyUnitIDS.prefix_tera,   BigDecimal.valueOf(1E+12),  UnitGroup.PREFIX, R.string.prefix_tera,     R.string.prefix_tera_short),
+        NormalUnit(MyUnitIDS.prefix_giga,   BigDecimal.valueOf(1E+9),   UnitGroup.PREFIX, R.string.prefix_giga,     R.string.prefix_giga_short),
+        NormalUnit(MyUnitIDS.prefix_mega,   BigDecimal.valueOf(1E+6),   UnitGroup.PREFIX, R.string.prefix_mega,     R.string.prefix_mega_short),
+        NormalUnit(MyUnitIDS.prefix_kilo,   BigDecimal.valueOf(1E+3),   UnitGroup.PREFIX, R.string.prefix_kilo,     R.string.prefix_kilo_short),
+        NormalUnit(MyUnitIDS.prefix_hecto,  BigDecimal.valueOf(1E+2),   UnitGroup.PREFIX, R.string.prefix_hecto,    R.string.prefix_hecto_short),
+        NormalUnit(MyUnitIDS.prefix_deca,   BigDecimal.valueOf(1E+1),   UnitGroup.PREFIX, R.string.prefix_deca,     R.string.prefix_deca_short),
+        NormalUnit(MyUnitIDS.prefix_base,   BigDecimal.valueOf(1E+0),   UnitGroup.PREFIX, R.string.prefix_base,     R.string.prefix_base_short),
+        NormalUnit(MyUnitIDS.prefix_deci,   BigDecimal.valueOf(1E-1),   UnitGroup.PREFIX, R.string.prefix_deci,     R.string.prefix_deci_short),
+        NormalUnit(MyUnitIDS.prefix_centi,  BigDecimal.valueOf(1E-2),   UnitGroup.PREFIX, R.string.prefix_centi,    R.string.prefix_centi_short),
+        NormalUnit(MyUnitIDS.prefix_milli,  BigDecimal.valueOf(1E-3),   UnitGroup.PREFIX, R.string.prefix_milli,    R.string.prefix_milli_short),
+        NormalUnit(MyUnitIDS.prefix_micro,  BigDecimal.valueOf(1E-6),   UnitGroup.PREFIX, R.string.prefix_micro,    R.string.prefix_micro_short),
+        NormalUnit(MyUnitIDS.prefix_nano,   BigDecimal.valueOf(1E-9),   UnitGroup.PREFIX, R.string.prefix_nano,     R.string.prefix_nano_short),
+        NormalUnit(MyUnitIDS.prefix_pico,   BigDecimal.valueOf(1E-12),  UnitGroup.PREFIX, R.string.prefix_pico,     R.string.prefix_pico_short),
+        NormalUnit(MyUnitIDS.prefix_femto,  BigDecimal.valueOf(1E-15),  UnitGroup.PREFIX, R.string.prefix_femto,    R.string.prefix_femto_short),
+        NormalUnit(MyUnitIDS.prefix_atto,   BigDecimal.valueOf(1E-18),  UnitGroup.PREFIX, R.string.prefix_atto,     R.string.prefix_atto_short),
+        NormalUnit(MyUnitIDS.prefix_zepto,  BigDecimal.valueOf(1E-21),  UnitGroup.PREFIX, R.string.prefix_zepto,    R.string.prefix_zepto_short),
+        NormalUnit(MyUnitIDS.prefix_yocto,  BigDecimal.valueOf(1E-24),  UnitGroup.PREFIX, R.string.prefix_yocto,    R.string.prefix_yocto_short),
+        NormalUnit(MyUnitIDS.prefix_ronto,  BigDecimal.valueOf(1E-27),  UnitGroup.PREFIX, R.string.prefix_ronto,    R.string.prefix_ronto_short),
+        NormalUnit(MyUnitIDS.prefix_quecto, BigDecimal.valueOf(1E-30),  UnitGroup.PREFIX, R.string.prefix_quecto,   R.string.prefix_quecto_short),
     )
 }
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Pressure.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Pressure.kt
index 9c3c1e89..2846c31a 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Pressure.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Pressure.kt
@@ -19,38 +19,38 @@
 package com.sadellie.unitto.data.units.collections
 
 import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.DefaultUnit
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.NormalUnit
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.units.MyUnitIDS
 import java.math.BigDecimal
 
 internal val pressureCollection: List<AbstractUnit> by lazy {
     listOf(
-        DefaultUnit(MyUnitIDS.attopascal,            BigDecimal.valueOf(1),                      UnitGroup.PRESSURE, R.string.attopascal,            R.string.attopascal_short),
-        DefaultUnit(MyUnitIDS.femtopascal,           BigDecimal.valueOf(1E+3),                   UnitGroup.PRESSURE, R.string.femtopascal,           R.string.femtopascal_short),
-        DefaultUnit(MyUnitIDS.picopascal,            BigDecimal.valueOf(1E+6),                   UnitGroup.PRESSURE, R.string.picopascal,            R.string.picopascal_short),
-        DefaultUnit(MyUnitIDS.nanopascal,            BigDecimal.valueOf(1E+9),                   UnitGroup.PRESSURE, R.string.nanopascal,            R.string.nanopascal_short),
-        DefaultUnit(MyUnitIDS.micropascal,           BigDecimal.valueOf(1E+12),                  UnitGroup.PRESSURE, R.string.micropascal,           R.string.micropascal_short),
-        DefaultUnit(MyUnitIDS.millipascal,           BigDecimal.valueOf(1E+15),                  UnitGroup.PRESSURE, R.string.millipascal,           R.string.millipascal_short),
-        DefaultUnit(MyUnitIDS.centipascal,           BigDecimal.valueOf(1E+16),                  UnitGroup.PRESSURE, R.string.centipascal,           R.string.centipascal_short),
-        DefaultUnit(MyUnitIDS.decipascal,            BigDecimal.valueOf(1E+17),                  UnitGroup.PRESSURE, R.string.decipascal,            R.string.decipascal_short),
-        DefaultUnit(MyUnitIDS.pascal,                BigDecimal.valueOf(1E+18),                  UnitGroup.PRESSURE, R.string.pascal,                R.string.pascal_short),
-        DefaultUnit(MyUnitIDS.dekapascal,            BigDecimal.valueOf(1E+19),                  UnitGroup.PRESSURE, R.string.dekapascal,            R.string.dekapascal_short),
-        DefaultUnit(MyUnitIDS.hectopascal,           BigDecimal.valueOf(1E+20),                  UnitGroup.PRESSURE, R.string.hectopascal,           R.string.hectopascal_short),
-        DefaultUnit(MyUnitIDS.millibar,              BigDecimal.valueOf(1E+20),                  UnitGroup.PRESSURE, R.string.millibar,              R.string.millibar_short),
-        DefaultUnit(MyUnitIDS.bar,                   BigDecimal.valueOf(1E+23),                  UnitGroup.PRESSURE, R.string.bar,                   R.string.bar_short),
-        DefaultUnit(MyUnitIDS.kilopascal,            BigDecimal.valueOf(1E+21),                  UnitGroup.PRESSURE, R.string.kilopascal,            R.string.kilopascal_short),
-        DefaultUnit(MyUnitIDS.megapascal,            BigDecimal.valueOf(1E+24),                  UnitGroup.PRESSURE, R.string.megapascal,            R.string.megapascal_short),
-        DefaultUnit(MyUnitIDS.gigapascal,            BigDecimal.valueOf(1E+27),                  UnitGroup.PRESSURE, R.string.gigapascal,            R.string.gigapascal_short),
-        DefaultUnit(MyUnitIDS.terapascal,            BigDecimal.valueOf(1E+30),                  UnitGroup.PRESSURE, R.string.terapascal,            R.string.terapascal_short),
-        DefaultUnit(MyUnitIDS.petapascal,            BigDecimal.valueOf(1E+33),                  UnitGroup.PRESSURE, R.string.petapascal,            R.string.petapascal_short),
-        DefaultUnit(MyUnitIDS.exapascal,             BigDecimal.valueOf(1E+36),                  UnitGroup.PRESSURE, R.string.exapascal,             R.string.exapascal_short),
-        DefaultUnit(MyUnitIDS.psi,                   BigDecimal.valueOf(6.8947572931783E+21),    UnitGroup.PRESSURE, R.string.psi,                   R.string.psi_short),
-        DefaultUnit(MyUnitIDS.ksi,                   BigDecimal.valueOf(6.8947572931783E+24),    UnitGroup.PRESSURE, R.string.ksi,                   R.string.ksi_short),
-        DefaultUnit(MyUnitIDS.standard_atmosphere,   BigDecimal.valueOf(101.325E+21),            UnitGroup.PRESSURE, R.string.standard_atmosphere,   R.string.standard_atmosphere_short),
-        DefaultUnit(MyUnitIDS.torr,                  BigDecimal.valueOf(1.3332236842108281E+20), UnitGroup.PRESSURE, R.string.torr,                  R.string.torr_short),
-        DefaultUnit(MyUnitIDS.micron_of_mercury,     BigDecimal.valueOf(1.3332236842108281E+17), UnitGroup.PRESSURE, R.string.micron_of_mercury,     R.string.micron_of_mercury_short),
-        DefaultUnit(MyUnitIDS.millimeter_of_mercury, BigDecimal.valueOf(1.3332236842108281E+20), UnitGroup.PRESSURE, R.string.millimeter_of_mercury, R.string.millimeter_of_mercury_short),
+        NormalUnit(MyUnitIDS.attopascal,            BigDecimal.valueOf(1),                      UnitGroup.PRESSURE, R.string.attopascal,            R.string.attopascal_short),
+        NormalUnit(MyUnitIDS.femtopascal,           BigDecimal.valueOf(1E+3),                   UnitGroup.PRESSURE, R.string.femtopascal,           R.string.femtopascal_short),
+        NormalUnit(MyUnitIDS.picopascal,            BigDecimal.valueOf(1E+6),                   UnitGroup.PRESSURE, R.string.picopascal,            R.string.picopascal_short),
+        NormalUnit(MyUnitIDS.nanopascal,            BigDecimal.valueOf(1E+9),                   UnitGroup.PRESSURE, R.string.nanopascal,            R.string.nanopascal_short),
+        NormalUnit(MyUnitIDS.micropascal,           BigDecimal.valueOf(1E+12),                  UnitGroup.PRESSURE, R.string.micropascal,           R.string.micropascal_short),
+        NormalUnit(MyUnitIDS.millipascal,           BigDecimal.valueOf(1E+15),                  UnitGroup.PRESSURE, R.string.millipascal,           R.string.millipascal_short),
+        NormalUnit(MyUnitIDS.centipascal,           BigDecimal.valueOf(1E+16),                  UnitGroup.PRESSURE, R.string.centipascal,           R.string.centipascal_short),
+        NormalUnit(MyUnitIDS.decipascal,            BigDecimal.valueOf(1E+17),                  UnitGroup.PRESSURE, R.string.decipascal,            R.string.decipascal_short),
+        NormalUnit(MyUnitIDS.pascal,                BigDecimal.valueOf(1E+18),                  UnitGroup.PRESSURE, R.string.pascal,                R.string.pascal_short),
+        NormalUnit(MyUnitIDS.dekapascal,            BigDecimal.valueOf(1E+19),                  UnitGroup.PRESSURE, R.string.dekapascal,            R.string.dekapascal_short),
+        NormalUnit(MyUnitIDS.hectopascal,           BigDecimal.valueOf(1E+20),                  UnitGroup.PRESSURE, R.string.hectopascal,           R.string.hectopascal_short),
+        NormalUnit(MyUnitIDS.millibar,              BigDecimal.valueOf(1E+20),                  UnitGroup.PRESSURE, R.string.millibar,              R.string.millibar_short),
+        NormalUnit(MyUnitIDS.bar,                   BigDecimal.valueOf(1E+23),                  UnitGroup.PRESSURE, R.string.bar,                   R.string.bar_short),
+        NormalUnit(MyUnitIDS.kilopascal,            BigDecimal.valueOf(1E+21),                  UnitGroup.PRESSURE, R.string.kilopascal,            R.string.kilopascal_short),
+        NormalUnit(MyUnitIDS.megapascal,            BigDecimal.valueOf(1E+24),                  UnitGroup.PRESSURE, R.string.megapascal,            R.string.megapascal_short),
+        NormalUnit(MyUnitIDS.gigapascal,            BigDecimal.valueOf(1E+27),                  UnitGroup.PRESSURE, R.string.gigapascal,            R.string.gigapascal_short),
+        NormalUnit(MyUnitIDS.terapascal,            BigDecimal.valueOf(1E+30),                  UnitGroup.PRESSURE, R.string.terapascal,            R.string.terapascal_short),
+        NormalUnit(MyUnitIDS.petapascal,            BigDecimal.valueOf(1E+33),                  UnitGroup.PRESSURE, R.string.petapascal,            R.string.petapascal_short),
+        NormalUnit(MyUnitIDS.exapascal,             BigDecimal.valueOf(1E+36),                  UnitGroup.PRESSURE, R.string.exapascal,             R.string.exapascal_short),
+        NormalUnit(MyUnitIDS.psi,                   BigDecimal.valueOf(6.8947572931783E+21),    UnitGroup.PRESSURE, R.string.psi,                   R.string.psi_short),
+        NormalUnit(MyUnitIDS.ksi,                   BigDecimal.valueOf(6.8947572931783E+24),    UnitGroup.PRESSURE, R.string.ksi,                   R.string.ksi_short),
+        NormalUnit(MyUnitIDS.standard_atmosphere,   BigDecimal.valueOf(101.325E+21),            UnitGroup.PRESSURE, R.string.standard_atmosphere,   R.string.standard_atmosphere_short),
+        NormalUnit(MyUnitIDS.torr,                  BigDecimal.valueOf(1.3332236842108281E+20), UnitGroup.PRESSURE, R.string.torr,                  R.string.torr_short),
+        NormalUnit(MyUnitIDS.micron_of_mercury,     BigDecimal.valueOf(1.3332236842108281E+17), UnitGroup.PRESSURE, R.string.micron_of_mercury,     R.string.micron_of_mercury_short),
+        NormalUnit(MyUnitIDS.millimeter_of_mercury, BigDecimal.valueOf(1.3332236842108281E+20), UnitGroup.PRESSURE, R.string.millimeter_of_mercury, R.string.millimeter_of_mercury_short),
     )
-}
\ No newline at end of file
+}
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Speed.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Speed.kt
index 5bef34cc..a4845576 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Speed.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Speed.kt
@@ -19,42 +19,42 @@
 package com.sadellie.unitto.data.units.collections
 
 import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.DefaultUnit
 import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.NormalUnit
 import com.sadellie.unitto.data.units.MyUnitIDS
 import java.math.BigDecimal
 
 internal val speedCollection: List<AbstractUnit> by lazy {
     listOf(
-        DefaultUnit(MyUnitIDS.millimeter_per_hour,           BigDecimal.valueOf(1),                      UnitGroup.SPEED,    R.string.millimeter_per_hour,           R.string.millimeter_per_hour_short),
-        DefaultUnit(MyUnitIDS.millimeter_per_minute,         BigDecimal.valueOf(60),                     UnitGroup.SPEED,    R.string.millimeter_per_minute,         R.string.millimeter_per_minute_short),
-        DefaultUnit(MyUnitIDS.millimeter_per_second,         BigDecimal.valueOf(3_600),                  UnitGroup.SPEED,    R.string.millimeter_per_second,         R.string.millimeter_per_second_short),
-        DefaultUnit(MyUnitIDS.centimeter_per_hour,           BigDecimal.valueOf(10),                     UnitGroup.SPEED,    R.string.centimeter_per_hour,           R.string.centimeter_per_hour_short),
-        DefaultUnit(MyUnitIDS.centimeter_per_minute,         BigDecimal.valueOf(600),                    UnitGroup.SPEED,    R.string.centimeter_per_minute,         R.string.centimeter_per_minute_short),
-        DefaultUnit(MyUnitIDS.centimeter_per_second,         BigDecimal.valueOf(36_000),                 UnitGroup.SPEED,    R.string.centimeter_per_second,         R.string.centimeter_per_second_short),
-        DefaultUnit(MyUnitIDS.meter_per_hour,                BigDecimal.valueOf(1_000),                  UnitGroup.SPEED,    R.string.meter_per_hour,                R.string.meter_per_hour_short),
-        DefaultUnit(MyUnitIDS.meter_per_minute,              BigDecimal.valueOf(60_000),                 UnitGroup.SPEED,    R.string.meter_per_minute,              R.string.meter_per_minute_short),
-        DefaultUnit(MyUnitIDS.meter_per_second,              BigDecimal.valueOf(3_600_000),              UnitGroup.SPEED,    R.string.meter_per_second,              R.string.meter_per_second_short),
-        DefaultUnit(MyUnitIDS.kilometer_per_hour,            BigDecimal.valueOf(1_000_000),              UnitGroup.SPEED,    R.string.kilometer_per_hour,            R.string.kilometer_per_hour_short),
-        DefaultUnit(MyUnitIDS.kilometer_per_minute,          BigDecimal.valueOf(60_000_000),             UnitGroup.SPEED,    R.string.kilometer_per_minute,          R.string.kilometer_per_minute_short),
-        DefaultUnit(MyUnitIDS.kilometer_per_second,          BigDecimal.valueOf(3_600_000_000),          UnitGroup.SPEED,    R.string.kilometer_per_second,          R.string.kilometer_per_second_short),
-        DefaultUnit(MyUnitIDS.foot_per_hour,                 BigDecimal.valueOf(304.8),                  UnitGroup.SPEED,    R.string.foot_per_hour,                 R.string.foot_per_hour_short),
-        DefaultUnit(MyUnitIDS.foot_per_minute,               BigDecimal.valueOf(18_288),                 UnitGroup.SPEED,    R.string.foot_per_minute,               R.string.foot_per_minute_short),
-        DefaultUnit(MyUnitIDS.foot_per_second,               BigDecimal.valueOf(1_097_280),              UnitGroup.SPEED,    R.string.foot_per_second,               R.string.foot_per_second_short),
-        DefaultUnit(MyUnitIDS.yard_per_hour,                 BigDecimal.valueOf(914.4),                  UnitGroup.SPEED,    R.string.yard_per_hour,                 R.string.yard_per_hour_short),
-        DefaultUnit(MyUnitIDS.yard_per_minute,               BigDecimal.valueOf(54_864),                 UnitGroup.SPEED,    R.string.yard_per_minute,               R.string.yard_per_minute_short),
-        DefaultUnit(MyUnitIDS.yard_per_second,               BigDecimal.valueOf(3_291_840),              UnitGroup.SPEED,    R.string.yard_per_second,               R.string.yard_per_second_short),
-        DefaultUnit(MyUnitIDS.mile_per_hour,                 BigDecimal.valueOf(1_609_344),              UnitGroup.SPEED,    R.string.mile_per_hour,                 R.string.mile_per_hour_short),
-        DefaultUnit(MyUnitIDS.mile_per_minute,               BigDecimal.valueOf(96_560_640),             UnitGroup.SPEED,    R.string.mile_per_minute,               R.string.mile_per_minute_short),
-        DefaultUnit(MyUnitIDS.mile_per_second,               BigDecimal.valueOf(5_793_638_400),          UnitGroup.SPEED,    R.string.mile_per_second,               R.string.mile_per_second_short),
-        DefaultUnit(MyUnitIDS.knot,                          BigDecimal.valueOf(1_852_000),              UnitGroup.SPEED,    R.string.knot,                          R.string.knot_short),
-        DefaultUnit(MyUnitIDS.velocity_of_light_in_vacuum,   BigDecimal.valueOf(1_079_252_848_799_998),  UnitGroup.SPEED,    R.string.velocity_of_light_in_vacuum,   R.string.velocity_of_light_in_vacuum_short),
-        DefaultUnit(MyUnitIDS.cosmic_velocity_first,         BigDecimal.valueOf(28_440_000_000),         UnitGroup.SPEED,    R.string.cosmic_velocity_first,         R.string.cosmic_velocity_first_short),
-        DefaultUnit(MyUnitIDS.cosmic_velocity_second,        BigDecimal.valueOf(40_320_000_000),         UnitGroup.SPEED,    R.string.cosmic_velocity_second,        R.string.cosmic_velocity_second_short),
-        DefaultUnit(MyUnitIDS.cosmic_velocity_third,         BigDecimal.valueOf(60_012_000_000),         UnitGroup.SPEED,    R.string.cosmic_velocity_third,         R.string.cosmic_velocity_third_short),
-        DefaultUnit(MyUnitIDS.earths_orbital_speed,          BigDecimal.valueOf(107_154_000_000),        UnitGroup.SPEED,    R.string.earths_orbital_speed,          R.string.earths_orbital_speed_short),
-        DefaultUnit(MyUnitIDS.mach,                          BigDecimal.valueOf(1_236_960_000),          UnitGroup.SPEED,    R.string.mach,                          R.string.mach_short),
-        DefaultUnit(MyUnitIDS.mach_si_standard,              BigDecimal.valueOf(1_062_167_040),          UnitGroup.SPEED,    R.string.mach_si_standard,              R.string.mach_si_standard_short),
+        NormalUnit(MyUnitIDS.millimeter_per_hour,           BigDecimal.valueOf(1),                      UnitGroup.SPEED,    R.string.millimeter_per_hour,           R.string.millimeter_per_hour_short),
+        NormalUnit(MyUnitIDS.millimeter_per_minute,         BigDecimal.valueOf(60),                     UnitGroup.SPEED,    R.string.millimeter_per_minute,         R.string.millimeter_per_minute_short),
+        NormalUnit(MyUnitIDS.millimeter_per_second,         BigDecimal.valueOf(3_600),                  UnitGroup.SPEED,    R.string.millimeter_per_second,         R.string.millimeter_per_second_short),
+        NormalUnit(MyUnitIDS.centimeter_per_hour,           BigDecimal.valueOf(10),                     UnitGroup.SPEED,    R.string.centimeter_per_hour,           R.string.centimeter_per_hour_short),
+        NormalUnit(MyUnitIDS.centimeter_per_minute,         BigDecimal.valueOf(600),                    UnitGroup.SPEED,    R.string.centimeter_per_minute,         R.string.centimeter_per_minute_short),
+        NormalUnit(MyUnitIDS.centimeter_per_second,         BigDecimal.valueOf(36_000),                 UnitGroup.SPEED,    R.string.centimeter_per_second,         R.string.centimeter_per_second_short),
+        NormalUnit(MyUnitIDS.meter_per_hour,                BigDecimal.valueOf(1_000),                  UnitGroup.SPEED,    R.string.meter_per_hour,                R.string.meter_per_hour_short),
+        NormalUnit(MyUnitIDS.meter_per_minute,              BigDecimal.valueOf(60_000),                 UnitGroup.SPEED,    R.string.meter_per_minute,              R.string.meter_per_minute_short),
+        NormalUnit(MyUnitIDS.meter_per_second,              BigDecimal.valueOf(3_600_000),              UnitGroup.SPEED,    R.string.meter_per_second,              R.string.meter_per_second_short),
+        NormalUnit(MyUnitIDS.kilometer_per_hour,            BigDecimal.valueOf(1_000_000),              UnitGroup.SPEED,    R.string.kilometer_per_hour,            R.string.kilometer_per_hour_short),
+        NormalUnit(MyUnitIDS.kilometer_per_minute,          BigDecimal.valueOf(60_000_000),             UnitGroup.SPEED,    R.string.kilometer_per_minute,          R.string.kilometer_per_minute_short),
+        NormalUnit(MyUnitIDS.kilometer_per_second,          BigDecimal.valueOf(3_600_000_000),          UnitGroup.SPEED,    R.string.kilometer_per_second,          R.string.kilometer_per_second_short),
+        NormalUnit(MyUnitIDS.foot_per_hour,                 BigDecimal.valueOf(304.8),                  UnitGroup.SPEED,    R.string.foot_per_hour,                 R.string.foot_per_hour_short),
+        NormalUnit(MyUnitIDS.foot_per_minute,               BigDecimal.valueOf(18_288),                 UnitGroup.SPEED,    R.string.foot_per_minute,               R.string.foot_per_minute_short),
+        NormalUnit(MyUnitIDS.foot_per_second,               BigDecimal.valueOf(1_097_280),              UnitGroup.SPEED,    R.string.foot_per_second,               R.string.foot_per_second_short),
+        NormalUnit(MyUnitIDS.yard_per_hour,                 BigDecimal.valueOf(914.4),                  UnitGroup.SPEED,    R.string.yard_per_hour,                 R.string.yard_per_hour_short),
+        NormalUnit(MyUnitIDS.yard_per_minute,               BigDecimal.valueOf(54_864),                 UnitGroup.SPEED,    R.string.yard_per_minute,               R.string.yard_per_minute_short),
+        NormalUnit(MyUnitIDS.yard_per_second,               BigDecimal.valueOf(3_291_840),              UnitGroup.SPEED,    R.string.yard_per_second,               R.string.yard_per_second_short),
+        NormalUnit(MyUnitIDS.mile_per_hour,                 BigDecimal.valueOf(1_609_344),              UnitGroup.SPEED,    R.string.mile_per_hour,                 R.string.mile_per_hour_short),
+        NormalUnit(MyUnitIDS.mile_per_minute,               BigDecimal.valueOf(96_560_640),             UnitGroup.SPEED,    R.string.mile_per_minute,               R.string.mile_per_minute_short),
+        NormalUnit(MyUnitIDS.mile_per_second,               BigDecimal.valueOf(5_793_638_400),          UnitGroup.SPEED,    R.string.mile_per_second,               R.string.mile_per_second_short),
+        NormalUnit(MyUnitIDS.knot,                          BigDecimal.valueOf(1_852_000),              UnitGroup.SPEED,    R.string.knot,                          R.string.knot_short),
+        NormalUnit(MyUnitIDS.velocity_of_light_in_vacuum,   BigDecimal.valueOf(1_079_252_848_799_998),  UnitGroup.SPEED,    R.string.velocity_of_light_in_vacuum,   R.string.velocity_of_light_in_vacuum_short),
+        NormalUnit(MyUnitIDS.cosmic_velocity_first,         BigDecimal.valueOf(28_440_000_000),         UnitGroup.SPEED,    R.string.cosmic_velocity_first,         R.string.cosmic_velocity_first_short),
+        NormalUnit(MyUnitIDS.cosmic_velocity_second,        BigDecimal.valueOf(40_320_000_000),         UnitGroup.SPEED,    R.string.cosmic_velocity_second,        R.string.cosmic_velocity_second_short),
+        NormalUnit(MyUnitIDS.cosmic_velocity_third,         BigDecimal.valueOf(60_012_000_000),         UnitGroup.SPEED,    R.string.cosmic_velocity_third,         R.string.cosmic_velocity_third_short),
+        NormalUnit(MyUnitIDS.earths_orbital_speed,          BigDecimal.valueOf(107_154_000_000),        UnitGroup.SPEED,    R.string.earths_orbital_speed,          R.string.earths_orbital_speed_short),
+        NormalUnit(MyUnitIDS.mach,                          BigDecimal.valueOf(1_236_960_000),          UnitGroup.SPEED,    R.string.mach,                          R.string.mach_short),
+        NormalUnit(MyUnitIDS.mach_si_standard,              BigDecimal.valueOf(1_062_167_040),          UnitGroup.SPEED,    R.string.mach_si_standard,              R.string.mach_si_standard_short),
     )
-}
\ No newline at end of file
+}
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Temperature.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Temperature.kt
index faa8895b..99588e63 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Temperature.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Temperature.kt
@@ -20,51 +20,48 @@ package com.sadellie.unitto.data.units.collections
 
 import com.sadellie.unitto.core.base.MAX_PRECISION
 import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.data.common.setMinimumRequiredScale
-import com.sadellie.unitto.data.common.trimZeros
-import com.sadellie.unitto.data.model.AbstractUnit
 import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.TemperatureUnit
 import com.sadellie.unitto.data.units.MyUnitIDS
 import java.math.BigDecimal
 import java.math.RoundingMode
 
 internal val temperatureCollection: List<AbstractUnit> by lazy {
     listOf(
-        object : AbstractUnit(
-            unitId = MyUnitIDS.celsius,
+        TemperatureUnit(
+            id = MyUnitIDS.celsius,
             basicUnit = BigDecimal.ONE,
             group = UnitGroup.TEMPERATURE,
             displayName = R.string.celsius,
             shortName = R.string.celsius_short,
-        ) {
-            override fun convert(unitTo: AbstractUnit, value: BigDecimal, scale: Int): BigDecimal {
-                return when (unitTo.unitId) {
+            customConvert = { unitTo, value ->
+                when (unitTo.id) {
                     MyUnitIDS.fahrenheit -> {
                         value
                             .setScale(MAX_PRECISION, RoundingMode.HALF_EVEN)
                             .times(BigDecimal.valueOf(1.8))
                             .plus(BigDecimal(32))
                     }
+
                     MyUnitIDS.kelvin -> {
                         value
                             .setScale(MAX_PRECISION, RoundingMode.HALF_EVEN)
                             .plus(BigDecimal.valueOf(273.15))
                     }
+
                     else -> value
                 }
-                    .setMinimumRequiredScale(scale)
-                    .trimZeros()
             }
-        },
-        object : AbstractUnit(
-            unitId = MyUnitIDS.fahrenheit,
+        ),
+        TemperatureUnit(
+            id = MyUnitIDS.fahrenheit,
             basicUnit = BigDecimal.ONE,
             group = UnitGroup.TEMPERATURE,
             displayName = R.string.fahrenheit,
             shortName = R.string.fahrenheit_short,
-        ) {
-            override fun convert(unitTo: AbstractUnit, value: BigDecimal, scale: Int): BigDecimal {
-                return when (unitTo.unitId) {
+            customConvert = { unitTo, value ->
+                when (unitTo.id) {
                     MyUnitIDS.celsius -> {
                         value
                             .setScale(MAX_PRECISION, RoundingMode.HALF_EVEN)
@@ -82,19 +79,16 @@ internal val temperatureCollection: List<AbstractUnit> by lazy {
                     }
                     else -> value
                 }
-                    .setMinimumRequiredScale(scale)
-                    .trimZeros()
             }
-        },
-        object : AbstractUnit(
-            unitId = MyUnitIDS.kelvin,
+        ),
+        TemperatureUnit(
+            id = MyUnitIDS.kelvin,
             basicUnit = BigDecimal.ONE,
             group = UnitGroup.TEMPERATURE,
             displayName = R.string.kelvin,
             shortName = R.string.kelvin_short,
-        ) {
-            override fun convert(unitTo: AbstractUnit, value: BigDecimal, scale: Int): BigDecimal {
-                return when (unitTo.unitId) {
+            customConvert = { unitTo, value ->
+                when (unitTo.id) {
                     MyUnitIDS.celsius -> {
                         value
                             .setScale(MAX_PRECISION, RoundingMode.HALF_EVEN)
@@ -109,9 +103,7 @@ internal val temperatureCollection: List<AbstractUnit> by lazy {
                     }
                     else -> value
                 }
-                    .setMinimumRequiredScale(scale)
-                    .trimZeros()
             }
-        },
+        ),
     )
-}
\ No newline at end of file
+}
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Time.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Time.kt
index 29f8de12..5d696688 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Time.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Time.kt
@@ -19,23 +19,23 @@
 package com.sadellie.unitto.data.units.collections
 
 import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.DefaultUnit
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.NormalUnit
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.units.MyUnitIDS
 import java.math.BigDecimal
 
 internal val timeCollection: List<AbstractUnit> by lazy {
     listOf(
-        DefaultUnit(MyUnitIDS.attosecond,    BigDecimal.valueOf(1),                                  UnitGroup.TIME, R.string.attosecond,    R.string.attosecond_short),
-        DefaultUnit(MyUnitIDS.nanosecond,    BigDecimal.valueOf(1_000_000_000),                      UnitGroup.TIME, R.string.nanosecond,    R.string.nanosecond_short),
-        DefaultUnit(MyUnitIDS.microsecond,   BigDecimal.valueOf(1_000_000_000_000),                  UnitGroup.TIME, R.string.microsecond,   R.string.microsecond_short),
-        DefaultUnit(MyUnitIDS.millisecond,   BigDecimal.valueOf(1_000_000_000_000_000),              UnitGroup.TIME, R.string.millisecond,   R.string.millisecond_short),
-        DefaultUnit(MyUnitIDS.jiffy,         BigDecimal.valueOf(10_000_000_000_000_000),             UnitGroup.TIME, R.string.jiffy,         R.string.jiffy_short),
-        DefaultUnit(MyUnitIDS.second,        BigDecimal.valueOf(1_000_000_000_000_000_000),          UnitGroup.TIME, R.string.second,        R.string.second_short),
-        DefaultUnit(MyUnitIDS.minute,        BigDecimal.valueOf(60_000_000_000_000_000_000.0),       UnitGroup.TIME, R.string.minute,        R.string.minute_short),
-        DefaultUnit(MyUnitIDS.hour,          BigDecimal.valueOf(3_600_000_000_000_000_000_000.0),    UnitGroup.TIME, R.string.hour,          R.string.hour_short),
-        DefaultUnit(MyUnitIDS.day,           BigDecimal.valueOf(86_400_000_000_000_000_000_000.0),   UnitGroup.TIME, R.string.day,           R.string.day_short),
-        DefaultUnit(MyUnitIDS.week,          BigDecimal.valueOf(604_800_000_000_000_000_000_000.0),  UnitGroup.TIME, R.string.week,          R.string.week_short),
+        NormalUnit(MyUnitIDS.attosecond,    BigDecimal.valueOf(1),                                  UnitGroup.TIME, R.string.attosecond,    R.string.attosecond_short),
+        NormalUnit(MyUnitIDS.nanosecond,    BigDecimal.valueOf(1_000_000_000),                      UnitGroup.TIME, R.string.nanosecond,    R.string.nanosecond_short),
+        NormalUnit(MyUnitIDS.microsecond,   BigDecimal.valueOf(1_000_000_000_000),                  UnitGroup.TIME, R.string.microsecond,   R.string.microsecond_short),
+        NormalUnit(MyUnitIDS.millisecond,   BigDecimal.valueOf(1_000_000_000_000_000),              UnitGroup.TIME, R.string.millisecond,   R.string.millisecond_short),
+        NormalUnit(MyUnitIDS.jiffy,         BigDecimal.valueOf(10_000_000_000_000_000),             UnitGroup.TIME, R.string.jiffy,         R.string.jiffy_short),
+        NormalUnit(MyUnitIDS.second,        BigDecimal.valueOf(1_000_000_000_000_000_000),          UnitGroup.TIME, R.string.second,        R.string.second_short),
+        NormalUnit(MyUnitIDS.minute,        BigDecimal.valueOf(60_000_000_000_000_000_000.0),       UnitGroup.TIME, R.string.minute,        R.string.minute_short),
+        NormalUnit(MyUnitIDS.hour,          BigDecimal.valueOf(3_600_000_000_000_000_000_000.0),    UnitGroup.TIME, R.string.hour,          R.string.hour_short),
+        NormalUnit(MyUnitIDS.day,           BigDecimal.valueOf(86_400_000_000_000_000_000_000.0),   UnitGroup.TIME, R.string.day,           R.string.day_short),
+        NormalUnit(MyUnitIDS.week,          BigDecimal.valueOf(604_800_000_000_000_000_000_000.0),  UnitGroup.TIME, R.string.week,          R.string.week_short),
     )
-}
\ No newline at end of file
+}
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Torque.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Torque.kt
index b1752807..600170c4 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Torque.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Torque.kt
@@ -19,30 +19,30 @@
 package com.sadellie.unitto.data.units.collections
 
 import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.DefaultUnit
 import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.NormalUnit
 import com.sadellie.unitto.data.units.MyUnitIDS
 import java.math.BigDecimal
 
 val torqueCollection: List<AbstractUnit> by lazy {
     listOf(
-        DefaultUnit(MyUnitIDS.dyne_millimeter,           BigDecimal.valueOf(1),                      UnitGroup.TORQUE,   R.string.dyne_millimeter,           R.string.dyne_millimeter_short),
-        DefaultUnit(MyUnitIDS.dyne_centimeter,           BigDecimal.valueOf(10),                     UnitGroup.TORQUE,   R.string.dyne_centimeter,           R.string.dyne_centimeter_short),
-        DefaultUnit(MyUnitIDS.dyne_meter,                BigDecimal.valueOf(1000),                   UnitGroup.TORQUE,   R.string.dyne_meter,                R.string.dyne_meter_short),
-        DefaultUnit(MyUnitIDS.newton_millimeter,         BigDecimal.valueOf(100000),                 UnitGroup.TORQUE,   R.string.newton_millimeter,         R.string.newton_millimeter_short),
-        DefaultUnit(MyUnitIDS.newton_centimeter,         BigDecimal.valueOf(1000000),                UnitGroup.TORQUE,   R.string.newton_centimeter,         R.string.newton_centimeter_short),
-        DefaultUnit(MyUnitIDS.newton_meter,              BigDecimal.valueOf(100000000),              UnitGroup.TORQUE,   R.string.newton_meter,              R.string.newton_meter_short),
-        DefaultUnit(MyUnitIDS.kilonewton_meter,          BigDecimal.valueOf(100000000000),           UnitGroup.TORQUE,   R.string.kilonewton_meter,          R.string.kilonewton_meter_short),
-        DefaultUnit(MyUnitIDS.gram_force_millimeter,     BigDecimal.valueOf(980.665),                UnitGroup.TORQUE,   R.string.gram_force_millimeter,     R.string.gram_force_millimeter_short),
-        DefaultUnit(MyUnitIDS.gram_force_centimeter,     BigDecimal.valueOf(9806.65),                UnitGroup.TORQUE,   R.string.gram_force_centimeter,     R.string.gram_force_centimeter_short),
-        DefaultUnit(MyUnitIDS.kilogram_force_millimeter, BigDecimal.valueOf(980665),                 UnitGroup.TORQUE,   R.string.kilogram_force_millimeter, R.string.kilogram_force_millimeter_short),
-        DefaultUnit(MyUnitIDS.gram_force_meter,          BigDecimal.valueOf(980665),                 UnitGroup.TORQUE,   R.string.gram_force_meter,          R.string.gram_force_meter_short),
-        DefaultUnit(MyUnitIDS.kilogram_force_centimeter, BigDecimal.valueOf(9806650),                UnitGroup.TORQUE,   R.string.kilogram_force_centimeter, R.string.kilogram_force_centimeter_short),
-        DefaultUnit(MyUnitIDS.kilogram_force_meter,      BigDecimal.valueOf(980665000),              UnitGroup.TORQUE,   R.string.kilogram_force_meter,      R.string.kilogram_force_meter_short),
-        DefaultUnit(MyUnitIDS.ounce_force_foot,          BigDecimal.valueOf(8473862.4),              UnitGroup.TORQUE,   R.string.ounce_force_foot,          R.string.ounce_force_foot_short),
-        DefaultUnit(MyUnitIDS.ounce_force_inch,          BigDecimal.valueOf(706155.2),               UnitGroup.TORQUE,   R.string.ounce_force_inch,          R.string.ounce_force_inch_short),
-        DefaultUnit(MyUnitIDS.pound_force_foot,          BigDecimal.valueOf(135581800),              UnitGroup.TORQUE,   R.string.pound_force_foot,          R.string.pound_force_foot_short),
-        DefaultUnit(MyUnitIDS.pound_force_inch,          BigDecimal.valueOf(1.1298483333333334E7),   UnitGroup.TORQUE,   R.string.pound_force_inch,          R.string.pound_force_inch_short),
+        NormalUnit(MyUnitIDS.dyne_millimeter,           BigDecimal.valueOf(1),                      UnitGroup.TORQUE,   R.string.dyne_millimeter,           R.string.dyne_millimeter_short),
+        NormalUnit(MyUnitIDS.dyne_centimeter,           BigDecimal.valueOf(10),                     UnitGroup.TORQUE,   R.string.dyne_centimeter,           R.string.dyne_centimeter_short),
+        NormalUnit(MyUnitIDS.dyne_meter,                BigDecimal.valueOf(1000),                   UnitGroup.TORQUE,   R.string.dyne_meter,                R.string.dyne_meter_short),
+        NormalUnit(MyUnitIDS.newton_millimeter,         BigDecimal.valueOf(100000),                 UnitGroup.TORQUE,   R.string.newton_millimeter,         R.string.newton_millimeter_short),
+        NormalUnit(MyUnitIDS.newton_centimeter,         BigDecimal.valueOf(1000000),                UnitGroup.TORQUE,   R.string.newton_centimeter,         R.string.newton_centimeter_short),
+        NormalUnit(MyUnitIDS.newton_meter,              BigDecimal.valueOf(100000000),              UnitGroup.TORQUE,   R.string.newton_meter,              R.string.newton_meter_short),
+        NormalUnit(MyUnitIDS.kilonewton_meter,          BigDecimal.valueOf(100000000000),           UnitGroup.TORQUE,   R.string.kilonewton_meter,          R.string.kilonewton_meter_short),
+        NormalUnit(MyUnitIDS.gram_force_millimeter,     BigDecimal.valueOf(980.665),                UnitGroup.TORQUE,   R.string.gram_force_millimeter,     R.string.gram_force_millimeter_short),
+        NormalUnit(MyUnitIDS.gram_force_centimeter,     BigDecimal.valueOf(9806.65),                UnitGroup.TORQUE,   R.string.gram_force_centimeter,     R.string.gram_force_centimeter_short),
+        NormalUnit(MyUnitIDS.kilogram_force_millimeter, BigDecimal.valueOf(980665),                 UnitGroup.TORQUE,   R.string.kilogram_force_millimeter, R.string.kilogram_force_millimeter_short),
+        NormalUnit(MyUnitIDS.gram_force_meter,          BigDecimal.valueOf(980665),                 UnitGroup.TORQUE,   R.string.gram_force_meter,          R.string.gram_force_meter_short),
+        NormalUnit(MyUnitIDS.kilogram_force_centimeter, BigDecimal.valueOf(9806650),                UnitGroup.TORQUE,   R.string.kilogram_force_centimeter, R.string.kilogram_force_centimeter_short),
+        NormalUnit(MyUnitIDS.kilogram_force_meter,      BigDecimal.valueOf(980665000),              UnitGroup.TORQUE,   R.string.kilogram_force_meter,      R.string.kilogram_force_meter_short),
+        NormalUnit(MyUnitIDS.ounce_force_foot,          BigDecimal.valueOf(8473862.4),              UnitGroup.TORQUE,   R.string.ounce_force_foot,          R.string.ounce_force_foot_short),
+        NormalUnit(MyUnitIDS.ounce_force_inch,          BigDecimal.valueOf(706155.2),               UnitGroup.TORQUE,   R.string.ounce_force_inch,          R.string.ounce_force_inch_short),
+        NormalUnit(MyUnitIDS.pound_force_foot,          BigDecimal.valueOf(135581800),              UnitGroup.TORQUE,   R.string.pound_force_foot,          R.string.pound_force_foot_short),
+        NormalUnit(MyUnitIDS.pound_force_inch,          BigDecimal.valueOf(1.1298483333333334E7),   UnitGroup.TORQUE,   R.string.pound_force_inch,          R.string.pound_force_inch_short),
     )
 }
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Volume.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Volume.kt
index 51cac9e4..a191a073 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Volume.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Volume.kt
@@ -19,34 +19,34 @@
 package com.sadellie.unitto.data.units.collections
 
 import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.DefaultUnit
 import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.NormalUnit
 import com.sadellie.unitto.data.units.MyUnitIDS
 import java.math.BigDecimal
 
 internal val volumeCollection: List<AbstractUnit> by lazy {
     listOf(
-        DefaultUnit(MyUnitIDS.attoliter,             BigDecimal.valueOf(1),                          UnitGroup.VOLUME, R.string.attoliter,            R.string.attoliter_short),
-        DefaultUnit(MyUnitIDS.milliliter,            BigDecimal.valueOf(1_000_000_000_000_000),      UnitGroup.VOLUME, R.string.milliliter,           R.string.milliliter_short),
-        DefaultUnit(MyUnitIDS.liter,                 BigDecimal.valueOf(1_000_000_000_000_000_000),  UnitGroup.VOLUME, R.string.liter,                R.string.liter_short),
-        DefaultUnit(MyUnitIDS.us_liquid_gallon,      BigDecimal.valueOf(3_785_411_783_999_977_000),  UnitGroup.VOLUME, R.string.us_liquid_gallon,     R.string.us_liquid_gallon_short),
-        DefaultUnit(MyUnitIDS.us_liquid_quart,       BigDecimal.valueOf(946_352_945_999_994_200),    UnitGroup.VOLUME, R.string.us_liquid_quart,      R.string.us_liquid_quart_short),
-        DefaultUnit(MyUnitIDS.us_liquid_pint,        BigDecimal.valueOf(473_176_472_999_997_100),    UnitGroup.VOLUME, R.string.us_liquid_pint,       R.string.us_liquid_pint_short),
-        DefaultUnit(MyUnitIDS.us_legal_cup,          BigDecimal.valueOf(236_588_236_499_998_560),    UnitGroup.VOLUME, R.string.us_legal_cup,         R.string.us_legal_cup_short),
-        DefaultUnit(MyUnitIDS.us_fluid_ounce,        BigDecimal.valueOf(29_573_529_562_499_996),     UnitGroup.VOLUME, R.string.us_fluid_ounce,       R.string.us_fluid_ounce_short),
-        DefaultUnit(MyUnitIDS.us_tablespoon,         BigDecimal.valueOf(14_786_764_781_249_998),     UnitGroup.VOLUME, R.string.us_tablespoon,        R.string.us_tablespoon_short),
-        DefaultUnit(MyUnitIDS.us_teaspoon,           BigDecimal.valueOf(4_928_921_593_749_952),      UnitGroup.VOLUME, R.string.us_teaspoon,          R.string.us_teaspoon_short),
-        DefaultUnit(MyUnitIDS.imperial_gallon,       BigDecimal.valueOf(4_546_089_999_999_954_400),  UnitGroup.VOLUME, R.string.imperial_gallon,      R.string.imperial_gallon_short),
-        DefaultUnit(MyUnitIDS.imperial_quart,        BigDecimal.valueOf(1_136_522_500_000_001_400),  UnitGroup.VOLUME, R.string.imperial_quart,       R.string.imperial_quart_short),
-        DefaultUnit(MyUnitIDS.imperial_pint,         BigDecimal.valueOf(568_261_250_000_000_700),    UnitGroup.VOLUME, R.string.imperial_pint,        R.string.imperial_pint_short),
-        DefaultUnit(MyUnitIDS.imperial_cup,          BigDecimal.valueOf(284_130_625_000_000_350),    UnitGroup.VOLUME, R.string.imperial_cup,         R.string.imperial_cup_short),
-        DefaultUnit(MyUnitIDS.imperial_fluid_ounce,  BigDecimal.valueOf(28_413_062_500_000_036),     UnitGroup.VOLUME, R.string.imperial_fluid_ounce, R.string.imperial_fluid_ounce_short),
-        DefaultUnit(MyUnitIDS.imperial_tablespoon,   BigDecimal.valueOf(17_758_164_062_500_148),     UnitGroup.VOLUME, R.string.imperial_tablespoon,  R.string.imperial_tablespoon_short),
-        DefaultUnit(MyUnitIDS.imperial_teaspoon,     BigDecimal.valueOf(5_919_388_020_833_314),      UnitGroup.VOLUME, R.string.imperial_teaspoon,    R.string.imperial_teaspoon_short),
-        DefaultUnit(MyUnitIDS.cubic_millimeter,      BigDecimal.valueOf(1_000_000_000_000),          UnitGroup.VOLUME, R.string.cubic_millimeter,     R.string.cubic_millimeter_short),
-        DefaultUnit(MyUnitIDS.cubic_centimeter,      BigDecimal.valueOf(1_000_000_000_000_000),      UnitGroup.VOLUME, R.string.cubic_centimeter,     R.string.cubic_centimeter_short),
-        DefaultUnit(MyUnitIDS.cubic_meter,           BigDecimal.valueOf(1.0E+21),                    UnitGroup.VOLUME, R.string.cubic_meter,          R.string.cubic_meter_short),
-        DefaultUnit(MyUnitIDS.cubic_kilometer,       BigDecimal.valueOf(1.0E+30),                    UnitGroup.VOLUME, R.string.cubic_kilometer,      R.string.cubic_kilometer_short),
+        NormalUnit(MyUnitIDS.attoliter,             BigDecimal.valueOf(1),                          UnitGroup.VOLUME, R.string.attoliter,            R.string.attoliter_short),
+        NormalUnit(MyUnitIDS.milliliter,            BigDecimal.valueOf(1_000_000_000_000_000),      UnitGroup.VOLUME, R.string.milliliter,           R.string.milliliter_short),
+        NormalUnit(MyUnitIDS.liter,                 BigDecimal.valueOf(1_000_000_000_000_000_000),  UnitGroup.VOLUME, R.string.liter,                R.string.liter_short),
+        NormalUnit(MyUnitIDS.us_liquid_gallon,      BigDecimal.valueOf(3_785_411_783_999_977_000),  UnitGroup.VOLUME, R.string.us_liquid_gallon,     R.string.us_liquid_gallon_short),
+        NormalUnit(MyUnitIDS.us_liquid_quart,       BigDecimal.valueOf(946_352_945_999_994_200),    UnitGroup.VOLUME, R.string.us_liquid_quart,      R.string.us_liquid_quart_short),
+        NormalUnit(MyUnitIDS.us_liquid_pint,        BigDecimal.valueOf(473_176_472_999_997_100),    UnitGroup.VOLUME, R.string.us_liquid_pint,       R.string.us_liquid_pint_short),
+        NormalUnit(MyUnitIDS.us_legal_cup,          BigDecimal.valueOf(236_588_236_499_998_560),    UnitGroup.VOLUME, R.string.us_legal_cup,         R.string.us_legal_cup_short),
+        NormalUnit(MyUnitIDS.us_fluid_ounce,        BigDecimal.valueOf(29_573_529_562_499_996),     UnitGroup.VOLUME, R.string.us_fluid_ounce,       R.string.us_fluid_ounce_short),
+        NormalUnit(MyUnitIDS.us_tablespoon,         BigDecimal.valueOf(14_786_764_781_249_998),     UnitGroup.VOLUME, R.string.us_tablespoon,        R.string.us_tablespoon_short),
+        NormalUnit(MyUnitIDS.us_teaspoon,           BigDecimal.valueOf(4_928_921_593_749_952),      UnitGroup.VOLUME, R.string.us_teaspoon,          R.string.us_teaspoon_short),
+        NormalUnit(MyUnitIDS.imperial_gallon,       BigDecimal.valueOf(4_546_089_999_999_954_400),  UnitGroup.VOLUME, R.string.imperial_gallon,      R.string.imperial_gallon_short),
+        NormalUnit(MyUnitIDS.imperial_quart,        BigDecimal.valueOf(1_136_522_500_000_001_400),  UnitGroup.VOLUME, R.string.imperial_quart,       R.string.imperial_quart_short),
+        NormalUnit(MyUnitIDS.imperial_pint,         BigDecimal.valueOf(568_261_250_000_000_700),    UnitGroup.VOLUME, R.string.imperial_pint,        R.string.imperial_pint_short),
+        NormalUnit(MyUnitIDS.imperial_cup,          BigDecimal.valueOf(284_130_625_000_000_350),    UnitGroup.VOLUME, R.string.imperial_cup,         R.string.imperial_cup_short),
+        NormalUnit(MyUnitIDS.imperial_fluid_ounce,  BigDecimal.valueOf(28_413_062_500_000_036),     UnitGroup.VOLUME, R.string.imperial_fluid_ounce, R.string.imperial_fluid_ounce_short),
+        NormalUnit(MyUnitIDS.imperial_tablespoon,   BigDecimal.valueOf(17_758_164_062_500_148),     UnitGroup.VOLUME, R.string.imperial_tablespoon,  R.string.imperial_tablespoon_short),
+        NormalUnit(MyUnitIDS.imperial_teaspoon,     BigDecimal.valueOf(5_919_388_020_833_314),      UnitGroup.VOLUME, R.string.imperial_teaspoon,    R.string.imperial_teaspoon_short),
+        NormalUnit(MyUnitIDS.cubic_millimeter,      BigDecimal.valueOf(1_000_000_000_000),          UnitGroup.VOLUME, R.string.cubic_millimeter,     R.string.cubic_millimeter_short),
+        NormalUnit(MyUnitIDS.cubic_centimeter,      BigDecimal.valueOf(1_000_000_000_000_000),      UnitGroup.VOLUME, R.string.cubic_centimeter,     R.string.cubic_centimeter_short),
+        NormalUnit(MyUnitIDS.cubic_meter,           BigDecimal.valueOf(1.0E+21),                    UnitGroup.VOLUME, R.string.cubic_meter,          R.string.cubic_meter_short),
+        NormalUnit(MyUnitIDS.cubic_kilometer,       BigDecimal.valueOf(1.0E+30),                    UnitGroup.VOLUME, R.string.cubic_kilometer,      R.string.cubic_kilometer_short),
     )
-}
\ No newline at end of file
+}
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/remote/CurrencyApiService.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/remote/CurrencyApiService.kt
index 642bc5db..95383a9e 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/remote/CurrencyApiService.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/remote/CurrencyApiService.kt
@@ -49,5 +49,5 @@ interface CurrencyApiService {
 }
 
 object CurrencyApi {
-    val retrofitService: CurrencyApiService by lazy { retrofit.create(CurrencyApiService::class.java) }
+    val service: CurrencyApiService by lazy { retrofit.create(CurrencyApiService::class.java) }
 }
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/remote/CurrencyUnitResponse.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/remote/CurrencyUnitResponse.kt
index a664961e..b8f55413 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/remote/CurrencyUnitResponse.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/remote/CurrencyUnitResponse.kt
@@ -20,7 +20,6 @@ package com.sadellie.unitto.data.units.remote
 
 import com.squareup.moshi.FromJson
 import com.squareup.moshi.ToJson
-import java.math.BigDecimal
 
 /**
  * Represents a response object from currency-api
@@ -30,7 +29,7 @@ import java.math.BigDecimal
  */
 data class CurrencyUnitResponse(
     val date: String,
-    val currency: Map<String, BigDecimal>
+    val currency: Map<String, Double>
 )
 
 /**
@@ -42,12 +41,9 @@ internal class CurrencyAdapter {
 
     @Suppress("UNUSED", "UNCHECKED_CAST")
     @FromJson fun fromJson(response: Map<String, Any>): CurrencyUnitResponse {
-        val pairsBD: Map<String, BigDecimal> = (response[response.keys.elementAt(1)] as Map<String, Double>)
-            .mapValues { it.value.toBigDecimal() }
-
         return CurrencyUnitResponse(
             date = response["date"] as String,
-            currency = pairsBD
+            currency = (response[response.keys.elementAt(1)]) as Map<String, Double>
         )
     }
 }
diff --git a/data/units/src/test/java/com/sadellie/unitto/data/units/AllUnitsRepositoryTest.kt b/data/units/src/test/java/com/sadellie/unitto/data/units/AllUnitsRepositoryTest.kt
deleted file mode 100644
index ab6b2a74..00000000
--- a/data/units/src/test/java/com/sadellie/unitto/data/units/AllUnitsRepositoryTest.kt
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Unitto is a unit converter for Android
- * Copyright (c) 2022-2023 Elshan Agaev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.sadellie.unitto.data.units
-
-import com.sadellie.unitto.data.model.ALL_UNIT_GROUPS
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.UnitGroup
-import org.junit.Assert.assertEquals
-import org.junit.Test
-import java.math.BigDecimal
-
-class AllUnitsRepositoryTest {
-
-    private val allUnitsRepository = AllUnitsRepository()
-
-    private val allUnits: List<AbstractUnit> = ALL_UNIT_GROUPS.flatMap { allUnitsRepository.getCollectionByGroup(it) }
-
-    @Test
-    fun filterAllUnitsNoFiltersLeft() {
-        //  No filters applied, empty search query, from Left side list
-        val result = allUnitsRepository.filterUnits(
-            hideBrokenUnits = false,
-            chosenUnitGroup = null,
-            favoritesOnly = false,
-            searchQuery = "",
-            allUnitsGroups = ALL_UNIT_GROUPS
-        )
-        assertEquals(allUnits.groupBy { it.group }, result)
-    }
-
-    @Test
-    fun filterAllUnitsAllFiltersLeft() {
-        allUnitsRepository
-            .getById(MyUnitIDS.kilometer_per_hour)
-            .apply { isFavorite = true; renderedName = "Kilometer per hour" }
-
-        // All filters applied, from Left side list
-        val result = allUnitsRepository.filterUnits(
-            hideBrokenUnits = false,
-            chosenUnitGroup = UnitGroup.SPEED,
-            favoritesOnly = true,
-            searchQuery = "kilometer per hour",
-            allUnitsGroups = ALL_UNIT_GROUPS
-        )
-        assertEquals(
-            mapOf(UnitGroup.SPEED to listOf(allUnitsRepository.getCollectionByGroup(UnitGroup.SPEED)
-                .first { it.unitId == MyUnitIDS.kilometer_per_hour })),
-            result
-        )
-    }
-
-    @Test
-    fun filterAllUnitsChosenGroupLeft() {
-        // Only specific group is needed, left side screen
-        val result = allUnitsRepository.filterUnits(
-            hideBrokenUnits = false,
-            chosenUnitGroup = UnitGroup.TIME,
-            favoritesOnly = false,
-            searchQuery = "",
-            allUnitsGroups = ALL_UNIT_GROUPS
-        )
-        assertEquals(allUnits.filter { it.group == UnitGroup.TIME }
-            .groupBy { it.group }, result)
-    }
-
-    @Test
-    fun filterAllUnitsFavoritesOnlyLeft() {
-        allUnitsRepository.getById(MyUnitIDS.kilometer).isFavorite = true
-        // Only favorite units, left side screen
-        val result = allUnitsRepository.filterUnits(
-            hideBrokenUnits = false,
-            chosenUnitGroup = null,
-            favoritesOnly = true,
-            searchQuery = "",
-            allUnitsGroups = ALL_UNIT_GROUPS
-        )
-        assertEquals(allUnits.filter { it.unitId == MyUnitIDS.kilometer }
-            .groupBy { it.group }, result)
-    }
-
-    @Test
-    fun filterAllUnitsSearchQueryOnlyLeft() {
-        allUnitsRepository
-            .getById(MyUnitIDS.kilometer_per_hour)
-            .apply { renderedName = "Kilometer per hour" }
-
-        // Only search query is entered, other filters are not set, left side screen
-        val result = allUnitsRepository.filterUnits(
-            hideBrokenUnits = false,
-            chosenUnitGroup = null,
-            favoritesOnly = false,
-            searchQuery = "kilometer per hour",
-            allUnitsGroups = ALL_UNIT_GROUPS
-        )
-        assertEquals(
-            mapOf(UnitGroup.SPEED to listOf(allUnitsRepository.getCollectionByGroup(UnitGroup.SPEED)
-                .first { it.unitId == MyUnitIDS.kilometer_per_hour })),
-            result
-        )
-    }
-
-    @Test
-    fun filterAllUnitsHideBrokenCurrencies() {
-        allUnitsRepository
-            .getById(MyUnitIDS.currency_btc)
-            .apply { basicUnit = BigDecimal.ZERO }
-        // Hide broken currencies (i.e. cannot be used for conversion at the moment)
-        val result = allUnitsRepository.filterUnits(
-            hideBrokenUnits = true,
-            chosenUnitGroup = UnitGroup.CURRENCY,
-            favoritesOnly = false,
-            searchQuery = "",
-            allUnitsGroups = ALL_UNIT_GROUPS
-        )
-        assertEquals(
-            mapOf(UnitGroup.CURRENCY to allUnitsRepository.getCollectionByGroup(UnitGroup.CURRENCY)
-                .filter { it.unitId != MyUnitIDS.currency_btc }),
-            result
-        )
-    }
-}
diff --git a/data/units/src/test/java/com/sadellie/unitto/data/units/AllUnitsTest.kt b/data/units/src/test/java/com/sadellie/unitto/data/units/AllUnitsTest.kt
index e7d562b0..fac9163b 100644
--- a/data/units/src/test/java/com/sadellie/unitto/data/units/AllUnitsTest.kt
+++ b/data/units/src/test/java/com/sadellie/unitto/data/units/AllUnitsTest.kt
@@ -18,18 +18,32 @@
 
 package com.sadellie.unitto.data.units
 
-import com.sadellie.unitto.data.model.NumberBaseUnit
+import android.content.Context
+import androidx.room.Room
+import com.sadellie.unitto.data.common.setMinimumRequiredScale
+import com.sadellie.unitto.data.common.trimZeros
+import com.sadellie.unitto.data.database.UnittoDatabase
 import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.unit.DefaultUnit
+import com.sadellie.unitto.data.model.unit.NumberBaseUnit
+import com.sadellie.unitto.data.model.unit.ReverseUnit
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
 import java.math.BigDecimal
 
+@RunWith(RobolectricTestRunner::class)
 class AllUnitsTest {
 
-    // Group and it's tested unit ids
     private var history: MutableMap<UnitGroup, Set<String>> = mutableMapOf()
-    private val allUnitsRepository = AllUnitsRepository()
+    private val mContext: Context = RuntimeEnvironment.getApplication().applicationContext
+    private val allUnitsRepository = UnitsRepository(
+        Room.inMemoryDatabaseBuilder(mContext, UnittoDatabase::class.java).build().unitsDao(),
+        mContext
+    )
 
     @Test
     fun testAcceleration() = testWithUnits {
@@ -510,16 +524,35 @@ class AllUnitsTest {
         skot.checkWith(lumen_per_square_meter_per_steradian, "6723", "2.14")
     }
 
+    @Test
+    fun testFuelConsumptionCollection() = testWithUnits {
+        kilometer_per_liter.checkWith(gallon_uk_per_mile, "47.45", "0.00746")
+        liter_per_kilometer.checkWith(kilometer_per_liter, "47.45", "0.02107")
+        liter_per_100_kilometer.checkWith(kilometer_per_liter, "47.45", "2.10748")
+        mile_per_gallon_uk.checkWith(mile_per_gallon_us, "47.45", "39.51039")
+        mile_per_gallon_us.checkWith(gallon_us_per_100_mile, "47.45", "2.10748")
+        mile_us_per_liter.checkWith(gallon_uk_per_100_mile, "47.45", "0.46358")
+        gallon_us_per_mile.checkWith(liter_per_100_kilometer, "47.45", "11160.93198")
+        gallon_uk_per_mile.checkWith(kilometer_per_liter, "47.45", "0.00746")
+        gallon_us_per_100_mile.checkWith(gallon_us_per_mile, "47.45", "0.4745")
+        gallon_uk_per_100_mile.checkWith(mile_per_gallon_us, "47.45", "1.75485")
+    }
+
     private fun String.checkWith(checkingId: String, value: String, expected: String) {
         val unitFrom = allUnitsRepository.getById(this)
         val unitTo = allUnitsRepository.getById(checkingId)
 
-        val actual = if (unitFrom.group == UnitGroup.NUMBER_BASE) {
-            (unitFrom as NumberBaseUnit)
-                .convertToBase(value, (unitTo as NumberBaseUnit).base)
-        } else {
-            unitFrom
-                .convert(unitTo, BigDecimal(value), 5)
+        val actual = when (unitFrom.group) {
+            UnitGroup.NUMBER_BASE -> (unitFrom as NumberBaseUnit).convert((unitTo as NumberBaseUnit), value)
+            UnitGroup.FLOW_RATE -> (unitFrom as ReverseUnit)
+                .convert((unitTo as DefaultUnit), BigDecimal(value))
+                .setMinimumRequiredScale(5)
+                .trimZeros()
+                .toPlainString()
+            else -> (unitFrom as DefaultUnit)
+                .convert((unitTo as DefaultUnit), BigDecimal(value))
+                .setMinimumRequiredScale(5)
+                .trimZeros()
                 .toPlainString()
         }
         assertEquals("Failed at $this to $checkingId", expected, actual)
@@ -532,7 +565,7 @@ class AllUnitsTest {
     fun after() {
         val unitGroup = history.keys.first()
         // GROUP : testedCount / totalCount
-        println("${unitGroup.name} : ${history[unitGroup]?.size} / ${allUnitsRepository.getCollectionByGroup(unitGroup).size}")
+        println("${unitGroup.name} : ${history[unitGroup]?.size} / ${allUnitsRepository.getCollection(unitGroup).size}")
     }
 
     private fun testWithUnits(block: MyUnitIDS.() -> Unit): Unit = with(MyUnitIDS, block = block)
diff --git a/data/units/src/test/java/com/sadellie/unitto/data/units/LevenshteinFilterAndSortTest.kt b/data/units/src/test/java/com/sadellie/unitto/data/units/LevenshteinFilterAndSortTest.kt
index 95d56a27..f6acf9d8 100644
--- a/data/units/src/test/java/com/sadellie/unitto/data/units/LevenshteinFilterAndSortTest.kt
+++ b/data/units/src/test/java/com/sadellie/unitto/data/units/LevenshteinFilterAndSortTest.kt
@@ -18,34 +18,38 @@
 
 package com.sadellie.unitto.data.units
 
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.DefaultUnit
+import android.content.Context
+import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.data.model.UnitGroup
-import com.sadellie.unitto.data.model.sortByLev
+import com.sadellie.unitto.data.model.unit.NormalUnit
+import com.sadellie.unitto.data.model.unit.filterByLev
 import org.junit.Assert.assertEquals
 import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
 import java.math.BigDecimal
 
-val baseList: List<AbstractUnit> = listOf(
-    "Attometer",
-    "Nanometer",
-    "Millimeter",
-    "Meter",
-    "Kilometer",
-    "Mile",
-    "Pound",
-    "Kilometer per square"
-).map { name ->
-    DefaultUnit("", BigDecimal.ONE, UnitGroup.ANGLE, 0, 0)
-        .also { it.renderedName = name }
-}
+val baseList = listOf(
+    NormalUnit("", BigDecimal.ONE, UnitGroup.ANGLE, R.string.attometer, R.string.attometer_short),
+    NormalUnit("", BigDecimal.ONE, UnitGroup.ANGLE, R.string.nanometer, R.string.nanometer_short),
+    NormalUnit("", BigDecimal.ONE, UnitGroup.ANGLE, R.string.millimeter, R.string.millimeter_short),
+    NormalUnit("", BigDecimal.ONE, UnitGroup.ANGLE, R.string.meter, R.string.meter_short),
+    NormalUnit("", BigDecimal.ONE, UnitGroup.ANGLE, R.string.kilometer, R.string.kilometer_short),
+    NormalUnit("", BigDecimal.ONE, UnitGroup.ANGLE, R.string.mile, R.string.mile_short),
+    NormalUnit("", BigDecimal.ONE, UnitGroup.ANGLE, R.string.pound, R.string.pound_short),
+    NormalUnit("", BigDecimal.ONE, UnitGroup.ANGLE, R.string.kilometer_per_square_second, R.string.kilometer_per_square_second_short),
+)
 
+@RunWith(RobolectricTestRunner::class)
 class LevenshteinFilterAndSortTest {
 
+    private val mContext: Context = RuntimeEnvironment.getApplication().applicationContext
+
     @Test
     fun testOneEdit() {
         val searchQuery = "Kelometer"
-        val result = baseList.asSequence().sortByLev(searchQuery).map { it.renderedName }.toList()
+        val result = baseList.asSequence().filterByLev(searchQuery, mContext).map { mContext.getString(it.displayName) }.toList()
         println(result)
         assertEquals(
             listOf("Kilometer", "Kilometer per square", "Attometer", "Nanometer"),
@@ -56,7 +60,7 @@ class LevenshteinFilterAndSortTest {
     @Test
     fun testLongQuery() {
         val searchQuery = "Kelometers per"
-        val result = baseList.asSequence().sortByLev(searchQuery).map { it.renderedName }.toList()
+        val result = baseList.asSequence().filterByLev(searchQuery, mContext).map { mContext.getString(it.displayName) }.toList()
         println(result)
         assertEquals(
             listOf("Kilometer per square", "Kilometer"),
@@ -67,7 +71,7 @@ class LevenshteinFilterAndSortTest {
     @Test
     fun testMultipleMatches() {
         val searchQuery = "meter"
-        val result = baseList.asSequence().sortByLev(searchQuery).map { it.renderedName }.toList()
+        val result = baseList.asSequence().filterByLev(searchQuery, mContext).map { mContext.getString(it.displayName) }.toList()
         println(result)
         assertEquals(
             listOf("Meter", "Attometer", "Nanometer", "Millimeter", "Kilometer","Kilometer per square"),
@@ -78,7 +82,7 @@ class LevenshteinFilterAndSortTest {
     @Test
     fun testNone() {
         val searchQuery = "Very long unit name that doesn't exist"
-        val result = baseList.asSequence().sortByLev(searchQuery).map { it.renderedName }.toList()
+        val result = baseList.asSequence().filterByLev(searchQuery, mContext).map { mContext.getString(it.displayName) }.toList()
         println(result)
         assertEquals(
             listOf<String>(),
@@ -89,7 +93,7 @@ class LevenshteinFilterAndSortTest {
     @Test
     fun testLowerAndUpperCases() {
         val searchQuery = "T"
-        val result = baseList.asSequence().sortByLev(searchQuery).map { it.renderedName }.toList()
+        val result = baseList.asSequence().filterByLev(searchQuery, mContext).map { mContext.getString(it.displayName) }.toList()
         println(result)
         assertEquals(
             listOf("Attometer", "Nanometer", "Millimeter", "Meter", "Kilometer", "Kilometer per square"),
diff --git a/data/userprefs/build.gradle.kts b/data/userprefs/build.gradle.kts
index 063de206..4c38ed40 100644
--- a/data/userprefs/build.gradle.kts
+++ b/data/userprefs/build.gradle.kts
@@ -26,10 +26,10 @@ android {
 }
 
 dependencies {
-    implementation(libs.androidx.datastore)
+    implementation(libs.androidx.datastore.datastore.preferences)
     implementation(libs.com.github.sadellie.themmo)
 
-    implementation(project(mapOf("path" to ":core:base")))
-    implementation(project(mapOf("path" to ":data:model")))
-    implementation(project(mapOf("path" to ":data:units")))
+    implementation(project(":core:base"))
+    implementation(project(":data:model"))
+    implementation(project(":data:units"))
 }
diff --git a/data/userprefs/src/main/java/com/sadellie/unitto/data/userprefs/UserPreferences.kt b/data/userprefs/src/main/java/com/sadellie/unitto/data/userprefs/UserPreferences.kt
index 81d3d1c3..6a97ddd3 100644
--- a/data/userprefs/src/main/java/com/sadellie/unitto/data/userprefs/UserPreferences.kt
+++ b/data/userprefs/src/main/java/com/sadellie/unitto/data/userprefs/UserPreferences.kt
@@ -31,328 +31,284 @@ import com.sadellie.unitto.core.base.OutputFormat
 import com.sadellie.unitto.core.base.Separator
 import com.sadellie.unitto.core.base.TopLevelDestinations
 import com.sadellie.unitto.data.model.ALL_UNIT_GROUPS
-import com.sadellie.unitto.data.model.AbstractUnit
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.UnitsListSorting
+import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.units.MyUnitIDS
 import io.github.sadellie.themmo.MonetMode
 import io.github.sadellie.themmo.ThemingMode
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
 import java.io.IOException
 import javax.inject.Inject
 
-/**
- * Represents user preferences that are user across the app
- *
- * @property themingMode [ThemingMode] from Themmo.
- * @property enableDynamicTheme Use dynamic color scheme
- * @property enableAmoledTheme Use amoled color scheme
- * @property customColor Generate custom color scheme from this color.
- * @property digitsPrecision Current [PRECISIONS]. Number of digits in fractional part
- * @property separator Current [Separator] that used to separate thousands
- * @property outputFormat Current [OutputFormat] that is applied to converted value (not input)
- * @property latestLeftSideUnit Latest [AbstractUnit] that was on the left side
- * @property latestRightSideUnit Latest [AbstractUnit] that was on the right side
- * @property shownUnitGroups [UnitGroup]s that user wants to see. Excludes other [UnitGroup]s,
- * @property enableVibrations When true will use haptic feedback in app.
- * @property enableToolsExperiment When true will enable experimental Tools screen.
- * @property radianMode AngleMode in mxParser. When true - Radian, when False - Degree.
- * @property unitConverterFavoritesOnly If true will show only units that are marked as favorite.
- * @property unitConverterFormatTime If true will format time to be more human readable.
- * @property unitConverterSorting Units list sorting mode.
- */
-data class UserPreferences(
+private object PrefsKeys {
+    val THEMING_MODE = stringPreferencesKey("THEMING_MODE_PREF_KEY")
+    val ENABLE_DYNAMIC_THEME = booleanPreferencesKey("ENABLE_DYNAMIC_THEME_PREF_KEY")
+    val ENABLE_AMOLED_THEME = booleanPreferencesKey("ENABLE_AMOLED_THEME_PREF_KEY")
+    val CUSTOM_COLOR = longPreferencesKey("CUSTOM_COLOR_PREF_KEY")
+    val MONET_MODE = stringPreferencesKey("MONET_MODE_PREF_KEY")
+    val DIGITS_PRECISION = intPreferencesKey("DIGITS_PRECISION_PREF_KEY")
+    val SEPARATOR = intPreferencesKey("SEPARATOR_PREF_KEY")
+    val OUTPUT_FORMAT = intPreferencesKey("OUTPUT_FORMAT_PREF_KEY")
+    val LATEST_LEFT_SIDE = stringPreferencesKey("LATEST_LEFT_SIDE_PREF_KEY")
+    val LATEST_RIGHT_SIDE = stringPreferencesKey("LATEST_RIGHT_SIDE_PREF_KEY")
+    val SHOWN_UNIT_GROUPS = stringPreferencesKey("SHOWN_UNIT_GROUPS_PREF_KEY")
+    val ENABLE_VIBRATIONS = booleanPreferencesKey("ENABLE_VIBRATIONS_PREF_KEY")
+    val ENABLE_TOOLS_EXPERIMENT = booleanPreferencesKey("ENABLE_TOOLS_EXPERIMENT_PREF_KEY")
+    val STARTING_SCREEN = stringPreferencesKey("STARTING_SCREEN_PREF_KEY")
+    val RADIAN_MODE = booleanPreferencesKey("RADIAN_MODE_PREF_KEY")
+    val UNIT_CONVERTER_FAVORITES_ONLY =
+        booleanPreferencesKey("UNIT_CONVERTER_FAVORITES_ONLY_PREF_KEY")
+    val UNIT_CONVERTER_FORMAT_TIME = booleanPreferencesKey("UNIT_CONVERTER_FORMAT_TIME_PREF_KEY")
+    val UNIT_CONVERTER_SORTING = stringPreferencesKey("UNIT_CONVERTER_SORTING_PREF_KEY")
+    val MIDDLE_ZERO = booleanPreferencesKey("MIDDLE_ZERO_PREF_KEY")
+    val SYSTEM_FONT = booleanPreferencesKey("SYSTEM_FONT_PREF_KEY")
+    val PARTIAL_HISTORY_VIEW = booleanPreferencesKey("PARTIAL_HISTORY_VIEW_PREF_KEY")
+}
+
+data class AppPreferences(
     val themingMode: ThemingMode = ThemingMode.AUTO,
     val enableDynamicTheme: Boolean = true,
     val enableAmoledTheme: Boolean = false,
     val customColor: Color = Color.Unspecified,
-    val monetMode: MonetMode = MonetMode.TONAL_SPOT,
-    val digitsPrecision: Int = 3,
-    val separator: Int = Separator.SPACE,
-    val outputFormat: Int = OutputFormat.PLAIN,
-    val latestLeftSideUnit: String = MyUnitIDS.kilometer,
-    val latestRightSideUnit: String = MyUnitIDS.mile,
-    val shownUnitGroups: List<UnitGroup> = ALL_UNIT_GROUPS,
-    val enableVibrations: Boolean = true,
-    val enableToolsExperiment: Boolean = false,
+    val monetMode: MonetMode = MonetMode.TonalSpot,
     val startingScreen: String = TopLevelDestinations.Calculator.graph,
+    val enableToolsExperiment: Boolean = false,
+    val systemFont: Boolean = false,
+)
+
+data class GeneralPreferences(
+    val enableVibrations: Boolean = true,
+)
+
+data class CalculatorPreferences(
     val radianMode: Boolean = true,
-    val unitConverterFavoritesOnly: Boolean = false,
+    val enableVibrations: Boolean = true,
+    val separator: Int = Separator.SPACE,
+    val middleZero: Boolean = false,
+    val partialHistoryView: Boolean = true,
+    val precision: Int = 3,
+    val outputFormat: Int = OutputFormat.PLAIN,
+)
+
+data class ConverterPreferences(
+    val enableVibrations: Boolean = true,
+    val separator: Int = Separator.SPACE,
+    val middleZero: Boolean = false,
+    val precision: Int = 3,
+    val outputFormat: Int = OutputFormat.PLAIN,
     val unitConverterFormatTime: Boolean = false,
     val unitConverterSorting: UnitsListSorting = UnitsListSorting.USAGE,
+    val shownUnitGroups: List<UnitGroup> = ALL_UNIT_GROUPS,
+    val unitConverterFavoritesOnly: Boolean = false,
+    val enableToolsExperiment: Boolean = false,
+    val latestLeftSideUnit: String = MyUnitIDS.kilometer,
+    val latestRightSideUnit: String = MyUnitIDS.mile,
+)
+
+data class DisplayPreferences(
+    val systemFont: Boolean = false,
     val middleZero: Boolean = false,
 )
 
-data class UIPreferences(
-    val themingMode: ThemingMode = ThemingMode.AUTO,
-    val enableDynamicTheme: Boolean = true,
-    val enableAmoledTheme: Boolean = false,
-    val customColor: Color = Color.Unspecified,
-    val monetMode: MonetMode = MonetMode.TONAL_SPOT,
-    val startingScreen: String = TopLevelDestinations.Calculator.graph,
-    val enableToolsExperiment: Boolean = false,
-)
-
-data class MainPreferences(
+data class FormattingPreferences(
     val digitsPrecision: Int = 3,
     val separator: Int = Separator.SPACE,
     val outputFormat: Int = OutputFormat.PLAIN,
-    val latestLeftSideUnit: String = MyUnitIDS.kilometer,
-    val latestRightSideUnit: String = MyUnitIDS.mile,
-    val shownUnitGroups: List<UnitGroup> = ALL_UNIT_GROUPS,
-    val enableVibrations: Boolean = true,
-    val radianMode: Boolean = true,
-    val unitConverterFavoritesOnly: Boolean = false,
-    val unitConverterFormatTime: Boolean = false,
-    val unitConverterSorting: UnitsListSorting = UnitsListSorting.USAGE,
-    val middleZero: Boolean = false,
 )
 
-/**
- * Repository that works with DataStore
- */
+data class UnitGroupsPreferences(
+    val shownUnitGroups: List<UnitGroup> = ALL_UNIT_GROUPS,
+)
+
+data class AddSubtractPreferences(
+    val separator: Int = Separator.SPACE,
+    val enableVibrations: Boolean = true,
+)
+
+data class AboutPreferences(
+    val enableToolsExperiment: Boolean = false,
+)
+
+data class StartingScreenPreferences(
+    val startingScreen: String = TopLevelDestinations.Calculator.graph,
+)
+
 class UserPreferencesRepository @Inject constructor(private val dataStore: DataStore<Preferences>) {
-    /**
-     * Keys for DataStore
-     */
-    private object PrefsKeys {
-        val THEMING_MODE = stringPreferencesKey("THEMING_MODE_PREF_KEY")
-        val ENABLE_DYNAMIC_THEME = booleanPreferencesKey("ENABLE_DYNAMIC_THEME_PREF_KEY")
-        val ENABLE_AMOLED_THEME = booleanPreferencesKey("ENABLE_AMOLED_THEME_PREF_KEY")
-        val CUSTOM_COLOR = longPreferencesKey("CUSTOM_COLOR_PREF_KEY")
-        val MONET_MODE = stringPreferencesKey("MONET_MODE_PREF_KEY")
-        val DIGITS_PRECISION = intPreferencesKey("DIGITS_PRECISION_PREF_KEY")
-        val SEPARATOR = intPreferencesKey("SEPARATOR_PREF_KEY")
-        val OUTPUT_FORMAT = intPreferencesKey("OUTPUT_FORMAT_PREF_KEY")
-        val LATEST_LEFT_SIDE = stringPreferencesKey("LATEST_LEFT_SIDE_PREF_KEY")
-        val LATEST_RIGHT_SIDE = stringPreferencesKey("LATEST_RIGHT_SIDE_PREF_KEY")
-        val SHOWN_UNIT_GROUPS = stringPreferencesKey("SHOWN_UNIT_GROUPS_PREF_KEY")
-        val ENABLE_VIBRATIONS = booleanPreferencesKey("ENABLE_VIBRATIONS_PREF_KEY")
-        val ENABLE_TOOLS_EXPERIMENT = booleanPreferencesKey("ENABLE_TOOLS_EXPERIMENT_PREF_KEY")
-        val STARTING_SCREEN = stringPreferencesKey("STARTING_SCREEN_PREF_KEY")
-        val RADIAN_MODE = booleanPreferencesKey("RADIAN_MODE_PREF_KEY")
-        val UNIT_CONVERTER_FAVORITES_ONLY = booleanPreferencesKey("UNIT_CONVERTER_FAVORITES_ONLY_PREF_KEY")
-        val UNIT_CONVERTER_FORMAT_TIME = booleanPreferencesKey("UNIT_CONVERTER_FORMAT_TIME_PREF_KEY")
-        val UNIT_CONVERTER_SORTING = stringPreferencesKey("UNIT_CONVERTER_SORTING_PREF_KEY")
-        val MIDDLE_ZERO = booleanPreferencesKey("MIDDLE_ZERO_PREF_KEY")
-    }
+    private val data = dataStore.data
+        .catch { if (it is IOException) emit(emptyPreferences()) else throw it }
 
-    val uiPreferencesFlow: Flow<UIPreferences> = dataStore.data
-        .catch { exception ->
-            if (exception is IOException) {
-                emit(emptyPreferences())
-            } else {
-                throw exception
-            }
-        }
+    val appPrefs: Flow<AppPreferences> = data
         .map { preferences ->
-            val themingMode: ThemingMode = preferences[PrefsKeys.THEMING_MODE]?.let { ThemingMode.valueOf(it) }
-                ?: ThemingMode.AUTO
-            val enableDynamicTheme: Boolean = preferences[PrefsKeys.ENABLE_DYNAMIC_THEME] ?: true
-            val enableAmoledTheme: Boolean = preferences[PrefsKeys.ENABLE_AMOLED_THEME] ?: false
-            val customColor: Color = preferences[PrefsKeys.CUSTOM_COLOR]?.let { Color(it.toULong()) } ?: Color.Unspecified
-            val monetMode: MonetMode = preferences[PrefsKeys.MONET_MODE]?.let { MonetMode.valueOf(it) }
-                ?: MonetMode.TONAL_SPOT
-            val startingScreen: String = preferences[PrefsKeys.STARTING_SCREEN] ?: TopLevelDestinations.Calculator.graph
-            val enableToolsExperiment: Boolean = preferences[PrefsKeys.ENABLE_TOOLS_EXPERIMENT] ?: false
-
-            UIPreferences(
-                themingMode = themingMode,
-                enableDynamicTheme = enableDynamicTheme,
-                enableAmoledTheme = enableAmoledTheme,
-                customColor = customColor,
-                monetMode = monetMode,
-                startingScreen = startingScreen,
-                enableToolsExperiment = enableToolsExperiment
+            AppPreferences(
+                themingMode = preferences[PrefsKeys.THEMING_MODE]?.letTryOrNull {
+                    ThemingMode.valueOf(it)
+                }
+                    ?: ThemingMode.AUTO,
+                enableDynamicTheme = preferences[PrefsKeys.ENABLE_DYNAMIC_THEME] ?: true,
+                enableAmoledTheme = preferences[PrefsKeys.ENABLE_AMOLED_THEME] ?: false,
+                customColor = preferences[PrefsKeys.CUSTOM_COLOR]?.letTryOrNull { Color(it.toULong()) }
+                    ?: Color.Unspecified,
+                monetMode = preferences[PrefsKeys.MONET_MODE]?.letTryOrNull { MonetMode.valueOf(it) }
+                    ?: MonetMode.TonalSpot,
+                startingScreen = preferences[PrefsKeys.STARTING_SCREEN]
+                    ?: TopLevelDestinations.Calculator.graph,
+                enableToolsExperiment = preferences[PrefsKeys.ENABLE_TOOLS_EXPERIMENT] ?: false,
+                systemFont = preferences[PrefsKeys.SYSTEM_FONT] ?: false
             )
         }
 
-    val mainPreferencesFlow: Flow<MainPreferences> = dataStore.data
-        .catch { exception ->
-            if (exception is IOException) {
-                emit(emptyPreferences())
-            } else {
-                throw exception
-            }
-        }
+    val generalPrefs: Flow<GeneralPreferences> = data
         .map { preferences ->
-            val digitsPrecision: Int = preferences[PrefsKeys.DIGITS_PRECISION] ?: 3
-            val separator: Int = preferences[PrefsKeys.SEPARATOR] ?: Separator.SPACE
-            val outputFormat: Int = preferences[PrefsKeys.OUTPUT_FORMAT] ?: OutputFormat.PLAIN
-            val latestLeftSideUnit: String = preferences[PrefsKeys.LATEST_LEFT_SIDE] ?: MyUnitIDS.kilometer
-            val latestRightSideUnit: String = preferences[PrefsKeys.LATEST_RIGHT_SIDE] ?: MyUnitIDS.mile
-            val shownUnitGroups: List<UnitGroup> =
-                preferences[PrefsKeys.SHOWN_UNIT_GROUPS]?.let { list ->
-                    // Everything is in hidden (nothing in shown)
-                    list.ifEmpty { return@let listOf() }
-
-                    try {
-                        list.split(",").map { UnitGroup.valueOf(it) }
-                    } catch (e: Exception) {
-                        // Bad thing happened, return null so all units will be shown
-                        null
-                    }
-
-                } ?: ALL_UNIT_GROUPS
-            val enableVibrations: Boolean = preferences[PrefsKeys.ENABLE_VIBRATIONS] ?: true
-            val radianMode: Boolean = preferences[PrefsKeys.RADIAN_MODE] ?: true
-            val unitConverterFavoritesOnly: Boolean = preferences[PrefsKeys.UNIT_CONVERTER_FAVORITES_ONLY] ?: false
-            val unitConverterFormatTime: Boolean = preferences[PrefsKeys.UNIT_CONVERTER_FORMAT_TIME] ?: false
-            val unitConverterSorting: UnitsListSorting = preferences[PrefsKeys.UNIT_CONVERTER_SORTING]?.let { UnitsListSorting.valueOf(it) } ?: UnitsListSorting.USAGE
-            val middleZero: Boolean = preferences[PrefsKeys.MIDDLE_ZERO] ?: false
-
-            MainPreferences(
-                digitsPrecision = digitsPrecision,
-                separator = separator,
-                outputFormat = outputFormat,
-                latestLeftSideUnit = latestLeftSideUnit,
-                latestRightSideUnit = latestRightSideUnit,
-                shownUnitGroups = shownUnitGroups,
-                enableVibrations = enableVibrations,
-                radianMode = radianMode,
-                unitConverterFavoritesOnly = unitConverterFavoritesOnly,
-                unitConverterFormatTime = unitConverterFormatTime,
-                unitConverterSorting = unitConverterSorting,
-                middleZero = middleZero,
+            GeneralPreferences(
+                enableVibrations = preferences[PrefsKeys.ENABLE_VIBRATIONS] ?: true,
             )
         }
 
-    val allPreferencesFlow = combine(
-        mainPreferencesFlow, uiPreferencesFlow
-    ) { main, ui ->
-        return@combine UserPreferences(
-            themingMode = ui.themingMode,
-            enableDynamicTheme = ui.enableDynamicTheme,
-            enableAmoledTheme = ui.enableAmoledTheme,
-            customColor = ui.customColor,
-            monetMode = ui.monetMode,
-            digitsPrecision = main.digitsPrecision,
-            separator = main.separator,
-            outputFormat = main.outputFormat,
-            latestLeftSideUnit = main.latestLeftSideUnit,
-            latestRightSideUnit = main.latestRightSideUnit,
-            shownUnitGroups = main.shownUnitGroups,
-            enableVibrations = main.enableVibrations,
-            enableToolsExperiment = ui.enableToolsExperiment,
-            startingScreen = ui.startingScreen,
-            radianMode = main.radianMode,
-            unitConverterFavoritesOnly = main.unitConverterFavoritesOnly,
-            unitConverterFormatTime = main.unitConverterFormatTime,
-            unitConverterSorting = main.unitConverterSorting,
-            middleZero = main.middleZero,
-        )
-    }
+    val calculatorPrefs: Flow<CalculatorPreferences> = data
+        .map { preferences ->
+            CalculatorPreferences(
+                radianMode = preferences[PrefsKeys.RADIAN_MODE] ?: true,
+                enableVibrations = preferences[PrefsKeys.ENABLE_VIBRATIONS] ?: true,
+                separator = preferences[PrefsKeys.SEPARATOR] ?: Separator.SPACE,
+                middleZero = preferences[PrefsKeys.MIDDLE_ZERO] ?: false,
+                partialHistoryView = preferences[PrefsKeys.PARTIAL_HISTORY_VIEW] ?: true,
+                precision = preferences[PrefsKeys.DIGITS_PRECISION] ?: 3,
+                outputFormat = preferences[PrefsKeys.OUTPUT_FORMAT] ?: OutputFormat.PLAIN
+            )
+        }
+
+    val converterPrefs: Flow<ConverterPreferences> = data
+        .map { preferences ->
+            ConverterPreferences(
+                enableVibrations = preferences[PrefsKeys.ENABLE_VIBRATIONS] ?: true,
+                separator = preferences[PrefsKeys.SEPARATOR] ?: Separator.SPACE,
+                middleZero = preferences[PrefsKeys.MIDDLE_ZERO] ?: false,
+                precision = preferences[PrefsKeys.DIGITS_PRECISION] ?: 3,
+                outputFormat = preferences[PrefsKeys.OUTPUT_FORMAT] ?: OutputFormat.PLAIN,
+                unitConverterFormatTime = preferences[PrefsKeys.UNIT_CONVERTER_FORMAT_TIME]
+                    ?: false,
+                unitConverterSorting = preferences[PrefsKeys.UNIT_CONVERTER_SORTING]
+                    ?.let { UnitsListSorting.valueOf(it) } ?: UnitsListSorting.USAGE,
+                shownUnitGroups = preferences[PrefsKeys.SHOWN_UNIT_GROUPS]?.letTryOrNull { list ->
+                    list.ifEmpty { return@letTryOrNull listOf() }.split(",")
+                        .map { UnitGroup.valueOf(it) }
+                } ?: ALL_UNIT_GROUPS,
+                unitConverterFavoritesOnly = preferences[PrefsKeys.UNIT_CONVERTER_FAVORITES_ONLY]
+                    ?: false,
+                enableToolsExperiment = preferences[PrefsKeys.ENABLE_TOOLS_EXPERIMENT] ?: false,
+                latestLeftSideUnit = preferences[PrefsKeys.LATEST_LEFT_SIDE] ?: MyUnitIDS.kilometer,
+                latestRightSideUnit = preferences[PrefsKeys.LATEST_RIGHT_SIDE] ?: MyUnitIDS.mile,
+            )
+        }
+
+    val displayPrefs: Flow<DisplayPreferences> = data
+        .map { preferences ->
+            DisplayPreferences(
+                systemFont = preferences[PrefsKeys.SYSTEM_FONT] ?: false,
+                middleZero = preferences[PrefsKeys.MIDDLE_ZERO] ?: false,
+            )
+        }
+
+    val formattingPrefs: Flow<FormattingPreferences> = data
+        .map { preferences ->
+            FormattingPreferences(
+                digitsPrecision = preferences[PrefsKeys.DIGITS_PRECISION] ?: 3,
+                separator = preferences[PrefsKeys.SEPARATOR] ?: Separator.SPACE,
+                outputFormat = preferences[PrefsKeys.OUTPUT_FORMAT] ?: OutputFormat.PLAIN,
+            )
+        }
+
+    val unitGroupsPrefs: Flow<UnitGroupsPreferences> = data
+        .map { preferences ->
+            UnitGroupsPreferences(
+                shownUnitGroups = preferences[PrefsKeys.SHOWN_UNIT_GROUPS]?.letTryOrNull { list ->
+                    list.ifEmpty { return@letTryOrNull listOf() }.split(",")
+                        .map { UnitGroup.valueOf(it) }
+                } ?: ALL_UNIT_GROUPS,
+            )
+        }
+
+    val addSubtractPrefs: Flow<AddSubtractPreferences> = data
+        .map { preferences ->
+            AddSubtractPreferences(
+                separator = preferences[PrefsKeys.SEPARATOR] ?: Separator.SPACE,
+                enableVibrations = preferences[PrefsKeys.ENABLE_VIBRATIONS] ?: true,
+            )
+        }
+
+    val aboutPrefs: Flow<AboutPreferences> = data
+        .map { preferences ->
+            AboutPreferences(
+                enableToolsExperiment = preferences[PrefsKeys.ENABLE_TOOLS_EXPERIMENT] ?: false
+            )
+        }
+
+    val startingScreenPrefs: Flow<StartingScreenPreferences> = data
+        .map { preferences ->
+            StartingScreenPreferences(
+                startingScreen = preferences[PrefsKeys.STARTING_SCREEN]
+                    ?: TopLevelDestinations.Calculator.graph,
+            )
+        }
 
-    /**
-     * Update precision preference in DataStore
-     *
-     * @param precision One of the [PRECISIONS] to change to
-     */
     suspend fun updateDigitsPrecision(precision: Int) {
         dataStore.edit { preferences ->
             preferences[PrefsKeys.DIGITS_PRECISION] = precision
         }
     }
 
-    /**
-     * Update separator preference in DataStore
-     *
-     * @param separator One of the [Separator] to change to
-     */
     suspend fun updateSeparator(separator: Int) {
         dataStore.edit { preferences ->
             preferences[PrefsKeys.SEPARATOR] = separator
         }
     }
 
-    /**
-     * Update outputFormat preference in DataStore
-     *
-     * @param outputFormat One of the [OutputFormat] to change to
-     */
     suspend fun updateOutputFormat(outputFormat: Int) {
         dataStore.edit { preferences ->
             preferences[PrefsKeys.OUTPUT_FORMAT] = outputFormat
         }
     }
 
-    /**
-     * Update latest used pair of [AbstractUnit] in DataStore. Need it so when user restarts the app,
-     * this pair will be already set.
-     *
-     * @param leftSideUnit [AbstractUnit] on the left
-     * @param rightSideUnit [AbstractUnit] on the right
-     */
-    suspend fun updateLatestPairOfUnits(leftSideUnit: AbstractUnit, rightSideUnit: AbstractUnit) {
+    suspend fun updateLatestPairOfUnits(unitFrom: AbstractUnit, unitTo: AbstractUnit) {
         dataStore.edit { preferences ->
-            preferences[PrefsKeys.LATEST_LEFT_SIDE] = leftSideUnit.unitId
-            preferences[PrefsKeys.LATEST_RIGHT_SIDE] = rightSideUnit.unitId
+            preferences[PrefsKeys.LATEST_LEFT_SIDE] = unitFrom.id
+            preferences[PrefsKeys.LATEST_RIGHT_SIDE] = unitTo.id
         }
     }
 
-    /**
-     * Update [ThemingMode]. Saves value as a string.
-     *
-     * @param themingMode [ThemingMode] to save.
-     */
     suspend fun updateThemingMode(themingMode: ThemingMode) {
         dataStore.edit { preferences ->
             preferences[PrefsKeys.THEMING_MODE] = themingMode.name
         }
     }
 
-    /**
-     * Update preference on whether or not generate color scheme from device wallpaper.
-     *
-     * @param enabled True if user wants to enable this feature.
-     */
     suspend fun updateDynamicTheme(enabled: Boolean) {
         dataStore.edit { preferences ->
             preferences[PrefsKeys.ENABLE_DYNAMIC_THEME] = enabled
         }
     }
 
-    /**
-     * Update preference on whether or not use true black colors.
-     *
-     * @param enabled True if user wants to enable this feature.
-     */
     suspend fun updateAmoledTheme(enabled: Boolean) {
         dataStore.edit { preferences ->
             preferences[PrefsKeys.ENABLE_AMOLED_THEME] = enabled
         }
     }
 
-    /**
-     * Update preference on custom color scheme.
-     *
-     * @param color New custom color value.
-     */
     suspend fun updateCustomColor(color: Color) {
         dataStore.edit { preferences ->
             preferences[PrefsKeys.CUSTOM_COLOR] = color.value.toLong()
         }
     }
 
-    /**
-     * Update [MonetMode]. Saves value as a string.
-     *
-     * @param monetMode [MonetMode] to save.
-     */
     suspend fun updateMonetMode(monetMode: MonetMode) {
         dataStore.edit { preferences ->
             preferences[PrefsKeys.MONET_MODE] = monetMode.name
         }
     }
 
-    /**
-     * Update preference on starting screen route.
-     *
-     * @param startingScreen Route from [TopLevelDestinations].
-     */
     suspend fun updateStartingScreen(startingScreen: String) {
         dataStore.edit { preferences ->
             preferences[PrefsKeys.STARTING_SCREEN] = startingScreen
@@ -365,80 +321,63 @@ class UserPreferencesRepository @Inject constructor(private val dataStore: DataS
         }
     }
 
-    /**
-     * Update preference on whether or not use haptic feedback.
-     *
-     * @param enabled True if user wants to enable this feature.
-     */
     suspend fun updateVibrations(enabled: Boolean) {
         dataStore.edit { preferences ->
             preferences[PrefsKeys.ENABLE_VIBRATIONS] = enabled
         }
     }
 
-    /**
-     * Update preference on where zero should be.
-     *
-     * @param enabled True if user wants zero button to be in the middle.
-     */
     suspend fun updateMiddleZero(enabled: Boolean) {
         dataStore.edit { preferences ->
             preferences[PrefsKeys.MIDDLE_ZERO] = enabled
         }
     }
 
-    /**
-     * Update preference on whether or not show tools screen.
-     *
-     * @param enabled True if user wants to enable this feature.
-     */
     suspend fun updateToolsExperiment(enabled: Boolean) {
         dataStore.edit { preferences ->
             preferences[PrefsKeys.ENABLE_TOOLS_EXPERIMENT] = enabled
         }
     }
 
-    /**
-     * Update angle mode for calculator.
-     *
-     * @param radianMode When true - Radian, when False - Degree.
-     */
     suspend fun updateRadianMode(radianMode: Boolean) {
         dataStore.edit { preferences ->
             preferences[PrefsKeys.RADIAN_MODE] = radianMode
         }
     }
 
-    /**
-     * Update units list favorite filter state.
-     *
-     * @param enabled When true will show only favorite units.
-     */
     suspend fun updateUnitConverterFavoritesOnly(enabled: Boolean) {
         dataStore.edit { preferences ->
             preferences[PrefsKeys.UNIT_CONVERTER_FAVORITES_ONLY] = enabled
         }
     }
 
-    /**
-     * Update [UserPreferences.unitConverterFormatTime].
-     *
-     * @see UserPreferences.unitConverterFormatTime
-     */
     suspend fun updateUnitConverterFormatTime(enabled: Boolean) {
         dataStore.edit { preferences ->
             preferences[PrefsKeys.UNIT_CONVERTER_FORMAT_TIME] = enabled
         }
     }
 
-    /**
-     * Update [UserPreferences.unitConverterSorting].
-     *
-     * @see UserPreferences.unitConverterSorting
-     */
     suspend fun updateUnitConverterSorting(sorting: UnitsListSorting) {
         dataStore.edit { preferences ->
             preferences[PrefsKeys.UNIT_CONVERTER_SORTING] = sorting.name
         }
     }
+
+    suspend fun updateSystemFont(enabled: Boolean) {
+        dataStore.edit { preferences ->
+            preferences[PrefsKeys.SYSTEM_FONT] = enabled
+        }
+    }
+
+    suspend fun updatePartialHistoryView(enabled: Boolean) {
+        dataStore.edit { preferences ->
+            preferences[PrefsKeys.PARTIAL_HISTORY_VIEW] = enabled
+        }
+    }
+
+    private inline fun <T, R> T.letTryOrNull(block: (T) -> R): R? = try {
+        this?.let(block)
+    } catch (e: Exception) {
+        null
+    }
 }
diff --git a/fastlane/metadata/android/en-US/changelogs/26.txt b/fastlane/metadata/android/en-US/changelogs/26.txt
new file mode 100644
index 00000000..f0112352
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/26.txt
@@ -0,0 +1,7 @@
+"Nadeshiko Pink" update:
+
+- Language picker
+- System font option
+- Improved currency converter
+- Added new translations
+- Very small quality of life improvements
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
index 58eeb2b9..35f6c026 100644
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -16,4 +16,19 @@ Calculator, unit converter and more.
 • Customizable number formatter
 • SI Standard
 
-Currency converter needs a thing called <b>Internet</b>, that's why it says "have full network access".
+<b>Permissions</b>
+
+com.sadellie.unitto.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION
+Read (boring): https://developer.android.com/about/versions/14/behavior-changes-14#runtime-receivers-exported
+
+android.permission.INTERNET
+Used in Unit Converter to update currency rates. Requests are made only when you select a currency unit.
+
+android.permission.ACCESS_NETWORK_STATE
+Used in Unit Converter as a callback. Retries to update currency rates if there was an error (no network, for example) and the Internet connection is back.
+
+Non-free network service
+<i>Non-free</i> doesn't mean that you need to pay, put your credit card away. In this context it means that you can't host it on your machine.
+
+The app uses https://github.com/fawazahmed0/currency-api by https://github.com/fawazahmed0
+Requests are send to cdn.jsdelivr.net.
diff --git a/feature/calculator/build.gradle.kts b/feature/calculator/build.gradle.kts
index d0055baf..905cabfd 100644
--- a/feature/calculator/build.gradle.kts
+++ b/feature/calculator/build.gradle.kts
@@ -25,15 +25,19 @@ plugins {
 
 android {
     namespace = "com.sadellie.unitto.feature.calculator"
+    testOptions.unitTests.isIncludeAndroidResources = true
 }
 
 dependencies {
-    testImplementation(libs.junit)
+    testImplementation(libs.junit.junit)
+    testImplementation(libs.org.robolectric.robolectric)
+    androidTestImplementation(libs.androidx.compose.ui.test.junit4)
+    debugImplementation(libs.androidx.compose.ui.test.manifest)
 
-    implementation(project(mapOf("path" to ":data:common")))
-    implementation(project(mapOf("path" to ":data:userprefs")))
-    implementation(project(mapOf("path" to ":data:database")))
-    implementation(project(mapOf("path" to ":data:calculator")))
-    implementation(project(mapOf("path" to ":data:model")))
-    implementation(project(mapOf("path" to ":data:evaluatto")))
+    implementation(project(":data:common"))
+    implementation(project(":data:userprefs"))
+    implementation(project(":data:database"))
+    implementation(project(":data:calculator"))
+    implementation(project(":data:model"))
+    implementation(project(":data:evaluatto"))
 }
diff --git a/feature/calculator/src/androidTest/java/com/sadellie/unitto/feature/calculator/CalculatorScreenTest.kt b/feature/calculator/src/androidTest/java/com/sadellie/unitto/feature/calculator/CalculatorScreenTest.kt
new file mode 100644
index 00000000..9f1d1be0
--- /dev/null
+++ b/feature/calculator/src/androidTest/java/com/sadellie/unitto/feature/calculator/CalculatorScreenTest.kt
@@ -0,0 +1,101 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.feature.calculator
+
+import androidx.activity.ComponentActivity
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performTouchInput
+import androidx.compose.ui.test.swipeDown
+import com.sadellie.unitto.core.base.R
+import org.junit.Rule
+import org.junit.Test
+
+class CalculatorScreenTest {
+    @get:Rule
+    val composeTestRule = createAndroidComposeRule<ComponentActivity>()
+
+    @Test
+    fun loading_showLoadingKeyboard(): Unit = with(composeTestRule) {
+        setContent {
+            CalculatorScreen(
+                uiState = CalculatorUIState.Loading,
+                navigateToMenu = {},
+                navigateToSettings = {},
+                addTokens = {},
+                clearInput = {},
+                deleteTokens = {},
+                onCursorChange = {},
+                toggleCalculatorMode = {},
+                evaluate = {},
+                clearHistory = {}
+            )
+        }
+
+        onNodeWithTag("loading").assertExists()
+    }
+
+    @Test
+    fun ready_showRealKeyboard(): Unit = with(composeTestRule) {
+        setContent {
+            CalculatorScreen(
+                uiState = CalculatorUIState.Ready(),
+                navigateToMenu = {},
+                navigateToSettings = {},
+                addTokens = {},
+                clearInput = {},
+                deleteTokens = {},
+                onCursorChange = {},
+                toggleCalculatorMode = {},
+                evaluate = {},
+                clearHistory = {}
+            )
+        }
+
+        onNodeWithTag("loading").assertDoesNotExist()
+        onNodeWithTag("ready").assertExists()
+    }
+
+    @Test
+    fun ready_swipeForHistory(): Unit = with(composeTestRule) {
+        setContent {
+            CalculatorScreen(
+                uiState = CalculatorUIState.Ready(),
+                navigateToMenu = {},
+                navigateToSettings = {},
+                addTokens = {},
+                clearInput = {},
+                deleteTokens = {},
+                onCursorChange = {},
+                toggleCalculatorMode = {},
+                evaluate = {},
+                clearHistory = {}
+            )
+        }
+
+        onNodeWithTag("inputBox")
+            .performTouchInput { swipeDown() }
+        onNodeWithTag("historyButton")
+            .performClick()
+        onNodeWithText(composeTestRule.activity.getString(R.string.calculator_clear_history_support))
+            .assertExists()
+    }
+}
diff --git a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorScreen.kt b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorScreen.kt
index 5930c9d6..7cab5b5b 100644
--- a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorScreen.kt
+++ b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorScreen.kt
@@ -20,7 +20,10 @@ package com.sadellie.unitto.feature.calculator
 
 import android.content.res.Configuration
 import androidx.compose.animation.Crossfade
+import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background
+import androidx.compose.foundation.gestures.AnchoredDraggableState
+import androidx.compose.foundation.gestures.DraggableAnchors
 import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.gestures.anchoredDraggable
 import androidx.compose.foundation.layout.Arrangement
@@ -56,6 +59,8 @@ import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTag
 import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.tooling.preview.Preview
@@ -66,11 +71,13 @@ import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.core.ui.common.MenuButton
 import com.sadellie.unitto.core.ui.common.SettingsButton
 import com.sadellie.unitto.core.ui.common.UnittoScreenWithTopBar
-import com.sadellie.unitto.core.ui.common.textfield.ExpressionTextField
 import com.sadellie.unitto.core.ui.common.textfield.UnformattedTextField
 import com.sadellie.unitto.data.model.HistoryItem
 import com.sadellie.unitto.feature.calculator.components.CalculatorKeyboard
+import com.sadellie.unitto.feature.calculator.components.CalculatorKeyboardLoading
+import com.sadellie.unitto.feature.calculator.components.HistoryItemHeight
 import com.sadellie.unitto.feature.calculator.components.HistoryList
+import com.sadellie.unitto.feature.calculator.components.TextBox
 import java.text.SimpleDateFormat
 import java.util.Locale
 
@@ -86,21 +93,54 @@ internal fun CalculatorRoute(
         uiState = uiState.value,
         navigateToMenu = navigateToMenu,
         navigateToSettings = navigateToSettings,
-        addSymbol = viewModel::addTokens,
-        clearSymbols = viewModel::clearInput,
-        deleteSymbol = viewModel::deleteTokens,
+        addTokens = viewModel::addTokens,
+        clearInput = viewModel::clearInput,
+        deleteTokens = viewModel::deleteTokens,
         onCursorChange = viewModel::onCursorChange,
-        toggleAngleMode = viewModel::toggleCalculatorMode,
+        toggleCalculatorMode = viewModel::toggleCalculatorMode,
         evaluate = viewModel::evaluate,
         clearHistory = viewModel::clearHistory
     )
 }
 
 @Composable
-private fun CalculatorScreen(
+internal fun CalculatorScreen(
     uiState: CalculatorUIState,
     navigateToMenu: () -> Unit,
     navigateToSettings: () -> Unit,
+    addTokens: (String) -> Unit,
+    clearInput: () -> Unit,
+    deleteTokens: () -> Unit,
+    onCursorChange: (TextRange) -> Unit,
+    toggleCalculatorMode: () -> Unit,
+    evaluate: () -> Unit,
+    clearHistory: () -> Unit
+) {
+    when (uiState) {
+        is CalculatorUIState.Loading -> Loading(
+            navigateToMenu = navigateToMenu,
+            navigateToSettings = navigateToSettings,
+        )
+        is CalculatorUIState.Ready -> Ready(
+            uiState = uiState,
+            navigateToMenu = navigateToMenu,
+            navigateToSettings = navigateToSettings,
+            addSymbol = addTokens,
+            clearSymbols = clearInput,
+            deleteSymbol = deleteTokens,
+            onCursorChange = onCursorChange,
+            toggleAngleMode = toggleCalculatorMode,
+            evaluate = evaluate,
+            clearHistory = clearHistory
+        )
+    }
+}
+
+@Composable
+private fun Ready(
+    uiState: CalculatorUIState.Ready,
+    navigateToMenu: () -> Unit,
+    navigateToSettings: () -> Unit,
     addSymbol: (String) -> Unit,
     clearSymbols: () -> Unit,
     deleteSymbol: () -> Unit,
@@ -127,7 +167,8 @@ private fun CalculatorScreen(
                                 Icons.Default.Delete,
                                 stringResource(R.string.calculator_clear_history_title)
                             )
-                        }
+                        },
+                        modifier = Modifier.semantics { testTag = "historyButton" }
                     )
                 } else {
                     SettingsButton(navigateToSettings)
@@ -139,135 +180,91 @@ private fun CalculatorScreen(
             modifier = Modifier.padding(paddingValues),
         ) {
             val density = LocalDensity.current
-            var historyItemHeight by remember { mutableStateOf(0.dp) }
-            val textBoxHeight = maxHeight * 0.25f
-            var dragStateCurrentValue by rememberSaveable { mutableStateOf(DragState.CLOSED) }
 
-            val dragState = rememberDragState(
-                historyItem = historyItemHeight,
-                max = maxHeight - textBoxHeight,
-                initialValue = dragStateCurrentValue
-            )
-            val dragDp by remember(dragState.requireOffset()) {
-                derivedStateOf {
-                    focusManager.clearFocus(true)
-                    with(density) { dragState.requireOffset().toDp() }
-                }
+            val textBoxHeight = maxHeight * 0.25f
+
+            val dragState = remember {
+                AnchoredDraggableState(
+                    initialValue = DragState.CLOSED,
+                    positionalThreshold = { 0f },
+                    velocityThreshold = { 0f },
+                    animationSpec = tween()
+                )
             }
-            val keyboardHeight by remember(dragState.requireOffset()) {
+
+            var historyListHeight by remember { mutableStateOf(0.dp) }
+            val keyboardHeight by remember(historyListHeight) {
                 derivedStateOf {
-                    if (dragDp > historyItemHeight) {
-                        maxHeight - textBoxHeight - historyItemHeight
+                    if (historyListHeight > HistoryItemHeight) {
+                        maxHeight - textBoxHeight - HistoryItemHeight
                     } else {
-                        maxHeight - textBoxHeight - dragDp
+                        maxHeight - textBoxHeight - historyListHeight
                     }
                 }
             }
 
+            LaunchedEffect(uiState.partialHistoryView) {
+                val anchors: DraggableAnchors<DragState> = with(density) {
+                    if (uiState.partialHistoryView) {
+                        DraggableAnchors {
+                            DragState.CLOSED at 0f
+                            DragState.SMALL at HistoryItemHeight.toPx()
+                            DragState.OPEN at (maxHeight * 0.75f).toPx()
+                        }
+                    } else {
+                        DraggableAnchors {
+                            DragState.CLOSED at 0f
+                            DragState.OPEN at (maxHeight * 0.75f).toPx()
+                        }
+                    }
+                }
+                dragState.updateAnchors(anchors)
+            }
+
+            LaunchedEffect(dragState.offset) {
+                with(density) {
+                    if (!dragState.offset.isNaN()) {
+                        historyListHeight = dragState.requireOffset().toDp()
+                    }
+                }
+                focusManager.clearFocus()
+            }
+
             LaunchedEffect(dragState.currentValue) {
-                dragStateCurrentValue = dragState.currentValue
                 showClearHistoryButton = dragState.currentValue == DragState.OPEN
             }
 
-            // History
             HistoryList(
                 modifier = Modifier
-                    .background(MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f))
                     .fillMaxWidth()
-                    .height(dragDp),
+                    .height(historyListHeight),
                 historyItems = uiState.history,
-                heightCallback = { historyItemHeight = it },
                 formatterSymbols = uiState.formatterSymbols,
-                addTokens = addSymbol,
+                addTokens = addSymbol
             )
 
-            // Input
-            Column(
-                Modifier
-                    .offset(y = dragDp)
+            TextBox(
+                modifier = Modifier
+                    .offset(y = historyListHeight)
                     .height(textBoxHeight)
-                    .background(
-                        MaterialTheme.colorScheme.surfaceVariant,
-                        RoundedCornerShape(
-                            topStartPercent = 0, topEndPercent = 0,
-                            bottomStartPercent = 20, bottomEndPercent = 20
-                        )
-                    )
+                    .fillMaxWidth()
                     .anchoredDraggable(
                         state = dragState,
                         orientation = Orientation.Vertical
                     )
-                    .padding(top = 12.dp),
-                horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.spacedBy(8.dp)
-            ) {
-                ExpressionTextField(
-                    modifier = Modifier
-                        .weight(2f)
-                        .fillMaxWidth()
-                        .padding(horizontal = 8.dp),
-                    value = uiState.input,
-                    minRatio = 0.5f,
-                    cutCallback = deleteSymbol,
-                    pasteCallback = addSymbol,
-                    onCursorChange = onCursorChange,
-                    formatterSymbols = uiState.formatterSymbols
-                )
-                if (LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT) {
-                    when (uiState.output) {
-                        is CalculationResult.Default -> {
-                            var output by remember(uiState.output) {
-                                mutableStateOf(TextFieldValue(uiState.output.text))
-                            }
+                ,
+                formatterSymbols = uiState.formatterSymbols,
+                input = uiState.input,
+                deleteSymbol = deleteSymbol,
+                addSymbol = addSymbol,
+                onCursorChange = onCursorChange,
+                output = uiState.output
+            )
 
-                            ExpressionTextField(
-                                modifier = Modifier
-                                    .weight(1f)
-                                    .fillMaxWidth()
-                                    .padding(horizontal = 8.dp),
-                                value = output,
-                                minRatio = 1f,
-                                onCursorChange = { output = output.copy(selection = it) },
-                                formatterSymbols = uiState.formatterSymbols,
-                                textColor = MaterialTheme.colorScheme.onSurfaceVariant.copy(0.6f),
-                                readOnly = true,
-                            )
-                        }
-
-                        else -> {
-                            val label = uiState.output.label?.let { stringResource(it) } ?: ""
-
-                            UnformattedTextField(
-                                modifier = Modifier
-                                    .weight(1f)
-                                    .fillMaxWidth()
-                                    .padding(horizontal = 8.dp),
-                                value = TextFieldValue(label),
-                                minRatio = 1f,
-                                onCursorChange = {},
-                                textColor = MaterialTheme.colorScheme.error,
-                                readOnly = true,
-                            )
-                        }
-                    }
-
-                }
-                // Handle
-                Box(
-                    Modifier
-                        .padding(8.dp)
-                        .background(
-                            MaterialTheme.colorScheme.onSurfaceVariant,
-                            RoundedCornerShape(100)
-                        )
-                        .sizeIn(24.dp, 4.dp)
-                )
-            }
-
-            // Keyboard
             CalculatorKeyboard(
                 modifier = Modifier
-                    .offset(y = dragDp + textBoxHeight)
+                    .semantics { testTag = "ready" }
+                    .offset(y = historyListHeight + textBoxHeight)
                     .height(keyboardHeight)
                     .fillMaxWidth()
                     .padding(horizontal = 8.dp, vertical = 4.dp),
@@ -317,6 +314,81 @@ private fun CalculatorScreen(
     }
 }
 
+@Composable
+internal fun Loading(
+    navigateToMenu: () -> Unit,
+    navigateToSettings: () -> Unit,
+) {
+    UnittoScreenWithTopBar(
+        title = { Text(stringResource(R.string.calculator)) },
+        navigationIcon = { MenuButton { navigateToMenu() } },
+        colors = TopAppBarDefaults.topAppBarColors(MaterialTheme.colorScheme.surfaceVariant),
+        actions = { SettingsButton(navigateToSettings) }
+    ) { paddingValues ->
+        BoxWithConstraints(
+            modifier = Modifier.padding(paddingValues),
+        ) {
+            // Input
+            Column(
+                Modifier
+                    .height(maxHeight * 0.25f)
+                    .background(
+                        MaterialTheme.colorScheme.surfaceVariant,
+                        RoundedCornerShape(
+                            topStartPercent = 0, topEndPercent = 0,
+                            bottomStartPercent = 20, bottomEndPercent = 20
+                        )
+                    )
+                    .padding(top = 12.dp),
+                horizontalAlignment = Alignment.CenterHorizontally,
+                verticalArrangement = Arrangement.spacedBy(8.dp)
+            ) {
+                UnformattedTextField(
+                    modifier = Modifier
+                        .weight(2f)
+                        .fillMaxWidth()
+                        .padding(horizontal = 8.dp),
+                    value = TextFieldValue(),
+                    minRatio = 0.5f,
+                    onCursorChange = {},
+                )
+                if (LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT) {
+                    UnformattedTextField(
+                        modifier = Modifier
+                            .weight(1f)
+                            .fillMaxWidth()
+                            .padding(horizontal = 8.dp),
+                        value = TextFieldValue(),
+                        minRatio = 1f,
+                        onCursorChange = {},
+                        readOnly = true,
+                    )
+                }
+                // Handle
+                Box(
+                    Modifier
+                        .padding(8.dp)
+                        .background(
+                            MaterialTheme.colorScheme.onSurfaceVariant,
+                            RoundedCornerShape(100)
+                        )
+                        .sizeIn(24.dp, 4.dp)
+                )
+            }
+
+            // Keyboard
+            CalculatorKeyboardLoading(
+                modifier = Modifier
+                    .semantics { testTag = "loading" }
+                    .offset(y = maxHeight * 0.25f)
+                    .height(maxHeight * 0.75f)
+                    .fillMaxWidth()
+                    .padding(horizontal = 8.dp, vertical = 4.dp),
+            )
+        }
+    }
+}
+
 @Preview(widthDp = 432, heightDp = 1008, device = "spec:parent=pixel_5,orientation=portrait")
 @Preview(widthDp = 432, heightDp = 864, device = "spec:parent=pixel_5,orientation=portrait")
 @Preview(widthDp = 597, heightDp = 1393, device = "spec:parent=pixel_5,orientation=portrait")
@@ -346,18 +418,18 @@ private fun PreviewCalculatorScreen() {
     }
 
     CalculatorScreen(
-        uiState = CalculatorUIState(
+        uiState = CalculatorUIState.Ready(
             input = TextFieldValue("1.2345"),
             output = CalculationResult.Default("1234"),
             history = historyItems
         ),
         navigateToMenu = {},
         navigateToSettings = {},
-        addSymbol = {},
-        clearSymbols = {},
-        deleteSymbol = {},
+        addTokens = {},
+        clearInput = {},
+        deleteTokens = {},
         onCursorChange = {},
-        toggleAngleMode = {},
+        toggleCalculatorMode = {},
         evaluate = {},
         clearHistory = {}
     )
diff --git a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorUIState.kt b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorUIState.kt
index 11f2f056..7c108272 100644
--- a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorUIState.kt
+++ b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorUIState.kt
@@ -24,15 +24,20 @@ import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols
 import com.sadellie.unitto.data.model.HistoryItem
 
-data class CalculatorUIState(
-    val input: TextFieldValue = TextFieldValue(),
-    val output: CalculationResult = CalculationResult.Default(),
-    val radianMode: Boolean = true,
-    val history: List<HistoryItem> = emptyList(),
-    val allowVibration: Boolean = false,
-    val formatterSymbols: FormatterSymbols = FormatterSymbols.Spaces,
-    val middleZero: Boolean = false,
-)
+internal sealed class CalculatorUIState {
+    data object Loading : CalculatorUIState()
+
+    data class Ready(
+        val input: TextFieldValue = TextFieldValue(),
+        val output: CalculationResult = CalculationResult.Default(),
+        val radianMode: Boolean = true,
+        val history: List<HistoryItem> = emptyList(),
+        val allowVibration: Boolean = false,
+        val formatterSymbols: FormatterSymbols = FormatterSymbols.Spaces,
+        val middleZero: Boolean = false,
+        val partialHistoryView: Boolean = true,
+    ) : CalculatorUIState()
+}
 
 sealed class CalculationResult(@StringRes val label: Int? = null) {
     data class Default(val text: String = "") : CalculationResult()
diff --git a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorViewModel.kt b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorViewModel.kt
index 2517823a..468f25b4 100644
--- a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorViewModel.kt
+++ b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorViewModel.kt
@@ -31,7 +31,7 @@ import com.sadellie.unitto.data.common.isExpression
 import com.sadellie.unitto.data.common.setMinimumRequiredScale
 import com.sadellie.unitto.data.common.toStringWith
 import com.sadellie.unitto.data.common.trimZeros
-import com.sadellie.unitto.data.userprefs.MainPreferences
+import com.sadellie.unitto.data.userprefs.CalculatorPreferences
 import com.sadellie.unitto.data.userprefs.UserPreferencesRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import io.github.sadellie.evaluatto.Expression
@@ -54,11 +54,11 @@ internal class CalculatorViewModel @Inject constructor(
     private val userPrefsRepository: UserPreferencesRepository,
     private val calculatorHistoryRepository: CalculatorHistoryRepository,
 ) : ViewModel() {
-    private val _userPrefs: StateFlow<MainPreferences> =
-        userPrefsRepository.mainPreferencesFlow.stateIn(
+    private val _prefs: StateFlow<CalculatorPreferences> =
+        userPrefsRepository.calculatorPrefs.stateIn(
             viewModelScope,
             SharingStarted.WhileSubscribed(5000L),
-            MainPreferences()
+            CalculatorPreferences()
         )
 
     private val _input: MutableStateFlow<TextFieldValue> = MutableStateFlow(TextFieldValue())
@@ -67,9 +67,9 @@ internal class CalculatorViewModel @Inject constructor(
     private val _history = calculatorHistoryRepository.historyFlow
 
     val uiState = combine(
-        _input, _output, _history, _userPrefs
+        _input, _output, _history, _prefs
     ) { input, output, history, userPrefs ->
-        return@combine CalculatorUIState(
+        return@combine CalculatorUIState.Ready(
             input = input,
             output = output,
             radianMode = userPrefs.radianMode,
@@ -77,9 +77,10 @@ internal class CalculatorViewModel @Inject constructor(
             allowVibration = userPrefs.enableVibrations,
             formatterSymbols = AllFormatterSymbols.getById(userPrefs.separator),
             middleZero = userPrefs.middleZero,
+            partialHistoryView = userPrefs.partialHistoryView,
         )
     }.stateIn(
-        viewModelScope, SharingStarted.WhileSubscribed(5000L), CalculatorUIState()
+        viewModelScope, SharingStarted.WhileSubscribed(5000L), CalculatorUIState.Loading
     )
 
     fun addTokens(tokens: String) = _input.update { it.addTokens(tokens) }
@@ -111,7 +112,7 @@ internal class CalculatorViewModel @Inject constructor(
     }
 
     fun toggleCalculatorMode() = viewModelScope.launch {
-        userPrefsRepository.updateRadianMode(!_userPrefs.value.radianMode)
+        userPrefsRepository.updateRadianMode(!_prefs.value.radianMode)
     }
 
     fun clearHistory() = viewModelScope.launch(Dispatchers.IO) {
@@ -125,14 +126,14 @@ internal class CalculatorViewModel @Inject constructor(
 
         return try {
             CalculationResult.Default(
-                Expression(currentInput, radianMode = _userPrefs.value.radianMode)
+                Expression(currentInput, radianMode = _prefs.value.radianMode)
                     .calculate()
                     .also {
                         if (it > BigDecimal.valueOf(Double.MAX_VALUE)) throw ExpressionException.TooBig()
                     }
-                    .setMinimumRequiredScale(_userPrefs.value.digitsPrecision)
+                    .setMinimumRequiredScale(_prefs.value.precision)
                     .trimZeros()
-                    .toStringWith(_userPrefs.value.outputFormat)
+                    .toStringWith(_prefs.value.outputFormat)
             )
         } catch (e: ExpressionException.DivideByZero) {
             CalculationResult.DivideByZeroError
@@ -144,7 +145,7 @@ internal class CalculatorViewModel @Inject constructor(
     init {
         // Observe and invoke calculation without UI lag.
         viewModelScope.launch(Dispatchers.Default) {
-            merge(_userPrefs, _input).collectLatest {
+            merge(_prefs, _input).collectLatest {
                 val calculated = calculateInput()
                 _output.update {
                     // Don't show error when simply entering stuff
diff --git a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/DragState.kt b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/DragState.kt
index e668b9bc..9af4e57a 100644
--- a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/DragState.kt
+++ b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/DragState.kt
@@ -18,36 +18,4 @@
 
 package com.sadellie.unitto.feature.calculator
 
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.gestures.AnchoredDraggableState
-import androidx.compose.foundation.gestures.DraggableAnchors
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.Dp
-
-internal enum class DragState { CLOSED, HALF, OPEN }
-
-@Composable
-internal fun rememberDragState(
-    initialValue: DragState = DragState.CLOSED,
-    historyItem: Dp,
-    max: Dp,
-): AnchoredDraggableState<DragState> {
-    val historyItemHeight = with(LocalDensity.current) { historyItem.toPx() }
-    val maxHeight = with(LocalDensity.current) { max.toPx() }
-
-    return remember(key1 = historyItem) {
-        AnchoredDraggableState(
-            initialValue = initialValue,
-            anchors = DraggableAnchors {
-                DragState.CLOSED at 0f
-                DragState.HALF at historyItemHeight
-                DragState.OPEN at maxHeight
-            },
-            positionalThreshold = { 0f },
-            velocityThreshold = { 0f },
-            animationSpec = tween()
-        )
-    }
-}
+internal enum class DragState { CLOSED, SMALL, OPEN }
diff --git a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/CalculatorKeyboard.kt b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/CalculatorKeyboard.kt
index 83402bc1..b94265da 100644
--- a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/CalculatorKeyboard.kt
+++ b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/CalculatorKeyboard.kt
@@ -24,6 +24,7 @@ import androidx.compose.animation.Crossfade
 import androidx.compose.animation.core.FastOutSlowInEasing
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -34,8 +35,9 @@ 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.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ExpandLess
+import androidx.compose.material.icons.filled.ExpandMore
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.IconButtonDefaults
@@ -48,9 +50,11 @@ 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.draw.rotate
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.base.Token
 import com.sadellie.unitto.core.ui.common.ColumnWithConstraints
 import com.sadellie.unitto.core.ui.common.KeyboardButtonAdditional
@@ -92,6 +96,7 @@ import com.sadellie.unitto.core.ui.common.key.unittoicons.Multiply
 import com.sadellie.unitto.core.ui.common.key.unittoicons.Percent
 import com.sadellie.unitto.core.ui.common.key.unittoicons.Pi
 import com.sadellie.unitto.core.ui.common.key.unittoicons.Plus
+import com.sadellie.unitto.core.ui.common.key.unittoicons.Power10
 import com.sadellie.unitto.core.ui.common.key.unittoicons.Rad
 import com.sadellie.unitto.core.ui.common.key.unittoicons.RightBracket
 import com.sadellie.unitto.core.ui.common.key.unittoicons.Sin
@@ -140,6 +145,118 @@ internal fun CalculatorKeyboard(
     }
 }
 
+@Composable
+internal fun CalculatorKeyboardLoading(
+    modifier: Modifier
+) {
+    if (LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT) {
+        PortraitKeyboardLoading(modifier)
+    } else {
+        LandscapeKeyboardLoading(modifier)
+    }
+}
+
+@Composable
+private fun PortraitKeyboardLoading(
+    modifier: Modifier
+) {
+    ColumnWithConstraints(
+        modifier = modifier
+    ) { constraints ->
+
+        val additionalButtonHeight by remember {
+            mutableStateOf(constraints.maxHeight * 0.09f)
+        }
+
+        val spacerHeight by remember {
+            mutableStateOf(constraints.maxHeight * 0.025f)
+        }
+
+        val additionalRowSpacedBy by remember {
+            mutableStateOf(constraints.maxWidth * 0.03f)
+        }
+
+        val weightModifier = Modifier.weight(1f)
+        val additionalButtonModifier = Modifier
+            .weight(1f)
+            .height(additionalButtonHeight)
+
+        Spacer(modifier = Modifier.height(spacerHeight))
+
+        Row(
+            modifier = Modifier,
+            horizontalArrangement = Arrangement.spacedBy(additionalRowSpacedBy)
+        ) {
+            // Additional buttons
+            Box(weightModifier) {
+                AdditionalButtonsPortrait(
+                    modifier = additionalButtonModifier,
+                    allowVibration = false,
+                    addSymbol = {},
+                    showAdditional = false,
+                    radianMode = false,
+                    toggleAngleMode = {},
+                    toggleInvMode = {}
+                )
+            }
+
+            Box(
+                modifier = Modifier.size(additionalButtonHeight),
+                contentAlignment = Alignment.Center
+            ) {
+                // Expand/Collapse
+                IconButton(
+                    onClick = {  },
+                    colors = IconButtonDefaults.iconButtonColors(containerColor = MaterialTheme.colorScheme.inverseOnSurface)
+                ) {
+                    Icon(Icons.Default.ExpandMore, null)
+                }
+            }
+        }
+
+        Spacer(modifier = Modifier.height(spacerHeight))
+
+        Box(
+            modifier = weightModifier
+                .clip(RoundedCornerShape(32.dp))
+                .background(MaterialTheme.colorScheme.inverseOnSurface)
+                .fillMaxSize()
+        )
+
+        Spacer(modifier = Modifier.height(spacerHeight))
+    }
+}
+
+@Composable
+private fun LandscapeKeyboardLoading(
+    modifier: Modifier
+) {
+    RowWithConstraints(modifier) { constraints ->
+        val buttonModifier = Modifier
+            .fillMaxWidth()
+            .weight(1f)
+            .padding(constraints.maxWidth * 0.005f, constraints.maxHeight * 0.02f)
+
+        AdditionalButtonsLandscape(
+            modifier = Modifier.weight(1f),
+            buttonModifier = buttonModifier,
+            allowVibration = false,
+            radianMode = false,
+            addSymbol = {},
+            toggleAngleMode = {},
+            toggleInvMode = {}
+        )
+
+        Box(
+            modifier = Modifier
+                .clip(RoundedCornerShape(32.dp))
+                .background(MaterialTheme.colorScheme.inverseOnSurface)
+                .weight(5f)
+                .fillMaxSize()
+        )
+    }
+}
+
 @Composable
 private fun PortraitKeyboard(
     modifier: Modifier,
@@ -157,7 +274,7 @@ private fun PortraitKeyboard(
     var showAdditional: Boolean by remember { mutableStateOf(false) }
     var invMode: Boolean by remember { mutableStateOf(false) }
     val expandRotation: Float by animateFloatAsState(
-        targetValue = if (showAdditional) 0f else 180f,
+        targetValue = if (showAdditional) 180f else 0f,
         animationSpec = tween(easing = FastOutSlowInEasing),
         label = "Rotate on expand"
     )
@@ -197,7 +314,7 @@ private fun PortraitKeyboard(
             horizontalArrangement = Arrangement.spacedBy(additionalRowSpacedBy)
         ) {
             // Additional buttons
-            Crossfade(invMode, weightModifier) {
+            Crossfade(invMode, weightModifier, label = "Additional button") {
                 if (it) {
                     AdditionalButtonsPortraitInverse(
                         modifier = additionalButtonModifier,
@@ -230,7 +347,7 @@ private fun PortraitKeyboard(
                     onClick = { showAdditional = !showAdditional },
                     colors = IconButtonDefaults.iconButtonColors(containerColor = MaterialTheme.colorScheme.inverseOnSurface)
                 ) {
-                    Icon(Icons.Default.ExpandLess, null, Modifier.rotate(expandRotation))
+                    Icon(Icons.Default.ExpandMore, null, Modifier.rotate(expandRotation))
                 }
             }
         }
@@ -269,7 +386,7 @@ private fun PortraitKeyboard(
                 KeyboardButtonLight(mainButtonModifier, UnittoIcons.Key0, allowVibration) { addSymbol(Token.Digit._0) }
                 KeyboardButtonLight(mainButtonModifier, fractionalIcon, allowVibration) { addSymbol(Token.Digit.dot) }
             }
-            KeyboardButtonLight(mainButtonModifier, UnittoIcons.Backspace, allowVibration, clearSymbols) { deleteSymbol() }
+            KeyboardButtonLight(mainButtonModifier, UnittoIcons.Backspace, allowVibration, onLongClick = clearSymbols) { deleteSymbol() }
             KeyboardButtonFilled(mainButtonModifier, UnittoIcons.Equal, allowVibration) { evaluate() }
         }
 
@@ -342,7 +459,7 @@ private fun AdditionalButtonsPortraitInverse(
                     KeyboardButtonAdditional(modifier, UnittoIcons.Inv, allowVibration) { toggleInvMode() }
                     KeyboardButtonAdditional(modifier, UnittoIcons.E, allowVibration) { addSymbol(Token.Const.e) }
                     KeyboardButtonAdditional(modifier, UnittoIcons.Exp, allowVibration) { addSymbol(Token.Func.expBracket) }
-                    KeyboardButtonAdditional(modifier, UnittoIcons.Log, allowVibration) { addSymbol(Token.Func.logBracket) }
+                    KeyboardButtonAdditional(modifier, UnittoIcons.Power10, allowVibration) { addSymbol(Token.Digit._1 + Token.Digit._0 + Token.Operator.power) }
                 }
             }
         }
@@ -371,7 +488,7 @@ private fun LandscapeKeyboard(
             .weight(1f)
             .padding(constraints.maxWidth * 0.005f, constraints.maxHeight * 0.02f)
 
-        Crossfade(invMode, Modifier.weight(3f)) {
+        Crossfade(invMode, Modifier.weight(3f), label = "Additional button") {
             Row {
                 if (it) {
                     AdditionalButtonsLandscapeInverse(
@@ -421,7 +538,7 @@ private fun LandscapeKeyboard(
             KeyboardButtonLight(buttonModifier, UnittoIcons.Key9, allowVibration) { addSymbol(Token.Digit._9) }
             KeyboardButtonLight(buttonModifier, UnittoIcons.Key6, allowVibration) { addSymbol(Token.Digit._6) }
             KeyboardButtonLight(buttonModifier, UnittoIcons.Key3, allowVibration) { addSymbol(Token.Digit._3) }
-            KeyboardButtonLight(buttonModifier, UnittoIcons.Backspace, allowVibration, clearSymbols) { deleteSymbol() }
+            KeyboardButtonLight(buttonModifier, UnittoIcons.Backspace, allowVibration, onLongClick = clearSymbols) { deleteSymbol() }
         }
 
         Column(Modifier.weight(1f)) {
@@ -499,7 +616,7 @@ private fun AdditionalButtonsLandscapeInverse(
         KeyboardButtonAdditional(buttonModifier, UnittoIcons.Pi, allowVibration) { addSymbol(Token.Const.pi) }
         KeyboardButtonAdditional(buttonModifier, UnittoIcons.Factorial, allowVibration) { addSymbol(Token.Operator.factorial) }
         KeyboardButtonAdditional(buttonModifier, UnittoIcons.AcTan, allowVibration) { addSymbol(Token.Func.actanBracket) }
-        KeyboardButtonAdditional(buttonModifier, UnittoIcons.Log, allowVibration) { addSymbol(Token.Func.logBracket) }
+        KeyboardButtonAdditional(buttonModifier, UnittoIcons.Power10, allowVibration) { addSymbol(Token.Digit._1 + Token.Digit._0 + Token.Operator.power) }
     }
 }
 
diff --git a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt
index edd01a34..8d33ae3a 100644
--- a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt
+++ b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt
@@ -26,6 +26,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 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.wrapContentHeight
 import androidx.compose.foundation.lazy.LazyColumn
@@ -47,9 +48,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.layout.onPlaced
 import androidx.compose.ui.platform.LocalClipboardManager
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalTextInputService
 import androidx.compose.ui.platform.LocalTextToolbar
 import androidx.compose.ui.platform.LocalView
@@ -58,7 +57,6 @@ import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.core.ui.common.textfield.ExpressionTransformer
@@ -66,7 +64,7 @@ import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols
 import com.sadellie.unitto.core.ui.common.textfield.UnittoTextToolbar
 import com.sadellie.unitto.core.ui.common.textfield.clearAndFilterExpression
 import com.sadellie.unitto.core.ui.common.textfield.copyWithoutGrouping
-import com.sadellie.unitto.core.ui.theme.NumbersTextStyleDisplayMedium
+import com.sadellie.unitto.core.ui.theme.numbersDisplayMedium
 import com.sadellie.unitto.data.model.HistoryItem
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -75,14 +73,12 @@ import java.util.Locale
 internal fun HistoryList(
     modifier: Modifier,
     historyItems: List<HistoryItem>,
-    heightCallback: (Dp) -> Unit,
     formatterSymbols: FormatterSymbols,
     addTokens: (String) -> Unit,
 ) {
     if (historyItems.isEmpty()) {
         HistoryListPlaceholder(
             modifier = modifier,
-            heightCallback = heightCallback
         )
     } else {
         HistoryListContent(
@@ -90,7 +86,6 @@ internal fun HistoryList(
             historyItems = historyItems,
             addTokens = addTokens,
             formatterSymbols = formatterSymbols,
-            heightCallback = heightCallback
         )
     }
 }
@@ -98,23 +93,18 @@ internal fun HistoryList(
 @Composable
 private fun HistoryListPlaceholder(
     modifier: Modifier,
-    heightCallback: (Dp) -> Unit,
 ) {
-    val density = LocalDensity.current
-
     Column(
         modifier = modifier.wrapContentHeight(unbounded = true),
-        verticalArrangement = Arrangement.Center
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally
     ) {
         Column(
-            modifier = Modifier
-                .onPlaced { heightCallback(with(density) { it.size.height.toDp() }) }
-                .fillMaxWidth()
-                .padding(vertical = 32.dp),
+            modifier = Modifier.height(HistoryItemHeight),
             verticalArrangement = Arrangement.Center,
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
-            Icon(Icons.Default.History, null)
+            Icon(Icons.Default.History, stringResource(R.string.calculator_no_history))
             Text(stringResource(R.string.calculator_no_history))
         }
     }
@@ -126,12 +116,8 @@ private fun HistoryListContent(
     historyItems: List<HistoryItem>,
     addTokens: (String) -> Unit,
     formatterSymbols: FormatterSymbols,
-    heightCallback: (Dp) -> Unit,
 ) {
-    val density = LocalDensity.current
     val state = rememberLazyListState()
-    val firstItem by remember(historyItems) { mutableStateOf(historyItems.first()) }
-    val restOfTheItems by remember(firstItem) { mutableStateOf(historyItems.drop(1)) }
 
     LaunchedEffect(historyItems) { state.scrollToItem(0) }
 
@@ -141,19 +127,8 @@ private fun HistoryListContent(
         reverseLayout = true,
         verticalArrangement = Arrangement.spacedBy(16.dp, Alignment.Bottom)
     ) {
-        // We do this so that callback for items height is called only once
-        item(firstItem.id) {
+        items(historyItems, { it.id }) { historyItem ->
             HistoryListItem(
-                modifier = Modifier.onPlaced { heightCallback(with(density) { it.size.height.toDp() }) },
-                historyItem = historyItems.first(),
-                formatterSymbols = formatterSymbols,
-                addTokens = addTokens,
-            )
-        }
-
-        items(restOfTheItems, { it.id }) { historyItem ->
-            HistoryListItem(
-                modifier = Modifier,
                 historyItem = historyItem,
                 formatterSymbols = formatterSymbols,
                 addTokens = addTokens,
@@ -193,7 +168,10 @@ private fun HistoryListItem(
         }
     }
 
-    Column(modifier = modifier) {
+    Column(
+        modifier = modifier.height(HistoryItemHeight),
+        verticalArrangement = Arrangement.Center
+    ) {
         CompositionLocalProvider(
             LocalTextInputService provides null,
             LocalTextToolbar provides UnittoTextToolbar(
@@ -212,7 +190,7 @@ private fun HistoryListItem(
                     .fillMaxWidth()
                     .padding(horizontal = 8.dp)
                     .horizontalScroll(rememberScrollState(), reverseScrolling = true),
-                textStyle = NumbersTextStyleDisplayMedium.copy(color = MaterialTheme.colorScheme.onSurfaceVariant, textAlign = TextAlign.End),
+                textStyle = MaterialTheme.typography.numbersDisplayMedium.copy(color = MaterialTheme.colorScheme.onSurfaceVariant, textAlign = TextAlign.End),
                 readOnly = true,
                 visualTransformation = ExpressionTransformer(formatterSymbols),
                 interactionSource = expressionInteractionSource
@@ -237,7 +215,7 @@ private fun HistoryListItem(
                     .fillMaxWidth()
                     .padding(horizontal = 8.dp)
                     .horizontalScroll(rememberScrollState(), reverseScrolling = true),
-                textStyle = NumbersTextStyleDisplayMedium.copy(color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f), textAlign = TextAlign.End),
+                textStyle = MaterialTheme.typography.numbersDisplayMedium.copy(color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f), textAlign = TextAlign.End),
                 readOnly = true,
                 visualTransformation = ExpressionTransformer(formatterSymbols),
                 interactionSource = resultInteractionSource
@@ -246,6 +224,8 @@ private fun HistoryListItem(
     }
 }
 
+internal val HistoryItemHeight = 108.dp
+
 @Preview
 @Composable
 private fun PreviewHistoryList() {
@@ -275,7 +255,6 @@ private fun PreviewHistoryList() {
             .fillMaxSize(),
         historyItems = historyItems,
         formatterSymbols = FormatterSymbols.Spaces,
-        heightCallback = {},
         addTokens = {}
     )
 }
diff --git a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/TextBox.kt b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/TextBox.kt
new file mode 100644
index 00000000..14f68fba
--- /dev/null
+++ b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/TextBox.kt
@@ -0,0 +1,134 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.feature.calculator.components
+
+import android.content.res.Configuration
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.sizeIn
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.MaterialTheme
+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.platform.LocalConfiguration
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTag
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.unit.dp
+import com.sadellie.unitto.core.ui.common.textfield.ExpressionTextField
+import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols
+import com.sadellie.unitto.core.ui.common.textfield.UnformattedTextField
+import com.sadellie.unitto.feature.calculator.CalculationResult
+
+@Composable
+fun TextBox(
+    modifier: Modifier,
+    formatterSymbols: FormatterSymbols,
+    input: TextFieldValue,
+    deleteSymbol: () -> Unit,
+    addSymbol: (String) -> Unit,
+    onCursorChange: (TextRange) -> Unit,
+    output: CalculationResult,
+) {
+    Column(
+        modifier = modifier
+            .semantics { testTag = "inputBox" }
+            .background(
+                MaterialTheme.colorScheme.surfaceVariant,
+                RoundedCornerShape(
+                    topStartPercent = 0, topEndPercent = 0,
+                    bottomStartPercent = 20, bottomEndPercent = 20
+                )
+            )
+            .padding(top = 4.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        ExpressionTextField(
+            modifier = Modifier
+                .weight(3f)
+                .fillMaxWidth()
+                .padding(horizontal = 8.dp),
+            value = input,
+            minRatio = 0.5f,
+            cutCallback = deleteSymbol,
+            pasteCallback = addSymbol,
+            onCursorChange = onCursorChange,
+            formatterSymbols = formatterSymbols
+        )
+        if (LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT) {
+            when (output) {
+                is CalculationResult.Default -> {
+                    var outputTF by remember(output) {
+                        mutableStateOf(TextFieldValue(output.text))
+                    }
+
+                    ExpressionTextField(
+                        modifier = Modifier
+                            .weight(2f)
+                            .fillMaxWidth()
+                            .padding(horizontal = 8.dp),
+                        value = outputTF,
+                        minRatio = 1f,
+                        onCursorChange = { outputTF = outputTF.copy(selection = it) },
+                        formatterSymbols = formatterSymbols,
+                        textColor = MaterialTheme.colorScheme.onSurfaceVariant.copy(0.6f),
+                        readOnly = true,
+                    )
+                }
+
+                else -> {
+                    val label = output.label?.let { stringResource(it) } ?: ""
+
+                    UnformattedTextField(
+                        modifier = Modifier
+                            .weight(2f)
+                            .fillMaxWidth()
+                            .padding(horizontal = 8.dp),
+                        value = TextFieldValue(label),
+                        minRatio = 1f,
+                        onCursorChange = {},
+                        textColor = MaterialTheme.colorScheme.error,
+                        readOnly = true,
+                    )
+                }
+            }
+
+        }
+        // Handle
+        Box(
+            Modifier
+                .padding(8.dp)
+                .background(
+                    MaterialTheme.colorScheme.onSurfaceVariant,
+                    RoundedCornerShape(100)
+                )
+                .sizeIn(24.dp, 4.dp)
+        )
+    }
+}
\ No newline at end of file
diff --git a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/navigation/CalculatorNavigation.kt b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/navigation/CalculatorNavigation.kt
index 716d6aac..fbae4ef0 100644
--- a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/navigation/CalculatorNavigation.kt
+++ b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/navigation/CalculatorNavigation.kt
@@ -19,10 +19,10 @@
 package com.sadellie.unitto.feature.calculator.navigation
 
 import androidx.navigation.NavGraphBuilder
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.navigation
 import androidx.navigation.navDeepLink
 import com.sadellie.unitto.core.base.TopLevelDestinations
+import com.sadellie.unitto.core.ui.unittoComposable
+import com.sadellie.unitto.core.ui.unittoNavigation
 import com.sadellie.unitto.feature.calculator.CalculatorRoute
 
 private val graph = TopLevelDestinations.Calculator.graph
@@ -32,14 +32,14 @@ fun NavGraphBuilder.calculatorGraph(
     navigateToMenu: () -> Unit,
     navigateToSettings: () -> Unit
 ) {
-    navigation(
+    unittoNavigation(
         startDestination = start,
         route = graph,
         deepLinks = listOf(
             navDeepLink { uriPattern = "app://com.sadellie.unitto/$graph" }
         )
     ) {
-        composable(start) {
+        unittoComposable(start) {
             CalculatorRoute(
                 navigateToMenu = navigateToMenu,
                 navigateToSettings = navigateToSettings
diff --git a/feature/converter/build.gradle.kts b/feature/converter/build.gradle.kts
index 296ff6c4..85849fd1 100644
--- a/feature/converter/build.gradle.kts
+++ b/feature/converter/build.gradle.kts
@@ -25,23 +25,26 @@ plugins {
 
 android {
     namespace = "com.sadellie.unitto.feature.converter"
+
+    testOptions.unitTests.isIncludeAndroidResources = true
 }
 
 dependencies {
-    testImplementation(libs.junit)
-    testImplementation(libs.org.jetbrains.kotlinx.coroutines.test)
+    testImplementation(libs.junit.junit)
+    testImplementation(libs.org.robolectric.robolectric)
+    testImplementation(libs.org.jetbrains.kotlinx.kotlinx.coroutines.test)
     testImplementation(libs.androidx.room.runtime)
     testImplementation(libs.androidx.room.ktx)
     kapt(libs.androidx.room.compiler)
-    testImplementation(libs.androidx.datastore)
+    testImplementation(libs.androidx.datastore.datastore.preferences)
 
-    implementation(libs.com.squareup.moshi)
-    implementation(libs.com.squareup.retrofit2)
+    implementation(libs.com.squareup.moshi.moshi.kotlin)
+    implementation(libs.com.squareup.retrofit2.converter.moshi)
 
-    implementation(project(mapOf("path" to ":data:common")))
-    implementation(project(mapOf("path" to ":data:database")))
-    implementation(project(mapOf("path" to ":data:model")))
-    implementation(project(mapOf("path" to ":data:userprefs")))
-    implementation(project(mapOf("path" to ":data:units")))
-    implementation(project(mapOf("path" to ":data:evaluatto")))
+    implementation(project(":data:common"))
+    implementation(project(":data:database"))
+    implementation(project(":data:model"))
+    implementation(project(":data:userprefs"))
+    implementation(project(":data:units"))
+    implementation(project(":data:evaluatto"))
 }
diff --git a/feature/converter/src/main/AndroidManifest.xml b/feature/converter/src/main/AndroidManifest.xml
index 7bdbce91..7d242df4 100644
--- a/feature/converter/src/main/AndroidManifest.xml
+++ b/feature/converter/src/main/AndroidManifest.xml
@@ -17,6 +17,7 @@
   ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
   -->
 
-<manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>
\ No newline at end of file
diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/ConverterScreen.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/ConverterScreen.kt
index 6cd28d27..76a78a94 100644
--- a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/ConverterScreen.kt
+++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/ConverterScreen.kt
@@ -18,36 +18,83 @@
 
 package com.sadellie.unitto.feature.converter
 
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.SizeTransform
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.expandHorizontally
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+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.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.SwapHoriz
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
+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.draw.rotate
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.sadellie.unitto.core.base.OutputFormat
 import com.sadellie.unitto.core.base.R
+import com.sadellie.unitto.core.base.Token
+import com.sadellie.unitto.core.ui.common.ColumnWithConstraints
 import com.sadellie.unitto.core.ui.common.MenuButton
 import com.sadellie.unitto.core.ui.common.PortraitLandscape
 import com.sadellie.unitto.core.ui.common.SettingsButton
 import com.sadellie.unitto.core.ui.common.UnittoScreenWithTopBar
-import com.sadellie.unitto.feature.converter.components.ConverterKeyboard
-import com.sadellie.unitto.feature.converter.components.TopScreenPart
+import com.sadellie.unitto.core.ui.common.textfield.ExpressionTextField
+import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols
+import com.sadellie.unitto.core.ui.common.textfield.UnformattedTextField
+import com.sadellie.unitto.core.ui.datetime.UnittoDateTimeFormatter
+import com.sadellie.unitto.data.common.format
+import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.feature.converter.components.DefaultKeyboard
+import com.sadellie.unitto.feature.converter.components.NumberBaseKeyboard
+import com.sadellie.unitto.feature.converter.components.UnitSelectionButton
 
 @Composable
 internal fun ConverterRoute(
     viewModel: ConverterViewModel = hiltViewModel(),
-    navigateToLeftScreen: (String) -> Unit,
-    navigateToRightScreen: (unitFrom: String, unitTo: String, input: String?) -> Unit,
+    navigateToLeftScreen: () -> Unit,
+    navigateToRightScreen: () -> Unit,
     navigateToMenu: () -> Unit,
-    navigateToSettings: () -> Unit
+    navigateToSettings: () -> Unit,
 ) {
-    val uiState = viewModel.uiState.collectAsStateWithLifecycle()
+    val uiState = viewModel.converterUiState.collectAsStateWithLifecycle()
 
     ConverterScreen(
         uiState = uiState.value,
@@ -55,30 +102,28 @@ internal fun ConverterRoute(
         navigateToRightScreen = navigateToRightScreen,
         navigateToSettings = navigateToSettings,
         navigateToMenu = navigateToMenu,
-        swapMeasurements = viewModel::swapUnits,
+        swapUnits = viewModel::swapUnits,
         processInput = viewModel::addTokens,
         deleteDigit = viewModel::deleteTokens,
         clearInput = viewModel::clearInput,
         onCursorChange = viewModel::onCursorChange,
-        cutCallback = viewModel::deleteTokens,
-        onErrorClick = viewModel::updateCurrenciesRatesIfNeeded,
+        onErrorClick = viewModel::updateCurrencyRates,
     )
 }
 
 @Composable
 private fun ConverterScreen(
-    uiState: ConverterUIState,
-    navigateToLeftScreen: (String) -> Unit,
-    navigateToRightScreen: (unitFrom: String, unitTo: String, input: String?) -> Unit,
+    uiState: UnitConverterUIState,
+    navigateToLeftScreen: () -> Unit,
+    navigateToRightScreen: () -> Unit,
     navigateToSettings: () -> Unit,
     navigateToMenu: () -> Unit,
-    swapMeasurements: () -> Unit,
+    swapUnits: () -> Unit,
     processInput: (String) -> Unit,
     deleteDigit: () -> Unit,
     clearInput: () -> Unit,
     onCursorChange: (TextRange) -> Unit,
-    cutCallback: () -> Unit,
-    onErrorClick: () -> Unit,
+    onErrorClick: (AbstractUnit) -> Unit,
 ) {
     UnittoScreenWithTopBar(
         title = { Text(stringResource(R.string.unit_converter)) },
@@ -89,46 +134,396 @@ private fun ConverterScreen(
         colors = TopAppBarDefaults
             .centerAlignedTopAppBarColors(containerColor = Color.Transparent),
         content = { padding ->
-            PortraitLandscape(
-                modifier = Modifier
-                    .padding(padding)
-                    .fillMaxSize(),
-                content1 = {
-                    TopScreenPart(
-                        modifier = it,
-                        inputValue = uiState.inputValue,
-                        calculatedValue = uiState.calculatedValue,
-                        outputValue = uiState.resultValue,
-                        unitFrom = uiState.unitFrom,
-                        unitTo = uiState.unitTo,
-                        navigateToLeftScreen = navigateToLeftScreen,
-                        navigateToRightScreen = navigateToRightScreen,
-                        swapUnits = swapMeasurements,
-                        converterMode = uiState.mode,
+            when (uiState) {
+                is UnitConverterUIState.Loading -> {
+                    ConverterLoading(modifier = Modifier.padding(padding))
+                }
+
+                is UnitConverterUIState.NumberBase -> {
+                    NumberBase(
+                        modifier = Modifier.padding(padding),
+                        uiState = uiState,
                         onCursorChange = onCursorChange,
-                        cutCallback = cutCallback,
-                        pasteCallback = processInput,
-                        formatterSymbols = uiState.formatterSymbols,
-                        onErrorClick = onErrorClick
-                    )
-                },
-                content2 = {
-                    ConverterKeyboard(
-                        modifier = it,
-                        addDigit = processInput,
+                        processInput = processInput,
                         deleteDigit = deleteDigit,
-                        clearInput = clearInput,
-                        converterMode = uiState.mode,
-                        allowVibration = uiState.allowVibration,
-                        fractional = uiState.formatterSymbols.fractional,
-                        middleZero = uiState.middleZero
+                        navigateToLeftScreen = navigateToLeftScreen,
+                        swapUnits = swapUnits,
+                        navigateToRightScreen = navigateToRightScreen,
+                        clearInput = clearInput
                     )
                 }
+
+                is UnitConverterUIState.Default -> {
+                    Default(
+                        modifier = Modifier.padding(padding),
+                        uiState = uiState,
+                        onCursorChange = onCursorChange,
+                        processInput = processInput,
+                        deleteDigit = deleteDigit,
+                        navigateToLeftScreen = navigateToLeftScreen,
+                        swapUnits = swapUnits,
+                        navigateToRightScreen = navigateToRightScreen,
+                        clearInput = clearInput,
+                        refreshCurrencyRates = onErrorClick
+                    )
+                }
+            }
+        }
+    )
+}
+
+@Composable
+private fun ConverterLoading(modifier: Modifier) {
+    PortraitLandscape(
+        modifier = modifier.fillMaxSize(),
+        content1 = { contentModifier ->
+            ColumnWithConstraints(modifier = contentModifier) {
+                val textFieldModifier = Modifier.weight(2f)
+
+                UnformattedTextField(
+                    modifier = textFieldModifier,
+                    value = TextFieldValue(stringResource(R.string.loading_label)),
+                    onCursorChange = {},
+                    minRatio = 0.7f,
+                    readOnly = true
+                )
+                AnimatedUnitShortName()
+
+                ConverterResultTextField(
+                    modifier = textFieldModifier,
+                    result = ConverterResult.Loading
+                )
+                AnimatedUnitShortName()
+
+                Spacer(modifier = Modifier.height(it.maxHeight * 0.03f))
+
+                UnitSelectionButtons()
+            }
+        },
+        content2 = {
+            Box(
+                modifier = it
+                    .clip(RoundedCornerShape(32.dp))
+                    .background(MaterialTheme.colorScheme.inverseOnSurface)
+                    .fillMaxSize()
             )
         }
     )
 }
 
+@Composable
+private fun NumberBase(
+    modifier: Modifier,
+    uiState: UnitConverterUIState.NumberBase,
+    onCursorChange: (TextRange) -> Unit,
+    processInput: (String) -> Unit,
+    deleteDigit: () -> Unit,
+    navigateToLeftScreen: () -> Unit,
+    swapUnits: () -> Unit,
+    navigateToRightScreen: () -> Unit,
+    clearInput: () -> Unit,
+) {
+    PortraitLandscape(
+        modifier = modifier.fillMaxSize(),
+        content1 = { contentModifier ->
+            ColumnWithConstraints(modifier = contentModifier) {
+                val textFieldModifier = Modifier.weight(2f)
+
+                UnformattedTextField(
+                    modifier = textFieldModifier,
+                    minRatio = 0.7f,
+                    placeholder = Token.Digit._0,
+                    value = uiState.input,
+                    onCursorChange = onCursorChange,
+                    pasteCallback = processInput,
+                    cutCallback = deleteDigit,
+                )
+                AnimatedUnitShortName(stringResource(uiState.unitFrom.shortName))
+
+                ConverterResultTextField(
+                    modifier = textFieldModifier,
+                    result = uiState.result
+                )
+                AnimatedUnitShortName(stringResource(uiState.unitTo.shortName))
+
+                Spacer(modifier = Modifier.height(it.maxHeight * 0.03f))
+
+                UnitSelectionButtons(
+                    unitFromLabel = stringResource(uiState.unitFrom.displayName),
+                    unitToLabel = stringResource(uiState.unitTo.displayName),
+                    swapUnits = swapUnits,
+                    navigateToLeftScreen = navigateToLeftScreen,
+                    navigateToRightScreen = navigateToRightScreen
+                )
+            }
+        },
+        content2 = {
+            NumberBaseKeyboard(
+                modifier = it,
+                addDigit = processInput,
+                deleteDigit = deleteDigit,
+                clearInput = clearInput,
+                allowVibration = uiState.enableHaptic,
+            )
+        }
+    )
+}
+
+@Composable
+private fun Default(
+    modifier: Modifier,
+    uiState: UnitConverterUIState.Default,
+    onCursorChange: (TextRange) -> Unit,
+    processInput: (String) -> Unit,
+    deleteDigit: () -> Unit,
+    navigateToLeftScreen: () -> Unit,
+    swapUnits: () -> Unit,
+    navigateToRightScreen: () -> Unit,
+    clearInput: () -> Unit,
+    refreshCurrencyRates: (AbstractUnit) -> Unit,
+) {
+    var calculation by remember(uiState.calculation) {
+        mutableStateOf(
+            TextFieldValue(uiState.calculation?.format(uiState.scale, uiState.outputFormat) ?: "")
+        )
+    }
+    val connection by connectivityState()
+    val lastUpdate by remember(uiState) {
+        derivedStateOf {
+            if (uiState.currencyRateUpdateState !is CurrencyRateUpdateState.Ready) return@derivedStateOf null
+            uiState.currencyRateUpdateState.date.format(UnittoDateTimeFormatter.weekDayMonthYear)
+        }
+    }
+
+    LaunchedEffect(connection) {
+        if ((connection == ConnectionState.Available) and (uiState.result == ConverterResult.Error)) {
+            val unitFrom = uiState.unitFrom
+            if (unitFrom.group == UnitGroup.CURRENCY) refreshCurrencyRates(unitFrom)
+        }
+    }
+
+    PortraitLandscape(
+        modifier = modifier.fillMaxSize(),
+        content1 = { contentModifier ->
+            ColumnWithConstraints(modifier = contentModifier) {
+                val textFieldModifier = Modifier.weight(2f)
+
+                AnimatedVisibility(
+                    visible = lastUpdate != null,
+                    enter = expandVertically() + fadeIn(),
+                    exit = shrinkVertically() + fadeOut(),
+                ) {
+                    Text(
+                        modifier = Modifier
+                            .align(Alignment.CenterHorizontally)
+                            .clip(RoundedCornerShape(50))
+                            .background(MaterialTheme.colorScheme.inverseOnSurface)
+                            .fillMaxWidth(),
+                        text = lastUpdate.orEmpty(),
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                        textAlign = TextAlign.Center
+                    )
+                }
+
+                ExpressionTextField(
+                    modifier = textFieldModifier,
+                    minRatio = 0.7f,
+                    placeholder = Token.Digit._0,
+                    value = uiState.input,
+                    onCursorChange = onCursorChange,
+                    pasteCallback = processInput,
+                    cutCallback = deleteDigit,
+                    formatterSymbols = uiState.formatterSymbols,
+                )
+                AnimatedVisibility(
+                    visible = calculation.text.isNotEmpty(),
+                    modifier = Modifier.weight(1f),
+                    enter = expandVertically(clip = false),
+                    exit = shrinkVertically(clip = false)
+                ) {
+                    ExpressionTextField(
+                        modifier = Modifier,
+                        value = calculation,
+                        onCursorChange = { calculation = calculation.copy(selection = it) },
+                        formatterSymbols = uiState.formatterSymbols,
+                        minRatio = 0.7f,
+                        textColor = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.6f),
+                        readOnly = true
+                    )
+                }
+                AnimatedUnitShortName(stringResource(uiState.unitFrom.shortName))
+
+                ConverterResultTextField(
+                    modifier = textFieldModifier,
+                    result = uiState.result,
+                    scale = uiState.scale,
+                    outputFormat = uiState.outputFormat,
+                    formatterSymbols = uiState.formatterSymbols,
+                    onErrorClick = { refreshCurrencyRates(uiState.unitFrom) }
+                )
+                AnimatedUnitShortName(
+                    stringResource(
+                        if (uiState.result is ConverterResult.Error) R.string.try_again_label
+                        else uiState.unitTo.shortName
+                    )
+                )
+
+                Spacer(modifier = Modifier.height(it.maxHeight * 0.03f))
+
+                UnitSelectionButtons(
+                    unitFromLabel = stringResource(uiState.unitFrom.displayName),
+                    unitToLabel = stringResource(uiState.unitTo.displayName),
+                    swapUnits = swapUnits,
+                    navigateToLeftScreen = navigateToLeftScreen,
+                    navigateToRightScreen = navigateToRightScreen
+                )
+            }
+        },
+        content2 = {
+            DefaultKeyboard(
+                modifier = it,
+                addDigit = processInput,
+                deleteDigit = deleteDigit,
+                clearInput = clearInput,
+                allowVibration = uiState.enableHaptic,
+                fractional = uiState.formatterSymbols.fractional,
+                middleZero = uiState.middleZero
+            )
+        }
+    )
+}
+
+@Composable
+private fun ConverterResultTextField(
+    modifier: Modifier,
+    result: ConverterResult,
+    scale: Int = 0,
+    outputFormat: Int = OutputFormat.PLAIN,
+    formatterSymbols: FormatterSymbols = FormatterSymbols.Spaces,
+    onErrorClick: () -> Unit = {},
+) {
+    val mContext = LocalContext.current
+    var resultTextField by remember(result) {
+        val value = when (result) {
+            is ConverterResult.Default -> result.value.format(scale, outputFormat)
+            is ConverterResult.NumberBase -> result.value.uppercase()
+            is ConverterResult.Time -> result.format(mContext, formatterSymbols)
+            else -> ""
+        }
+        mutableStateOf(TextFieldValue(value))
+    }
+
+    when (result) {
+        is ConverterResult.Loading -> {
+            UnformattedTextField(
+                modifier = modifier,
+                value = TextFieldValue(stringResource(R.string.loading_label)),
+                onCursorChange = {},
+                minRatio = 0.7f,
+                readOnly = true
+            )
+        }
+
+        is ConverterResult.Error -> {
+            UnformattedTextField(
+                modifier = modifier,
+                value = TextFieldValue(stringResource(R.string.error_label)),
+                onCursorChange = { onErrorClick() },
+                minRatio = 0.7f,
+                readOnly = true,
+                textColor = MaterialTheme.colorScheme.error,
+            )
+        }
+
+        is ConverterResult.Default -> {
+            ExpressionTextField(
+                modifier = modifier,
+                value = resultTextField,
+                onCursorChange = { resultTextField = resultTextField.copy(selection = it) },
+                formatterSymbols = formatterSymbols,
+                minRatio = 0.7f,
+                readOnly = true
+            )
+        }
+
+        is ConverterResult.NumberBase, is ConverterResult.Time -> {
+            UnformattedTextField(
+                modifier = modifier,
+                value = resultTextField,
+                onCursorChange = { resultTextField = resultTextField.copy(selection = it) },
+                minRatio = 0.7f,
+                readOnly = true
+            )
+        }
+    }
+}
+
+@Composable
+private fun AnimatedUnitShortName(
+    label: String = stringResource(R.string.loading_label),
+) {
+    AnimatedContent(
+        modifier = Modifier.fillMaxWidth(),
+        targetState = label,
+        transitionSpec = {
+            // Enter animation
+            (expandHorizontally(clip = false, expandFrom = Alignment.Start) + fadeIn()
+                    togetherWith fadeOut()) using SizeTransform(clip = false)
+        },
+        label = "Animated short name from"
+    ) { value ->
+        Text(
+            text = value,
+            style = MaterialTheme.typography.bodyMedium.copy(textAlign = TextAlign.End)
+        )
+    }
+}
+
+@Composable
+private fun UnitSelectionButtons(
+    unitFromLabel: String = stringResource(R.string.loading_label),
+    unitToLabel: String = stringResource(R.string.loading_label),
+    swapUnits: () -> Unit = {},
+    navigateToLeftScreen: () -> Unit = {},
+    navigateToRightScreen: () -> Unit = {},
+) {
+    var swapped by remember { mutableStateOf(false) }
+    val swapButtonRotation: Float by animateFloatAsState(
+        targetValue = if (swapped) 0f else 180f,
+        animationSpec = tween(easing = FastOutSlowInEasing),
+        label = "Swap button rotation"
+    )
+
+    Row(verticalAlignment = Alignment.CenterVertically) {
+        UnitSelectionButton(
+            modifier = Modifier
+                .fillMaxWidth()
+                .weight(1f),
+            label = unitFromLabel,
+            onClick = navigateToLeftScreen
+        )
+        IconButton(
+            onClick = {
+                swapUnits()
+                swapped = !swapped
+            },
+        ) {
+            Icon(
+                modifier = Modifier.rotate(swapButtonRotation),
+                imageVector = Icons.Outlined.SwapHoriz,
+                contentDescription = stringResource(R.string.swap_units_description)
+            )
+        }
+        UnitSelectionButton(
+            modifier = Modifier
+                .fillMaxWidth()
+                .weight(1f),
+            label = unitToLabel,
+            onClick = navigateToRightScreen
+        )
+    }
+}
+
 @Preview(widthDp = 432, heightDp = 1008, device = "spec:parent=pixel_5,orientation=portrait")
 @Preview(widthDp = 432, heightDp = 864, device = "spec:parent=pixel_5,orientation=portrait")
 @Preview(widthDp = 597, heightDp = 1393, device = "spec:parent=pixel_5,orientation=portrait")
@@ -138,17 +533,16 @@ private fun ConverterScreen(
 @Composable
 private fun PreviewConverterScreen() {
     ConverterScreen(
-        uiState = ConverterUIState(inputValue = TextFieldValue("1234"), calculatedValue = null, resultValue = ConversionResult.Default("5678"), showLoading = false),
+        uiState = UnitConverterUIState.Loading,
         navigateToLeftScreen = {},
-        navigateToRightScreen = {_, _, _ -> },
+        navigateToRightScreen = {},
         navigateToSettings = {},
         navigateToMenu = {},
-        swapMeasurements = {},
+        swapUnits = {},
         processInput = {},
         deleteDigit = {},
         clearInput = {},
         onCursorChange = {},
-        cutCallback = {},
         onErrorClick = {},
     )
 }
diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/ConverterUIState.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/ConverterUIState.kt
index 4dc6d788..af0f2abc 100644
--- a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/ConverterUIState.kt
+++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/ConverterUIState.kt
@@ -18,48 +18,191 @@
 
 package com.sadellie.unitto.feature.converter
 
+import android.content.Context
 import androidx.compose.ui.text.input.TextFieldValue
+import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.core.base.Token
 import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols
-import com.sadellie.unitto.data.model.AbstractUnit
+import com.sadellie.unitto.core.ui.common.textfield.formatExpression
+import com.sadellie.unitto.data.common.trimZeros
+import com.sadellie.unitto.data.model.unit.DefaultUnit
+import com.sadellie.unitto.data.model.unit.NumberBaseUnit
+import java.math.BigDecimal
+import java.math.RoundingMode
 
-/**
- * Represents current state of the ConverterScreen
- *
- * @property inputValue Current input value. Can be expression or a simple number.
- * @property calculatedValue Currently calculated value. Can be null if not needed (same as input or
- * expression in input is invalid).
- * @property resultValue Current output value.
- * @property showLoading Whether we are loading data from network.
- * @property showError Whether there was an error while loading data from network
- * @property unitFrom Unit on the left.
- * @property unitTo Unit on the right.
- * @property mode
- * @property allowVibration When true will vibrate on button clicks.
- */
-data class ConverterUIState(
-    val inputValue: TextFieldValue = TextFieldValue(),
-    val calculatedValue: String? = null,
-    val resultValue: ConversionResult = ConversionResult.Default(Token.Digit._0),
-    val showLoading: Boolean = true,
-    val showError: Boolean = false,
-    val unitFrom: AbstractUnit? = null,
-    val unitTo: AbstractUnit? = null,
-    val mode: ConverterMode = ConverterMode.DEFAULT,
-    val allowVibration: Boolean = false,
-    val middleZero: Boolean = false,
-    val formatterSymbols: FormatterSymbols = FormatterSymbols.Spaces,
-)
+internal sealed class UnitConverterUIState {
+    data object Loading : UnitConverterUIState()
 
-enum class ConverterMode {
-    DEFAULT,
-    BASE,
+    data class Default(
+        val input: TextFieldValue = TextFieldValue(),
+        val calculation: BigDecimal?,
+        val result: ConverterResult,
+        val unitFrom: DefaultUnit,
+        val unitTo: DefaultUnit,
+        val enableHaptic: Boolean,
+        val middleZero: Boolean,
+        val formatterSymbols: FormatterSymbols,
+        val scale: Int,
+        val outputFormat: Int,
+        val formatTime: Boolean,
+        val currencyRateUpdateState: CurrencyRateUpdateState,
+    ) : UnitConverterUIState()
+
+    data class NumberBase(
+        val input: TextFieldValue = TextFieldValue(),
+        val result: ConverterResult,
+        val unitFrom: NumberBaseUnit,
+        val unitTo: NumberBaseUnit,
+        val enableHaptic: Boolean,
+    ) : UnitConverterUIState()
 }
 
-sealed class ConversionResult {
-    data class Default(val result: String) : ConversionResult()
-    data class Time(val result: String) : ConversionResult()
-    data class NumberBase(val result: String) : ConversionResult()
-    data object Loading : ConversionResult()
-    data object Error : ConversionResult()
+internal sealed class ConverterResult {
+    data class Default(val value: BigDecimal) : ConverterResult() {
+        override fun equals(other: Any?): Boolean {
+            if (other !is Default) return false
+            return this.value.compareTo(other.value) == 0
+        }
+
+        override fun hashCode(): Int = value.hashCode()
+    }
+
+    data class NumberBase(val value: String) : ConverterResult()
+
+    data class Time(
+        val negative: Boolean,
+        val day: BigDecimal,
+        val hour: BigDecimal,
+        val minute: BigDecimal,
+        val second: BigDecimal,
+        val millisecond: BigDecimal,
+        val microsecond: BigDecimal,
+        val nanosecond: BigDecimal,
+        val attosecond: BigDecimal,
+    ) : ConverterResult()
+
+    data object Loading : ConverterResult()
+
+    data object Error : ConverterResult()
 }
+
+internal fun ConverterResult.Time.format(mContext: Context, formatterSymbols: FormatterSymbols): String {
+    val result = mutableListOf<String>()
+
+    if (day.compareTo(BigDecimal.ZERO) == 1) {
+        result += "${day.toPlainString().formatExpression(formatterSymbols)}${mContext.getString(R.string.day_short)}"
+    }
+
+    if (hour.compareTo(BigDecimal.ZERO) == 1) {
+        result += "${hour.toPlainString().formatExpression(formatterSymbols)}${mContext.getString(R.string.hour_short)}"
+    }
+
+    if (minute.compareTo(BigDecimal.ZERO) == 1) {
+        result += "${minute.toPlainString().formatExpression(formatterSymbols)}${mContext.getString(R.string.minute_short)}"
+    }
+
+    if (second.compareTo(BigDecimal.ZERO) == 1) {
+        result += "${second.toPlainString().formatExpression(formatterSymbols)}${mContext.getString(R.string.second_short)}"
+    }
+
+    if (millisecond.compareTo(BigDecimal.ZERO) == 1) {
+        result += "${millisecond.toPlainString().formatExpression(formatterSymbols)}${mContext.getString(R.string.millisecond_short)}"
+    }
+
+    if (microsecond.compareTo(BigDecimal.ZERO) == 1) {
+        result += "${microsecond.toPlainString().formatExpression(formatterSymbols)}${mContext.getString(R.string.microsecond_short)}"
+    }
+
+    if (nanosecond.compareTo(BigDecimal.ZERO) == 1) {
+        result += "${nanosecond.toPlainString().formatExpression(formatterSymbols)}${mContext.getString(R.string.nanosecond_short)}"
+    }
+
+    if (attosecond.compareTo(BigDecimal.ZERO) == 1) {
+        result += "${attosecond.toPlainString().formatExpression(formatterSymbols)}${mContext.getString(R.string.attosecond_short)}"
+    }
+
+    return (if (negative) Token.Operator.minus else "") + result.joinToString(" ").ifEmpty { Token.Digit._0 }
+}
+
+internal fun formatTime(
+    input: BigDecimal,
+): ConverterResult.Time {
+    val negative = input < BigDecimal.ZERO
+    val inputAbs = input.abs()
+
+    if (inputAbs.compareTo(attosecondBasicUnit) == -1) return ConverterResult.Time(
+        negative = negative,
+        day = BigDecimal.ZERO,
+        hour = BigDecimal.ZERO,
+        minute = BigDecimal.ZERO,
+        second = BigDecimal.ZERO,
+        millisecond = BigDecimal.ZERO,
+        microsecond = BigDecimal.ZERO,
+        nanosecond = BigDecimal.ZERO,
+        attosecond = inputAbs
+    )
+
+    if (inputAbs.compareTo(nanosecondBasicUnit) == -1) return ConverterResult.Time(
+        negative = negative,
+        day = BigDecimal.ZERO,
+        hour = BigDecimal.ZERO,
+        minute = BigDecimal.ZERO,
+        second = BigDecimal.ZERO,
+        millisecond = BigDecimal.ZERO,
+        microsecond = BigDecimal.ZERO,
+        nanosecond = BigDecimal.ZERO,
+        attosecond = inputAbs.trimZeros()
+    )
+
+    // DAY
+    var division = inputAbs.divideAndRemainder(dayBasicUnit)
+    val day = division.component1().setScale(0, RoundingMode.HALF_EVEN)
+    var remainingSeconds = division.component2().setScale(0, RoundingMode.HALF_EVEN)
+
+    division = remainingSeconds.divideAndRemainder(hourBasicUnit)
+    val hour = division.component1()
+    remainingSeconds = division.component2()
+
+    division = remainingSeconds.divideAndRemainder(minuteBasicUnit)
+    val minute = division.component1()
+    remainingSeconds = division.component2()
+
+    division = remainingSeconds.divideAndRemainder(secondBasicUnit)
+    val second = division.component1()
+    remainingSeconds = division.component2()
+
+    division = remainingSeconds.divideAndRemainder(millisecondBasicUnit)
+    val millisecond = division.component1()
+    remainingSeconds = division.component2()
+
+    division = remainingSeconds.divideAndRemainder(microsecondBasicUnit)
+    val microsecond = division.component1()
+    remainingSeconds = division.component2()
+
+    division = remainingSeconds.divideAndRemainder(nanosecondBasicUnit)
+    val nanosecond = division.component1()
+    remainingSeconds = division.component2()
+
+    val attosecond = remainingSeconds
+
+    return ConverterResult.Time(
+        negative = negative,
+        day = day,
+        hour = hour,
+        minute = minute,
+        second = second,
+        millisecond = millisecond,
+        microsecond = microsecond,
+        nanosecond = nanosecond,
+        attosecond = attosecond
+    )
+}
+
+private val dayBasicUnit by lazy { BigDecimal("86400000000000000000000") }
+private val hourBasicUnit by lazy { BigDecimal("3600000000000000000000") }
+private val minuteBasicUnit by lazy { BigDecimal("60000000000000000000") }
+private val secondBasicUnit by lazy { BigDecimal("1000000000000000000") }
+private val millisecondBasicUnit by lazy { BigDecimal("1000000000000000") }
+private val microsecondBasicUnit by lazy { BigDecimal("1000000000000") }
+private val nanosecondBasicUnit by lazy { BigDecimal("1000000000") }
+private val attosecondBasicUnit by lazy { BigDecimal("1") }
diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/ConverterViewModel.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/ConverterViewModel.kt
index 93d0ceec..edc214ab 100644
--- a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/ConverterViewModel.kt
+++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/ConverterViewModel.kt
@@ -20,36 +20,34 @@ package com.sadellie.unitto.feature.converter
 
 import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.input.TextFieldValue
+import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.sadellie.unitto.core.base.Token
 import com.sadellie.unitto.core.ui.common.textfield.AllFormatterSymbols
 import com.sadellie.unitto.core.ui.common.textfield.addTokens
 import com.sadellie.unitto.core.ui.common.textfield.deleteTokens
+import com.sadellie.unitto.data.common.combine
 import com.sadellie.unitto.data.common.isExpression
-import com.sadellie.unitto.data.common.setMinimumRequiredScale
-import com.sadellie.unitto.data.common.toStringWith
-import com.sadellie.unitto.data.common.trimZeros
-import com.sadellie.unitto.data.database.UnitsEntity
-import com.sadellie.unitto.data.database.UnitsRepository
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.NumberBaseUnit
+import com.sadellie.unitto.data.common.stateIn
 import com.sadellie.unitto.data.model.UnitGroup
-import com.sadellie.unitto.data.units.AllUnitsRepository
-import com.sadellie.unitto.data.units.MyUnitIDS
-import com.sadellie.unitto.data.units.combine
-import com.sadellie.unitto.data.userprefs.MainPreferences
+import com.sadellie.unitto.data.model.UnitsListSorting
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.DefaultUnit
+import com.sadellie.unitto.data.model.unit.NumberBaseUnit
+import com.sadellie.unitto.data.units.UnitsRepository
 import com.sadellie.unitto.data.userprefs.UserPreferencesRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import io.github.sadellie.evaluatto.Expression
 import io.github.sadellie.evaluatto.ExpressionException
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.getAndUpdate
-import kotlinx.coroutines.flow.merge
+import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
@@ -57,306 +55,378 @@ import java.math.BigDecimal
 import javax.inject.Inject
 
 @HiltViewModel
-class ConverterViewModel @Inject constructor(
+internal class ConverterViewModel @Inject constructor(
     private val userPrefsRepository: UserPreferencesRepository,
-    private val unitRepository: UnitsRepository,
-    private val allUnitsRepository: AllUnitsRepository
+    private val unitsRepo: UnitsRepository,
+    private val savedStateHandle: SavedStateHandle
 ) : ViewModel() {
 
-    private val _userPrefs = userPrefsRepository.mainPreferencesFlow.stateIn(
-        viewModelScope,
-        SharingStarted.WhileSubscribed(5000),
-        MainPreferences()
+    private val converterInputKey = "CONVERTER_INPUT"
+    private val _input = MutableStateFlow(
+        with(savedStateHandle[converterInputKey] ?: "") {
+            TextFieldValue(this, TextRange(this.length))
+        }
     )
+    private val _calculation = MutableStateFlow<BigDecimal?>(null)
+    private val _result = MutableStateFlow<ConverterResult>(ConverterResult.Loading)
+    private val _unitFrom = MutableStateFlow<AbstractUnit?>(null)
+    private val _unitTo = MutableStateFlow<AbstractUnit?>(null)
 
-    /**
-     * Unit on the left, the one we convert from. Initially null, meaning we didn't restore it yet.
-     */
-    private val _unitFrom: MutableStateFlow<AbstractUnit?> = MutableStateFlow(null)
+    private val _leftQuery = MutableStateFlow(TextFieldValue())
+    private val _leftUnits = MutableStateFlow<Map<UnitGroup, List<AbstractUnit>>>(emptyMap())
+    private val _leftUnitGroup = MutableStateFlow<UnitGroup?>(null)
 
-    /**
-     * Unit on the right, the one we convert to. Initially null, meaning we didn't restore it yet.
-     */
-    private val _unitTo: MutableStateFlow<AbstractUnit?> = MutableStateFlow(null)
+    private val _rightQuery = MutableStateFlow(TextFieldValue())
+    private val _rightUnits = MutableStateFlow<Map<UnitGroup, List<AbstractUnit>>>(emptyMap())
 
-    private val _input: MutableStateFlow<TextFieldValue> = MutableStateFlow(TextFieldValue())
+    private val _currenciesState = MutableStateFlow<CurrencyRateUpdateState>(CurrencyRateUpdateState.Nothing)
+    private var _loadCurrenciesJob: Job? = null
 
-    /**
-     * Calculation result. Null when [_input] is not an expression.
-     */
-    private val _calculated: MutableStateFlow<String?> = MutableStateFlow(null)
-
-    /**
-     * Conversion result.
-     */
-    private val _result: MutableStateFlow<ConversionResult> = MutableStateFlow(ConversionResult.Loading)
-
-    /**
-     * True when loading something from network.
-     */
-    private val _showLoading: MutableStateFlow<Boolean> = MutableStateFlow(false)
-
-    /**
-     * True if there was error while loading data.
-     */
-    private val _showError: MutableStateFlow<Boolean> = MutableStateFlow(false)
-
-    /**
-     * Current state of UI.
-     */
-    val uiState: StateFlow<ConverterUIState> = combine(
+    val converterUiState: StateFlow<UnitConverterUIState> = combine(
         _input,
+        _calculation,
+        _result,
         _unitFrom,
         _unitTo,
-        _calculated,
-        _result,
-        _userPrefs,
-        _showError,
-        _showLoading
-    ) { inputValue, unitFromValue, unitToValue, calculatedValue, resultValue, prefs, showError, showLoading ->
-        return@combine ConverterUIState(
-            inputValue = inputValue,
-            calculatedValue = calculatedValue,
-            resultValue = when {
-                showError -> ConversionResult.Error
-                showLoading -> ConversionResult.Loading
-                else -> resultValue
-            },
-            unitFrom = unitFromValue,
-            unitTo = unitToValue,
-            mode = if (_unitFrom.value is NumberBaseUnit) ConverterMode.BASE else ConverterMode.DEFAULT,
-            allowVibration = prefs.enableVibrations,
-            formatterSymbols = AllFormatterSymbols.getById(prefs.separator),
-            middleZero = prefs.middleZero,
+        userPrefsRepository.converterPrefs,
+        _currenciesState
+    ) { input, calculation, result, unitFrom, unitTo, prefs, currenciesState ->
+        return@combine when {
+            (unitFrom is DefaultUnit) and (unitTo is DefaultUnit) -> {
+                UnitConverterUIState.Default(
+                    input = input,
+                    calculation = calculation,
+                    result = result,
+                    unitFrom = unitFrom as DefaultUnit,
+                    unitTo = unitTo as DefaultUnit,
+                    enableHaptic = prefs.enableVibrations,
+                    middleZero = prefs.middleZero,
+                    formatterSymbols = AllFormatterSymbols.getById(prefs.separator),
+                    scale = prefs.precision,
+                    outputFormat = prefs.outputFormat,
+                    formatTime = prefs.unitConverterFormatTime,
+                    currencyRateUpdateState = currenciesState
+                )
+            }
+            (unitFrom is NumberBaseUnit) and (unitTo is NumberBaseUnit) -> {
+                UnitConverterUIState.NumberBase(
+                    input = input,
+                    result = result,
+                    unitFrom = unitFrom as NumberBaseUnit,
+                    unitTo = unitTo as NumberBaseUnit,
+                    enableHaptic = prefs.enableVibrations,
+                )
+            }
+            else -> UnitConverterUIState.Loading
+        }
+    }
+        .mapLatest { ui ->
+            when (_currenciesState.value) {
+                is CurrencyRateUpdateState.Loading -> {
+                    _result.update { ConverterResult.Loading }
+                    return@mapLatest ui
+                }
+                is CurrencyRateUpdateState.Error -> {
+                    _result.update { ConverterResult.Error }
+                    return@mapLatest ui
+                }
+                is CurrencyRateUpdateState.Ready, is CurrencyRateUpdateState.Nothing -> {}
+            }
+
+            when (ui) {
+                is UnitConverterUIState.Default -> {
+                    convertDefault(
+                        unitFrom = ui.unitFrom,
+                        unitTo = ui.unitTo,
+                        input = ui.input,
+                        formatTime = ui.formatTime
+                    )
+                }
+                is UnitConverterUIState.NumberBase -> {
+                    convertNumberBase(
+                        unitFrom = ui.unitFrom,
+                        unitTo = ui.unitTo,
+                        input = ui.input
+                    )
+                }
+                is UnitConverterUIState.Loading -> {}
+            }
+            ui
+        }
+        .stateIn(viewModelScope, UnitConverterUIState.Loading)
+
+    val leftSideUIState = combine(
+        _unitFrom,
+        _leftQuery,
+        _leftUnits,
+        _leftUnitGroup,
+        userPrefsRepository.converterPrefs,
+        unitsRepo.allUnits
+    ) { unitFrom, query, units, unitGroup, prefs, _ ->
+        unitFrom ?: return@combine LeftSideUIState.Loading
+
+        return@combine LeftSideUIState.Ready(
+            unitFrom = unitFrom,
+            sorting = prefs.unitConverterSorting,
+            shownUnitGroups = prefs.shownUnitGroups,
+            favorites = prefs.unitConverterFavoritesOnly,
+            verticalList = prefs.enableToolsExperiment,
+            query = query,
+            units = units,
+            unitGroup = unitGroup
         )
-    }.stateIn(
-        viewModelScope, SharingStarted.WhileSubscribed(5000), ConverterUIState()
-    )
-
-    fun addTokens(tokens: String) = _input.update { it.addTokens(tokens) }
-    fun deleteTokens() = _input.update { it.deleteTokens() }
-    fun clearInput() = _input.update { TextFieldValue() }
-    fun onCursorChange(selection: TextRange) = _input.update { it.copy(selection = selection) }
-
-    /**
-     * Update [_unitFrom] and set [_unitTo] from pair. Also updates stats for this [unit].
-     */
-    fun updateUnitFrom(unit: AbstractUnit) {
-        // We change from something to base converter or the other way around
-        if ((_unitFrom.value?.group == UnitGroup.NUMBER_BASE) xor (unit.group == UnitGroup.NUMBER_BASE)) {
-            _calculated.update { null }
-            clearInput()
-        }
-
-        _unitFrom.update { unit }
-
-        /**
-         * Update pair [_unitTo] if it exists
-         */
-        val pair = unit.pairedUnit
-        if (pair != null) {
-            _unitTo.update { allUnitsRepository.getById(pair) }
-        } else {
-            // No pair, get something from same group
-            _unitTo.update { allUnitsRepository.getCollectionByGroup(unit.group).first() }
-        }
-        incrementCounter(unit)
-        saveLatestPairOfUnits()
-        updateCurrenciesRatesIfNeeded()
     }
+        .mapLatest {
+            if (it !is LeftSideUIState.Ready) return@mapLatest it
 
-    /**
-     * Update [_unitTo] and update pair for [_unitFrom].
-     */
-    fun updateUnitTo(unit: AbstractUnit) {
-        _unitTo.update { unit }
-        _unitFrom.value?.pairedUnit = unit.unitId
-        updatePairedUnit(_unitFrom.value ?: return)
-        incrementCounter(unit)
-        saveLatestPairOfUnits()
+            filterUnitsLeft(
+                query = it.query,
+                unitGroup = it.unitGroup,
+                favoritesOnly = it.favorites,
+                sorting = it.sorting,
+                shownUnitGroups = it.shownUnitGroups,
+            )
+            it
+        }
+        .stateIn(viewModelScope, SharingStarted.Lazily, LeftSideUIState.Loading)
+
+    val rightSideUIState = combine(
+        _unitFrom,
+        _unitTo,
+        _input,
+        _calculation,
+        _rightQuery,
+        _rightUnits,
+        userPrefsRepository.converterPrefs,
+        _currenciesState,
+        unitsRepo.allUnits,
+    ) { unitFrom, unitTo, input, calculation, query, units, prefs, currenciesState, _ ->
+        unitFrom ?: return@combine RightSideUIState.Loading
+        unitTo ?: return@combine RightSideUIState.Loading
+
+        return@combine RightSideUIState.Ready(
+            unitFrom = unitFrom,
+            unitTo = unitTo,
+            sorting = prefs.unitConverterSorting,
+            favorites = prefs.unitConverterFavoritesOnly,
+            input = (calculation?.toPlainString() ?: input.text).replace(Token.Operator.minus, "-"),
+            scale = prefs.precision,
+            outputFormat = prefs.outputFormat,
+            formatterSymbols = AllFormatterSymbols.getById(prefs.separator),
+            currencyRateUpdateState = currenciesState,
+            query = query,
+            units = units,
+        )
     }
+        .mapLatest {
+            if (it !is RightSideUIState.Ready) return@mapLatest it
+
+            filterUnitsRight(
+                query = it.query,
+                unitGroup = it.unitTo.group,
+                favoritesOnly = it.favorites,
+                sorting = it.sorting,
+            )
+            it
+        }
+        .stateIn(viewModelScope, SharingStarted.Lazily, RightSideUIState.Loading)
 
-    /**
-     * Swap [_unitFrom] and [_unitTo].
-     */
     fun swapUnits() {
         _unitFrom
             .getAndUpdate { _unitTo.value }
             .also { oldUnitFrom -> _unitTo.update { oldUnitFrom } }
-        saveLatestPairOfUnits()
-        updateCurrenciesRatesIfNeeded()
-    }
 
-    private fun convertInput() {
-        when (_unitFrom.value?.group) {
-            UnitGroup.NUMBER_BASE -> convertAsNumberBase()
-            else -> convertAsExpression()
-        }
-    }
-
-    private fun convertAsNumberBase() = viewModelScope.launch(Dispatchers.Default) {
-        // Units are still loading, don't convert anything yet
-        val unitFrom = _unitFrom.value ?: return@launch
-        val unitTo = _unitTo.value ?: return@launch
-
-        val conversionResult = try {
-            (unitFrom as NumberBaseUnit).convertToBase(
-                input = _input.value.text.ifEmpty { "0" },
-                toBase = (unitTo as NumberBaseUnit).base
-            )
-        } catch (e: Exception) {
-            when (e) {
-                is ClassCastException -> return@launch
-                is NumberFormatException, is IllegalArgumentException -> ""
-                else -> throw e
-            }
-        }
-        _result.update { ConversionResult.NumberBase(conversionResult) }
-    }
-
-    private fun convertAsExpression() = viewModelScope.launch(Dispatchers.Default) {
-        val unitFrom = _unitFrom.value ?: return@launch
-        val unitTo = _unitTo.value ?: return@launch
-        val input = _input.value.text.ifEmpty { "0" }
-
-        if (input.isEmpty()) {
-            _calculated.update { null }
-            _result.update { ConversionResult.Default("") }
-            return@launch
+        _loadCurrenciesJob?.cancel()
+        _currenciesState.update { CurrencyRateUpdateState.Nothing }
+        _unitFrom.value?.let {
+            if (it.group == UnitGroup.CURRENCY) updateCurrencyRates(it)
         }
 
-        val evaluationResult = try {
-            Expression(input)
-                .calculate()
-                .also {
-                    if (it > BigDecimal.valueOf(Double.MAX_VALUE)) throw ExpressionException.TooBig()
-                }
-                .setMinimumRequiredScale(_userPrefs.value.digitsPrecision)
-                .trimZeros()
-        } catch (e: ExpressionException.DivideByZero) {
-            _calculated.update { null }
-            return@launch
-        } catch (e: Exception) {
-            return@launch
-        }
-
-        _calculated.update {
-            if (input.isExpression()) evaluationResult.toStringWith(_userPrefs.value.outputFormat)
-            else null
-        }
-
-        val conversionResult = unitFrom.convert(
-            unitTo = unitTo,
-            value = evaluationResult,
-            scale = _userPrefs.value.digitsPrecision
-        ).toStringWith(_userPrefs.value.outputFormat)
-
-        _result.update {
-            if ((unitFrom.group == UnitGroup.TIME) and (_userPrefs.value.unitConverterFormatTime))
-                ConversionResult.Time(conversionResult)
-            else
-                ConversionResult.Default(conversionResult)
-        }
-    }
-
-    private fun incrementCounter(unit: AbstractUnit) {
-        viewModelScope.launch(Dispatchers.IO) {
-            unitRepository.insertUnits(
-                UnitsEntity(
-                    unitId = unit.unitId,
-                    isFavorite = unit.isFavorite,
-                    pairedUnitId = unit.pairedUnit,
-                    // This will increment counter on unit in list too
-                    frequency = ++unit.counter
-                )
-            )
-        }
-    }
-
-    private fun updatePairedUnit(unit: AbstractUnit) {
-        viewModelScope.launch(Dispatchers.IO) {
-            unitRepository.insertUnits(
-                UnitsEntity(
-                    unitId = unit.unitId,
-                    isFavorite = unit.isFavorite,
-                    pairedUnitId = unit.pairedUnit,
-                    frequency = unit.counter
-                )
-            )
-        }
-    }
-
-    fun updateCurrenciesRatesIfNeeded() {
-        viewModelScope.launch(Dispatchers.IO) {
-            _showError.update { false }
-            _showLoading.update { false }
-
-            // Units are still loading, don't convert anything yet
-            if (_unitFrom.value?.group != UnitGroup.CURRENCY) return@launch
-            val unitFrom = _unitFrom.value ?: return@launch
-            // Starting to load stuff
-            _showLoading.update { true }
-
-            try {
-                allUnitsRepository.updateBasicUnitsForCurrencies(unitFrom)
-                convertAsExpression()
-            } catch (e: Exception) {
-                // Dangerous and stupid, but who cares
-                _showError.update { true }
-            } finally {
-                /**
-                 * Loaded, convert (this will trigger flow to call convertInput). Even if there was
-                 * an error, it's OK and user will not see conversion result in that case.
-                 */
-                _showLoading.update { false }
-            }
-        }
-    }
-
-    private fun saveLatestPairOfUnits() {
-        viewModelScope.launch(Dispatchers.IO) {
-            // Units are still loading, don't convert anything yet
-            val unitFrom = _unitFrom.value ?: return@launch
-            val unitTo = _unitTo.value ?: return@launch
-            userPrefsRepository.updateLatestPairOfUnits(unitFrom, unitTo)
-        }
-    }
-
-    private fun startObserving() {
         viewModelScope.launch {
-            merge(_input, _unitFrom, _unitTo, _showLoading, _userPrefs).collectLatest {
-                convertInput()
+            val unitTo = _unitTo.value ?: return@launch
+            val unitFrom = _unitFrom.value ?: return@launch
+
+            userPrefsRepository.updateLatestPairOfUnits(unitFrom = unitFrom, unitTo = unitTo)
+        }
+    }
+
+    fun addTokens(tokens: String) = _input.update {
+        val newValue = it.addTokens(tokens)
+        savedStateHandle[converterInputKey] = newValue.text
+        newValue
+    }
+
+    fun deleteTokens() = _input.update {
+        val newValue = it.deleteTokens()
+        savedStateHandle[converterInputKey] = newValue.text
+        newValue
+    }
+
+    fun clearInput() = _input.update {
+        savedStateHandle[converterInputKey] = ""
+        TextFieldValue()
+    }
+
+    fun onCursorChange(selection: TextRange) = _input.update { it.copy(selection = selection) }
+
+    fun updateCurrencyRates(unit: AbstractUnit) {
+        _loadCurrenciesJob = viewModelScope.launch(Dispatchers.IO) {
+            try {
+                _currenciesState.update { CurrencyRateUpdateState.Loading }
+                val updateDate = unitsRepo.updateRates(unit) ?: throw Exception("Empty cache")
+
+                // Set to fresh objects with updated basic unit values
+                _unitFrom.update { unitsRepo.getById(it!!.id) }
+                _unitTo.update { unitsRepo.getById(it!!.id) }
+                _currenciesState.update { CurrencyRateUpdateState.Ready(updateDate) }
+            } catch (e: Exception) {
+                _currenciesState.update { CurrencyRateUpdateState.Error }
             }
         }
     }
 
-    private fun loadInitialUnitPair() {
-        viewModelScope.launch(Dispatchers.IO) {
-            val initialUserPrefs = userPrefsRepository.mainPreferencesFlow.first()
+    fun updateUnitFrom(unit: AbstractUnit) {
+        val pair = unitsRepo.getById(
+            unit.pairId ?: unitsRepo.getCollection(unit.group).first().id
+        )
 
-            // First we load latest pair of units
-            _unitFrom.update {
-                try {
-                    allUnitsRepository.getById(initialUserPrefs.latestLeftSideUnit)
-                } catch (e: java.util.NoSuchElementException) {
-                    allUnitsRepository.getById(MyUnitIDS.kilometer)
-                }
-            }
-
-            _unitTo.update {
-                try {
-                    allUnitsRepository.getById(initialUserPrefs.latestRightSideUnit)
-                } catch (e: java.util.NoSuchElementException) {
-                    allUnitsRepository.getById(MyUnitIDS.mile)
-                }
-            }
-
-            updateCurrenciesRatesIfNeeded()
+        viewModelScope.launch(Dispatchers.Default) {
+            unitsRepo.incrementCounter(unit)
+            userPrefsRepository.updateLatestPairOfUnits(unitFrom = unit, unitTo = pair)
         }
+
+        _loadCurrenciesJob?.cancel()
+        _currenciesState.update { CurrencyRateUpdateState.Nothing }
+        if (unit.group == UnitGroup.CURRENCY) updateCurrencyRates(unit)
+
+        _unitFrom.update {
+            // We change from something to base converter or the other way around
+            if ((it?.group == UnitGroup.NUMBER_BASE) xor (unit.group == UnitGroup.NUMBER_BASE))
+                clearInput()
+
+            unit
+        }
+        _unitTo.update { pair }
+    }
+
+    fun updateUnitTo(unit: AbstractUnit) {
+        _unitTo.update { unit }
+
+        viewModelScope.launch {
+            val unitTo = _unitTo.value ?: return@launch
+            val unitFrom = _unitFrom.value ?: return@launch
+
+            unitsRepo.incrementCounter(unitTo)
+
+            unitsRepo.setPair(unitFrom, unitTo)
+            userPrefsRepository.updateLatestPairOfUnits(unitFrom = unitFrom, unitTo = unitTo)
+        }
+    }
+
+    fun queryChangeLeft(query: TextFieldValue) = _leftQuery.update { query }
+
+    fun queryChangeRight(query: TextFieldValue) = _rightQuery.update { query }
+
+    fun favoritesOnlyChange(enabled: Boolean) = viewModelScope.launch {
+        userPrefsRepository.updateUnitConverterFavoritesOnly(enabled)
+    }
+
+    fun updateUnitGroupLeft(unitGroup: UnitGroup?) = _leftUnitGroup.update { unitGroup }
+
+    fun favoriteUnit(unit: AbstractUnit) = viewModelScope.launch {
+        unitsRepo.favorite(unit)
+    }
+
+    private fun filterUnitsLeft(
+        query: TextFieldValue,
+        unitGroup: UnitGroup?,
+        favoritesOnly: Boolean,
+        sorting: UnitsListSorting,
+        shownUnitGroups: List<UnitGroup>,
+    ) = viewModelScope.launch(Dispatchers.Default) {
+        _leftUnits.update {
+            unitsRepo.filterUnits(
+                query = query.text,
+                unitGroup = unitGroup,
+                favoritesOnly = favoritesOnly,
+                hideBrokenUnits = false,
+                sorting = sorting,
+                shownUnitGroups = shownUnitGroups
+            )
+        }
+    }
+
+    private fun filterUnitsRight(
+        query: TextFieldValue,
+        unitGroup: UnitGroup?,
+        favoritesOnly: Boolean,
+        sorting: UnitsListSorting,
+    ) = viewModelScope.launch(Dispatchers.Default) {
+        _rightUnits.update {
+            unitsRepo.filterUnits(
+                query = query.text,
+                unitGroup = unitGroup,
+                favoritesOnly = favoritesOnly,
+                hideBrokenUnits = true,
+                sorting = sorting,
+            )
+        }
+    }
+
+    private fun convertDefault(
+        unitFrom: DefaultUnit,
+        unitTo: DefaultUnit,
+        input: TextFieldValue,
+        formatTime: Boolean,
+    ) = viewModelScope.launch(Dispatchers.Default) {
+        val calculated = try {
+            Expression(input.text.ifEmpty { Token.Digit._0 }).calculate()
+        } catch (e: ExpressionException.DivideByZero) {
+            _calculation.update { null }
+            return@launch
+        } catch (e: Exception) {
+            return@launch
+        }
+        _calculation.update { if (input.text.isExpression()) calculated else null }
+
+        try {
+            if ((unitFrom.group == UnitGroup.TIME) and (formatTime)) {
+                _result.update { formatTime(calculated.multiply(unitFrom.basicUnit)) }
+
+                return@launch
+            }
+
+            val conversion = unitFrom.convert(unitTo, calculated)
+
+            _result.update { ConverterResult.Default(conversion) }
+        } catch (e: Exception) {
+            _result.update { ConverterResult.Default(BigDecimal.ZERO) }
+        }
+    }
+
+    private fun convertNumberBase(
+        unitFrom: NumberBaseUnit,
+        unitTo: NumberBaseUnit,
+        input: TextFieldValue,
+    ) = viewModelScope.launch(Dispatchers.Default) {
+        val conversion = try {
+            unitFrom.convert(unitTo, input.text.ifEmpty { Token.Digit._0 })
+        } catch (e: Exception) {
+            ""
+        }
+
+        _result.update { ConverterResult.NumberBase(conversion) }
     }
 
     init {
-        loadInitialUnitPair()
-        startObserving()
+        viewModelScope.launch(Dispatchers.Default) {
+            val userPrefs = userPrefsRepository.converterPrefs.first()
+            val unitFrom = unitsRepo.getById(userPrefs.latestLeftSideUnit)
+            val unitTo = unitsRepo.getById(userPrefs.latestRightSideUnit)
+
+            _unitFrom.update { unitFrom }
+            _unitTo.update { unitTo }
+            if (unitFrom.group == UnitGroup.CURRENCY) updateCurrencyRates(unitFrom)
+        }
     }
 }
diff --git a/feature/epoch/src/main/java/com/sadellie/unitto/feature/epoch/navigation/EpochNavigation.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/CurrencyRateUpdateState.kt
similarity index 52%
rename from feature/epoch/src/main/java/com/sadellie/unitto/feature/epoch/navigation/EpochNavigation.kt
rename to feature/converter/src/main/java/com/sadellie/unitto/feature/converter/CurrencyRateUpdateState.kt
index 59b94afb..cba8e6ac 100644
--- a/feature/epoch/src/main/java/com/sadellie/unitto/feature/epoch/navigation/EpochNavigation.kt
+++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/CurrencyRateUpdateState.kt
@@ -16,25 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.feature.epoch.navigation
+package com.sadellie.unitto.feature.converter
 
-import androidx.navigation.NavGraphBuilder
-import androidx.navigation.compose.composable
-import androidx.navigation.navDeepLink
-import com.sadellie.unitto.core.base.TopLevelDestinations
-import com.sadellie.unitto.feature.epoch.EpochRoute
+import java.time.LocalDate
 
-private val epochRoute: String by lazy { TopLevelDestinations.Epoch.route }
-
-fun NavGraphBuilder.epochScreen(
-    navigateToMenu: () -> Unit
-) {
-    composable(
-        route = epochRoute,
-        deepLinks = listOf(
-            navDeepLink { uriPattern = "app://com.sadellie.unitto/$epochRoute" }
-        )
-    ) {
-        EpochRoute(navigateToMenu = navigateToMenu)
-    }
+internal sealed class CurrencyRateUpdateState {
+    data object Loading : CurrencyRateUpdateState()
+    data object Error : CurrencyRateUpdateState()
+    data class Ready(val date: LocalDate) : CurrencyRateUpdateState()
+    data object Nothing : CurrencyRateUpdateState()
 }
diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/LeftSideScreen.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/LeftSideScreen.kt
new file mode 100644
index 00000000..4ea78211
--- /dev/null
+++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/LeftSideScreen.kt
@@ -0,0 +1,234 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.feature.converter
+
+import androidx.compose.animation.Crossfade
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.LinearOutSlowInEasing
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+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.foundation.lazy.rememberLazyListState
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.material3.rememberTopAppBarState
+import androidx.compose.material3.surfaceColorAtElevation
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.sadellie.unitto.core.base.R
+import com.sadellie.unitto.core.ui.common.UnittoSearchBar
+import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.UnitsListSorting
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.NormalUnit
+import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.feature.converter.components.BasicUnitListItem
+import com.sadellie.unitto.feature.converter.components.ChipsFlexRow
+import com.sadellie.unitto.feature.converter.components.ChipsRow
+import com.sadellie.unitto.feature.converter.components.FavoritesButton
+import com.sadellie.unitto.feature.converter.components.SearchPlaceholder
+import com.sadellie.unitto.feature.converter.components.UnitGroupHeader
+import java.math.BigDecimal
+
+@Composable
+internal fun LeftSideRoute(
+    viewModel: ConverterViewModel,
+    navigateUp: () -> Unit,
+    navigateToUnitGroups: () -> Unit,
+) {
+    when (
+        val uiState = viewModel.leftSideUIState.collectAsStateWithLifecycle().value
+    ) {
+        is LeftSideUIState.Loading -> {
+            Box(modifier = Modifier.fillMaxSize())
+        }
+        is LeftSideUIState.Ready -> LeftSideScreen(
+            uiState = uiState,
+            onQueryChange = viewModel::queryChangeLeft,
+            toggleFavoritesOnly = viewModel::favoritesOnlyChange,
+            updateUnitFrom = viewModel::updateUnitFrom,
+            updateUnitGroup = viewModel::updateUnitGroupLeft,
+            favoriteUnit = viewModel::favoriteUnit,
+            navigateUp = navigateUp,
+            navigateToUnitGroups = navigateToUnitGroups,
+        )
+    }
+}
+
+@Composable
+private fun LeftSideScreen(
+    uiState: LeftSideUIState.Ready,
+    onQueryChange: (TextFieldValue) -> Unit,
+    toggleFavoritesOnly: (Boolean) -> Unit,
+    updateUnitFrom: (AbstractUnit) -> Unit,
+    updateUnitGroup: (UnitGroup?) -> Unit,
+    favoriteUnit: (AbstractUnit) -> Unit,
+    navigateUp: () -> Unit,
+    navigateToUnitGroups: () -> Unit,
+) {
+    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
+    val elevatedColor = MaterialTheme.colorScheme.surfaceColorAtElevation(3.dp)
+    val needToTint by remember {
+        derivedStateOf { scrollBehavior.state.overlappedFraction > 0.01f }
+    }
+    val chipsBackground = animateColorAsState(
+        targetValue = if (needToTint) elevatedColor else MaterialTheme.colorScheme.surface,
+        animationSpec = tween(durationMillis = 500, easing = LinearOutSlowInEasing),
+        label = "Chips background",
+    )
+
+    val chipsRowLazyListState = rememberLazyListState()
+
+    LaunchedEffect(uiState.unitFrom, uiState.shownUnitGroups) {
+        updateUnitGroup(uiState.unitFrom.group)
+
+        kotlin.runCatching {
+            val groupToSelect = uiState.shownUnitGroups.indexOf(uiState.unitFrom.group)
+            if (groupToSelect > -1) {
+                chipsRowLazyListState.scrollToItem(groupToSelect)
+            }
+        }
+    }
+
+    Scaffold(
+        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
+        topBar = {
+            Column(
+                Modifier.background(chipsBackground.value)
+            ) {
+                UnittoSearchBar(
+                    query = uiState.query,
+                    onQueryChange = onQueryChange,
+                    navigateUp = navigateUp,
+                    title = stringResource(R.string.units_screen_from),
+                    placeholder = stringResource(R.string.search_bar_placeholder),
+                    noSearchActions = {
+                        FavoritesButton(uiState.favorites) {
+                            toggleFavoritesOnly(!uiState.favorites)
+                        }
+                    }
+                )
+
+                if (uiState.verticalList) {
+                    ChipsFlexRow(
+                        chosenUnitGroup = uiState.unitGroup,
+                        items = uiState.shownUnitGroups,
+                        selectAction = updateUnitGroup,
+                        lazyListState = chipsRowLazyListState,
+                        navigateToSettingsAction = navigateToUnitGroups
+                    )
+                } else {
+                    ChipsRow(
+                        chosenUnitGroup = uiState.unitGroup,
+                        items = uiState.shownUnitGroups,
+                        selectAction = updateUnitGroup,
+                        lazyListState = chipsRowLazyListState,
+                        navigateToSettingsAction = navigateToUnitGroups
+                    )
+                }
+            }
+        }
+    ) { paddingValues ->
+        Crossfade(
+            targetState = uiState.units.isNotEmpty(),
+            modifier = Modifier.padding(paddingValues),
+            label = "Units list"
+        ) { hasUnits ->
+            when (hasUnits) {
+                true -> LazyColumn(Modifier.fillMaxSize()) {
+                    uiState.units.forEach { (unitGroup, units) ->
+                        item(unitGroup.name) {
+                            UnitGroupHeader(Modifier.animateItemPlacement(), unitGroup)
+                        }
+
+                        items(units, { it.id }) {
+                            BasicUnitListItem(
+                                modifier = Modifier.animateItemPlacement(),
+                                name = stringResource(it.displayName),
+                                supportLabel = stringResource(it.shortName),
+                                isFavorite = it.isFavorite,
+                                isSelected = it.id == uiState.unitFrom.id,
+                                onClick = {
+                                    onQueryChange(TextFieldValue())
+                                    updateUnitFrom(it)
+                                    navigateUp()
+                                },
+                                favoriteUnit = { favoriteUnit(it) }
+                            )
+                        }
+                    }
+                }
+
+                false -> SearchPlaceholder(navigateToSettingsAction = navigateToUnitGroups)
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun LeftSideScreenPreview() {
+    val units: Map<UnitGroup, List<AbstractUnit>> = mapOf(
+        UnitGroup.LENGTH to listOf(
+            NormalUnit(MyUnitIDS.meter, BigDecimal.valueOf(1.0E+18), UnitGroup.LENGTH, R.string.meter, R.string.meter_short),
+            NormalUnit(MyUnitIDS.kilometer, BigDecimal.valueOf(1.0E+21), UnitGroup.LENGTH, R.string.kilometer, R.string.kilometer_short),
+            NormalUnit(MyUnitIDS.nautical_mile, BigDecimal.valueOf(1.852E+21), UnitGroup.LENGTH, R.string.nautical_mile, R.string.nautical_mile_short),
+            NormalUnit(MyUnitIDS.inch, BigDecimal.valueOf(25_400_000_000_000_000), UnitGroup.LENGTH, R.string.inch, R.string.inch_short),
+            NormalUnit(MyUnitIDS.foot, BigDecimal.valueOf(304_800_000_000_002_200), UnitGroup.LENGTH, R.string.foot, R.string.foot_short),
+            NormalUnit(MyUnitIDS.yard, BigDecimal.valueOf(914_400_000_000_006_400), UnitGroup.LENGTH, R.string.yard, R.string.yard_short),
+            NormalUnit(MyUnitIDS.mile, BigDecimal.valueOf(1_609_344_000_000_010_500_000.0), UnitGroup.LENGTH, R.string.mile, R.string.mile_short),
+        )
+    )
+
+    LeftSideScreen(
+        uiState = LeftSideUIState.Ready(
+            unitFrom = units.values.first().first(),
+            units = units,
+            query = TextFieldValue(),
+            favorites = false,
+            shownUnitGroups = listOf(UnitGroup.LENGTH, UnitGroup.TEMPERATURE, UnitGroup.CURRENCY),
+            unitGroup = units.keys.toList().first(),
+            sorting = UnitsListSorting.USAGE,
+            verticalList = false
+        ),
+        onQueryChange = {},
+        toggleFavoritesOnly = {},
+        updateUnitFrom = {},
+        updateUnitGroup = {},
+        favoriteUnit = {},
+        navigateUp = {},
+        navigateToUnitGroups = {}
+    )
+}
diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/LeftSideUIState.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/LeftSideUIState.kt
new file mode 100644
index 00000000..c9dafaa7
--- /dev/null
+++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/LeftSideUIState.kt
@@ -0,0 +1,39 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.feature.converter
+
+import androidx.compose.ui.text.input.TextFieldValue
+import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.UnitsListSorting
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+
+internal sealed class LeftSideUIState {
+    data object Loading : LeftSideUIState()
+
+    data class Ready(
+        val unitFrom: AbstractUnit,
+        val query: TextFieldValue,
+        val units: Map<UnitGroup, List<AbstractUnit>> = emptyMap(),
+        val favorites: Boolean,
+        val shownUnitGroups: List<UnitGroup>,
+        val unitGroup: UnitGroup?,
+        val sorting: UnitsListSorting,
+        val verticalList: Boolean,
+    ) : LeftSideUIState()
+}
diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/NetworkUtils.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/NetworkUtils.kt
new file mode 100644
index 00000000..ce39081f
--- /dev/null
+++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/NetworkUtils.kt
@@ -0,0 +1,66 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.feature.converter
+
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import android.net.NetworkRequest
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
+import androidx.compose.ui.platform.LocalContext
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.callbackFlow
+
+// https://github.com/PatilShreyas/NotyKT/pull/210/files#diff-88d0c098edd51dfdd06d871b22de23efe0935234fe80b2b54592583262fbe846
+
+internal sealed class ConnectionState {
+    data object Available : ConnectionState()
+    data object Unavailable : ConnectionState()
+}
+
+private fun Context.observeConnectivityAsFlow() = callbackFlow {
+    val connectivityManager = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+
+    val callback = object : ConnectivityManager.NetworkCallback() {
+        override fun onAvailable(network: Network) { trySend(ConnectionState.Available) }
+        override fun onLost(network: Network) { trySend(ConnectionState.Unavailable) }
+    }
+
+    val networkRequest = NetworkRequest.Builder()
+        .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+        .build()
+
+    connectivityManager.registerNetworkCallback(networkRequest, callback)
+
+    awaitClose {
+        connectivityManager.unregisterNetworkCallback(callback)
+    }
+}
+
+@Composable
+internal fun connectivityState(): State<ConnectionState> {
+    val context = LocalContext.current
+
+    return context
+        .observeConnectivityAsFlow()
+        .collectAsStateWithLifecycle(ConnectionState.Unavailable)
+}
diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/RightSideScreen.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/RightSideScreen.kt
new file mode 100644
index 00000000..6f565520
--- /dev/null
+++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/RightSideScreen.kt
@@ -0,0 +1,232 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.feature.converter
+
+import androidx.compose.animation.Crossfade
+import androidx.compose.foundation.layout.Box
+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.material3.Scaffold
+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.text.input.TextFieldValue
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.sadellie.unitto.core.base.OutputFormat
+import com.sadellie.unitto.core.base.R
+import com.sadellie.unitto.core.ui.common.UnittoSearchBar
+import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols
+import com.sadellie.unitto.core.ui.common.textfield.formatExpression
+import com.sadellie.unitto.data.common.format
+import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.UnitsListSorting
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+import com.sadellie.unitto.data.model.unit.DefaultUnit
+import com.sadellie.unitto.data.model.unit.NormalUnit
+import com.sadellie.unitto.data.model.unit.NumberBaseUnit
+import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.feature.converter.components.BasicUnitListItem
+import com.sadellie.unitto.feature.converter.components.FavoritesButton
+import com.sadellie.unitto.feature.converter.components.SearchPlaceholder
+import com.sadellie.unitto.feature.converter.components.UnitGroupHeader
+import java.math.BigDecimal
+
+@Composable
+internal fun RightSideRoute(
+    viewModel: ConverterViewModel,
+    navigateUp: () -> Unit,
+    navigateToUnitGroups: () -> Unit,
+) {
+    when (
+        val uiState = viewModel.rightSideUIState.collectAsStateWithLifecycle().value
+    ) {
+        is RightSideUIState.Loading -> Box(Modifier.fillMaxSize())
+        is RightSideUIState.Ready ->
+            RightSideScreen(
+                uiState = uiState,
+                onQueryChange = viewModel::queryChangeRight,
+                toggleFavoritesOnly = viewModel::favoritesOnlyChange,
+                updateUnitTo = viewModel::updateUnitTo,
+                favoriteUnit = viewModel::favoriteUnit,
+                navigateUp = navigateUp,
+                navigateToUnitGroups = navigateToUnitGroups,
+            )
+    }
+}
+
+@Composable
+private fun RightSideScreen(
+    uiState: RightSideUIState.Ready,
+    onQueryChange: (TextFieldValue) -> Unit,
+    toggleFavoritesOnly: (Boolean) -> Unit,
+    updateUnitTo: (AbstractUnit) -> Unit,
+    favoriteUnit: (AbstractUnit) -> Unit,
+    navigateUp: () -> Unit,
+    navigateToUnitGroups: () -> Unit,
+) {
+    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
+
+    Scaffold(
+        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
+        topBar = {
+            UnittoSearchBar(
+                query = uiState.query,
+                onQueryChange = onQueryChange,
+                navigateUp = navigateUp,
+                title = stringResource(R.string.units_screen_to),
+                placeholder = stringResource(R.string.search_bar_placeholder),
+                noSearchActions = {
+                    FavoritesButton(uiState.favorites) {
+                        toggleFavoritesOnly(!uiState.favorites)
+                    }
+                },
+                scrollBehavior = scrollBehavior
+            )
+        }
+    ) { paddingValues ->
+        Crossfade(
+            targetState = uiState.units.isNotEmpty(),
+            modifier = Modifier.padding(paddingValues),
+            label = "Units list"
+        ) { hasUnits ->
+            when (hasUnits) {
+                true -> LazyColumn(Modifier.fillMaxSize()) {
+                    uiState.units.forEach { (unitGroup, units) ->
+                        item(unitGroup.name) {
+                            UnitGroupHeader(Modifier.animateItemPlacement(), unitGroup)
+                        }
+
+                        items(units, { it.id }) {
+                            BasicUnitListItem(
+                                modifier = Modifier.animateItemPlacement(),
+                                name = stringResource(it.displayName),
+                                supportLabel = formatUnitToSupportLabel(
+                                    unitFrom = uiState.unitFrom,
+                                    unitTo = it,
+                                    input = uiState.input,
+                                    shortName = stringResource(it.shortName),
+                                    scale = uiState.scale,
+                                    outputFormat = uiState.outputFormat,
+                                    formatterSymbols = uiState.formatterSymbols,
+                                    readyCurrencies = uiState.currencyRateUpdateState is CurrencyRateUpdateState.Ready,
+                                ),
+                                isFavorite = it.isFavorite,
+                                isSelected = it.id == uiState.unitTo.id,
+                                onClick = {
+                                    onQueryChange(TextFieldValue())
+                                    updateUnitTo(it)
+                                    navigateUp()
+                                },
+                                favoriteUnit = { favoriteUnit(it) }
+                            )
+                        }
+                    }
+                }
+
+                false -> SearchPlaceholder(navigateToSettingsAction = navigateToUnitGroups)
+            }
+        }
+    }
+}
+
+private fun formatUnitToSupportLabel(
+    unitFrom: AbstractUnit?,
+    unitTo: AbstractUnit?,
+    input: String,
+    shortName: String,
+    scale: Int,
+    outputFormat: Int,
+    formatterSymbols: FormatterSymbols,
+    readyCurrencies: Boolean,
+): String {
+    if ((unitFrom?.group == UnitGroup.CURRENCY) and !readyCurrencies) return shortName
+    if (input.isEmpty()) return shortName
+
+    try {
+        if ((unitFrom is DefaultUnit) and (unitTo is DefaultUnit)) {
+            unitFrom as DefaultUnit
+            unitTo as DefaultUnit
+
+            val conversion = unitFrom
+                .convert(unitTo, BigDecimal(input))
+                .format(scale, outputFormat)
+                .formatExpression(formatterSymbols)
+
+            return "$conversion $shortName"
+        }
+
+        if ((unitFrom is NumberBaseUnit) and (unitTo is NumberBaseUnit)) {
+            unitFrom as NumberBaseUnit
+            unitTo as NumberBaseUnit
+
+            val conversion = unitFrom.convert(unitTo, input).uppercase()
+
+            return "$conversion $shortName"
+        }
+    } catch (e: Exception) {
+        return shortName
+    }
+
+    return shortName
+}
+
+@Preview
+@Composable
+private fun RightSideScreenPreview() {
+    val units: Map<UnitGroup, List<AbstractUnit>> = mapOf(
+        UnitGroup.LENGTH to listOf(
+            NormalUnit(MyUnitIDS.meter, BigDecimal.valueOf(1.0E+18), UnitGroup.LENGTH, R.string.meter, R.string.meter_short),
+            NormalUnit(MyUnitIDS.kilometer, BigDecimal.valueOf(1.0E+21), UnitGroup.LENGTH, R.string.kilometer, R.string.kilometer_short),
+            NormalUnit(MyUnitIDS.nautical_mile, BigDecimal.valueOf(1.852E+21), UnitGroup.LENGTH, R.string.nautical_mile, R.string.nautical_mile_short),
+            NormalUnit(MyUnitIDS.inch, BigDecimal.valueOf(25_400_000_000_000_000), UnitGroup.LENGTH, R.string.inch, R.string.inch_short),
+            NormalUnit(MyUnitIDS.foot, BigDecimal.valueOf(304_800_000_000_002_200), UnitGroup.LENGTH, R.string.foot, R.string.foot_short),
+            NormalUnit(MyUnitIDS.yard, BigDecimal.valueOf(914_400_000_000_006_400), UnitGroup.LENGTH, R.string.yard, R.string.yard_short),
+            NormalUnit(MyUnitIDS.mile, BigDecimal.valueOf(1_609_344_000_000_010_500_000.0), UnitGroup.LENGTH, R.string.mile, R.string.mile_short),
+        )
+    )
+
+    RightSideScreen(
+        uiState = RightSideUIState.Ready(
+            unitFrom = units.values.first().first(),
+            units = units,
+            query = TextFieldValue(),
+            favorites = false,
+            sorting = UnitsListSorting.USAGE,
+            unitTo = units.values.first()[1],
+            input = "100",
+            scale = 3,
+            outputFormat = OutputFormat.PLAIN,
+            formatterSymbols = FormatterSymbols.Spaces,
+            currencyRateUpdateState = CurrencyRateUpdateState.Nothing
+        ),
+        onQueryChange = {},
+        toggleFavoritesOnly = {},
+        updateUnitTo = {},
+        favoriteUnit = {},
+        navigateUp = {},
+        navigateToUnitGroups = {}
+    )
+}
+
diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/RightSideUIState.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/RightSideUIState.kt
new file mode 100644
index 00000000..8ecee3f3
--- /dev/null
+++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/RightSideUIState.kt
@@ -0,0 +1,43 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.feature.converter
+
+import androidx.compose.ui.text.input.TextFieldValue
+import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols
+import com.sadellie.unitto.data.model.UnitGroup
+import com.sadellie.unitto.data.model.UnitsListSorting
+import com.sadellie.unitto.data.model.unit.AbstractUnit
+
+internal sealed class RightSideUIState {
+    data object Loading : RightSideUIState()
+
+    data class Ready(
+        val unitFrom: AbstractUnit,
+        val unitTo: AbstractUnit,
+        val query: TextFieldValue,
+        val units: Map<UnitGroup, List<AbstractUnit>>,
+        val favorites: Boolean,
+        val sorting: UnitsListSorting,
+        val input: String,
+        val scale: Int,
+        val outputFormat: Int,
+        val formatterSymbols: FormatterSymbols,
+        val currencyRateUpdateState: CurrencyRateUpdateState,
+    ) : RightSideUIState()
+}
diff --git a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/UnitListItem.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/BasicUnitListItem.kt
similarity index 52%
rename from feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/UnitListItem.kt
rename to feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/BasicUnitListItem.kt
index 29fbb3d7..67c855cd 100644
--- a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/UnitListItem.kt
+++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/BasicUnitListItem.kt
@@ -1,6 +1,6 @@
 /*
  * Unitto is a unit converter for Android
- * Copyright (c) 2022-2023 Elshan Agaev
+ * Copyright (c) 2023 Elshan Agaev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,9 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.feature.unitslist.components
+package com.sadellie.unitto.feature.converter.components
 
-import android.annotation.SuppressLint
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.SizeTransform
 import androidx.compose.animation.scaleIn
@@ -43,11 +42,7 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 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.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -55,44 +50,36 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.data.model.AbstractUnit
 
-/**
- * Represents one list item. Once clicked will navigate up.
- *
- * @param unit The unit itself.
- * @param isSelected Whether this unit is selected or not (current pair of unit).
- * @param selectAction Function to change current unit. Called when choosing unit.
- * @param favoriteAction Function to mark unit as favorite. It's a toggle.
- * @param shortNameLabel String on the second line.
- */
-@SuppressLint("UnusedContentLambdaTargetStateParameter")
 @Composable
-private fun BasicUnitListItem(
+internal fun BasicUnitListItem(
     modifier: Modifier,
-    unit: AbstractUnit,
+    name: String,
+    supportLabel: String,
+    isFavorite: Boolean,
     isSelected: Boolean,
-    selectAction: (AbstractUnit) -> Unit,
-    favoriteAction: (AbstractUnit) -> Unit,
-    shortNameLabel: String
+    onClick: () -> Unit,
+    favoriteUnit: () -> Unit,
 ) {
-    var isFavorite: Boolean by rememberSaveable { mutableStateOf(unit.isFavorite) }
+    val itemColor = if (isSelected) MaterialTheme.colorScheme.onPrimaryContainer else MaterialTheme.colorScheme.onSurfaceVariant
+
     Box(
         modifier = modifier
             .background(MaterialTheme.colorScheme.surface)
             .clickable(
                 interactionSource = remember { MutableInteractionSource() },
                 indication = rememberRipple(),
-                onClick = { selectAction(unit) }
+                onClick = onClick
             )
             .padding(horizontal = 12.dp)
     ) {
         Row(
             modifier = Modifier
-                        .background(
-                            if (isSelected) MaterialTheme.colorScheme.primaryContainer else Color.Transparent,
-                            RoundedCornerShape(24.dp)
-                        ).padding(paddingValues = PaddingValues(horizontal = 12.dp, vertical = 8.dp))
+                .background(
+                    if (isSelected) MaterialTheme.colorScheme.primaryContainer else Color.Transparent,
+                    RoundedCornerShape(24.dp)
+                )
+                .padding(paddingValues = PaddingValues(horizontal = 12.dp, vertical = 8.dp))
                 .fillMaxWidth(),
             verticalAlignment = Alignment.CenterVertically,
             horizontalArrangement = Arrangement.spacedBy(16.dp)
@@ -103,18 +90,19 @@ private fun BasicUnitListItem(
                 Text(
                     modifier = Modifier
                         .fillMaxWidth(),
-                    text = stringResource(unit.displayName),
+                    text = name,
                     maxLines = 1,
-                    overflow = TextOverflow.Ellipsis
+                    overflow = TextOverflow.Ellipsis,
+                    color = itemColor,
                 )
                 Text(
                     modifier = Modifier
                         .fillMaxWidth(),
-                    text = shortNameLabel,
+                    text = supportLabel,
                     style = MaterialTheme.typography.bodySmall,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                    color = itemColor
                 )
             }
             AnimatedContent(
@@ -122,68 +110,20 @@ private fun BasicUnitListItem(
                     .clickable(
                         interactionSource = remember { MutableInteractionSource() },
                         indication = rememberRipple(false),
-                        onClick = { favoriteAction(unit); isFavorite = !isFavorite }
+                        onClick = favoriteUnit
                     ),
                 targetState = isFavorite,
                 transitionSpec = {
                     (scaleIn() togetherWith scaleOut()).using(SizeTransform(clip = false))
-                }
+                },
+                label = "Favorite unit"
             ) {
                 Icon(
-                    if (unit.isFavorite) Icons.Filled.Favorite else Icons.Filled.FavoriteBorder,
-                    contentDescription = stringResource(R.string.favorite_button_description)
+                    imageVector = if (it) Icons.Filled.Favorite else Icons.Filled.FavoriteBorder,
+                    contentDescription = stringResource(R.string.favorite_button_description),
+                    tint = itemColor
                 )
             }
         }
     }
 }
-
-/**
- * Represents one list item. Once clicked will navigate up. Has without conversion.
- *
- * @param unit The unit itself.
- * @param isSelected Whether this unit is selected or not (current pair of unit).
- * @param selectAction Function to change current unit. Called when choosing unit.
- * @param favoriteAction Function to mark unit as favorite. It's a toggle.
- */
-@Composable
-internal fun UnitListItem(
-    modifier: Modifier,
-    unit: AbstractUnit,
-    isSelected: Boolean,
-    selectAction: (AbstractUnit) -> Unit,
-    favoriteAction: (AbstractUnit) -> Unit,
-) = BasicUnitListItem(
-    modifier = modifier,
-    unit = unit,
-    isSelected = isSelected,
-    selectAction = selectAction,
-    favoriteAction = favoriteAction,
-    shortNameLabel = stringResource(unit.shortName)
-)
-
-/**
- * Represents one list item. Once clicked will navigate up. Has with conversion.
- *
- * @param unit The unit itself.
- * @param isSelected Whether this unit is selected or not (current pair of unit).
- * @param selectAction Function to change current unit. Called when choosing unit.
- * @param favoriteAction Function to mark unit as favorite. It's a toggle.
- * @param convertValue Function to call that will convert this unit.
- */
-@Composable
-internal fun UnitListItem(
-    modifier: Modifier,
-    unit: AbstractUnit,
-    isSelected: Boolean,
-    selectAction: (AbstractUnit) -> Unit,
-    favoriteAction: (AbstractUnit) -> Unit,
-    convertValue: (AbstractUnit) -> String
-) = BasicUnitListItem(
-    modifier = modifier,
-    unit = unit,
-    isSelected = isSelected,
-    selectAction = selectAction,
-    favoriteAction = favoriteAction,
-    shortNameLabel = "${convertValue(unit)}${stringResource(unit.shortName)}"
-)
diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/ChipsRow.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/ChipsRow.kt
new file mode 100644
index 00000000..0ab23c81
--- /dev/null
+++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/ChipsRow.kt
@@ -0,0 +1,215 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2022-2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.feature.converter.components
+
+import androidx.compose.animation.core.animateDp
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.core.updateTransition
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.material.icons.filled.ExpandMore
+import androidx.compose.material.icons.filled.Settings
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+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.draw.clipToBounds
+import androidx.compose.ui.draw.rotate
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.sadellie.unitto.core.base.R
+import com.sadellie.unitto.core.ui.common.AssistChip
+import com.sadellie.unitto.core.ui.common.FilterChip
+import com.sadellie.unitto.data.model.ALL_UNIT_GROUPS
+import com.sadellie.unitto.data.model.UnitGroup
+
+/**
+ * Row of chips with [UnitGroup]s. Temporary solution
+ *
+ * @param items All [UnitGroup]s
+ * @param chosenUnitGroup Currently selected [UnitGroup]
+ * @param selectAction Action to perform when a chip is clicked
+ * @param navigateToSettingsAction Action to perform when clicking settings chip at the end
+ * @param lazyListState Used for animated scroll when entering unit selection screen
+ */
+@Composable
+internal fun ChipsRow(
+    items: List<UnitGroup> = ALL_UNIT_GROUPS,
+    chosenUnitGroup: UnitGroup?,
+    selectAction: (UnitGroup?) -> Unit,
+    navigateToSettingsAction: () -> Unit,
+    lazyListState: LazyListState
+) {
+    LazyRow(
+        modifier = Modifier
+            .padding(bottom = 4.dp)
+            .fillMaxWidth(),
+        state = lazyListState,
+        contentPadding = PaddingValues(8.dp),
+        horizontalArrangement = Arrangement.spacedBy(8.dp)
+    ) {
+        items(items, key = { it.name }) { item ->
+            val selected: Boolean = item == chosenUnitGroup
+            FilterChip(
+                selected = selected,
+                onClick = { selectAction(if (selected) null else item) },
+                label = stringResource(item.res),
+                imageVector = Icons.Default.Check,
+                contentDescription = stringResource(R.string.checked_filter_description)
+            )
+        }
+
+        /**
+         * Usually this chip is placed at the start, but since we scroll to currently selected
+         * chip, user may never find it. There is higher chance that user will notice this chip when
+         * scrolling right (to the last one).
+         */
+        item("settings") {
+            AssistChip(
+                onClick = navigateToSettingsAction,
+                imageVector = Icons.Default.Settings,
+                contentDescription = stringResource(R.string.open_settings_description)
+            )
+        }
+    }
+}
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+fun ChipsFlexRow(
+    items: List<UnitGroup> = ALL_UNIT_GROUPS,
+    chosenUnitGroup: UnitGroup?,
+    selectAction: (UnitGroup?) -> Unit,
+    navigateToSettingsAction: () -> Unit,
+    lazyListState: LazyListState
+) {
+    var expanded by remember { mutableStateOf(false) }
+    val transition = updateTransition(expanded, label = "Expanded transition")
+
+    val rowHeight by transition.animateDp({ tween() }, "Row height") {
+        if (it) 392.dp else 32.dp
+    }
+
+    val expandRotation by transition.animateFloat({ tween() }, "Expand rotation") {
+        if (it) 180f else 0f
+    }
+
+    Row(
+        modifier = Modifier
+            .padding(16.dp, 8.dp)
+            .heightIn(max = rowHeight)
+            .clipToBounds()
+    ) {
+        FlowRow(
+            modifier = Modifier
+                .verticalScroll(rememberScrollState(), expanded)
+                .fillMaxHeight()
+                .weight(1f),
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+            verticalArrangement = Arrangement.spacedBy(8.dp)
+        ) {
+            items.forEach { item ->
+                val selected: Boolean = item == chosenUnitGroup
+                FilterChip(
+                    selected = selected,
+                    onClick = { selectAction(if (selected) null else item) },
+                    label = stringResource(item.res),
+                    imageVector = Icons.Default.Check,
+                    contentDescription = stringResource(R.string.checked_filter_description)
+                )
+            }
+            AssistChip(
+                onClick = navigateToSettingsAction,
+                imageVector = Icons.Default.Settings,
+                contentDescription = stringResource(R.string.open_settings_description)
+            )
+        }
+
+        IconButton(
+            onClick = { expanded = !expanded },
+            modifier = Modifier.size(32.dp)
+        ) {
+            Icon(
+                imageVector = Icons.Default.ExpandMore,
+                contentDescription = null,
+                modifier = Modifier
+                    .size(32.dp)
+                    .rotate(expandRotation)
+            )
+        }
+    }
+}
+
+@Preview
+@Composable
+fun PreviewUnittoChips() {
+    var selected by remember { mutableStateOf<UnitGroup?>(UnitGroup.LENGTH) }
+
+    fun selectAction(unitGroup: UnitGroup?) {
+        selected = unitGroup
+    }
+
+    ChipsRow(
+        items = ALL_UNIT_GROUPS,
+        chosenUnitGroup = selected,
+        selectAction = { selectAction(it) },
+        navigateToSettingsAction = {},
+        lazyListState = rememberLazyListState()
+    )
+}
+
+@Preview(showSystemUi = true, showBackground = true, backgroundColor = 0xFFE0E0E0)
+@Composable
+fun PreviewChipsFlowRow() {
+    var selected by remember { mutableStateOf<UnitGroup?>(UnitGroup.LENGTH) }
+
+    fun selectAction(unitGroup: UnitGroup?) {
+        selected = unitGroup
+    }
+
+    ChipsFlexRow(
+        items = ALL_UNIT_GROUPS,
+        chosenUnitGroup = selected,
+        selectAction = { selectAction(it) },
+        navigateToSettingsAction = {},
+        lazyListState = rememberLazyListState()
+    )
+}
diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/ConverterKeyboard.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/ConverterKeyboard.kt
index 38d8e94e..0cc986ca 100644
--- a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/ConverterKeyboard.kt
+++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/ConverterKeyboard.kt
@@ -18,14 +18,15 @@
 
 package com.sadellie.unitto.feature.converter.components
 
-import androidx.compose.animation.Crossfade
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
 import com.sadellie.unitto.core.base.Token
 import com.sadellie.unitto.core.ui.common.ColumnWithConstraints
 import com.sadellie.unitto.core.ui.common.KeyboardButtonFilled
@@ -58,38 +59,11 @@ import com.sadellie.unitto.core.ui.common.key.unittoicons.Multiply
 import com.sadellie.unitto.core.ui.common.key.unittoicons.Plus
 import com.sadellie.unitto.core.ui.common.key.unittoicons.RightBracket
 import com.sadellie.unitto.core.ui.common.key.unittoicons.SquareRoot
-import com.sadellie.unitto.feature.converter.ConverterMode
-
-/**
- * Keyboard with button that looks like a calculator
- *
- * @param modifier Modifier that is applied to [Row]
- * @param addDigit Function that is called when clicking number and dot buttons
- * @param deleteDigit Function that is called when clicking delete "<" button
- * @param clearInput Function that is called when clicking clear "AC" button
- * @param converterMode
- */
-@Composable
-internal fun ConverterKeyboard(
-    modifier: Modifier = Modifier,
-    addDigit: (String) -> Unit = {},
-    deleteDigit: () -> Unit = {},
-    clearInput: () -> Unit = {},
-    converterMode: ConverterMode,
-    allowVibration: Boolean,
-    fractional: String,
-    middleZero: Boolean,
-) {
-    Crossfade(converterMode, modifier = modifier) {
-        when (it) {
-            ConverterMode.DEFAULT -> DefaultKeyboard(addDigit, clearInput, deleteDigit, allowVibration, fractional, middleZero)
-            ConverterMode.BASE -> BaseKeyboard(addDigit, clearInput, deleteDigit, allowVibration)
-        }
-    }
-}
+import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols
 
 @Composable
-private fun DefaultKeyboard(
+internal fun DefaultKeyboard(
+    modifier: Modifier,
     addDigit: (String) -> Unit,
     clearInput: () -> Unit,
     deleteDigit: () -> Unit,
@@ -97,40 +71,44 @@ private fun DefaultKeyboard(
     fractional: String,
     middleZero: Boolean,
 ) {
-    val fractionalIcon = remember { if (fractional == Token.Digit.dot) UnittoIcons.Dot else UnittoIcons.Comma }
-    ColumnWithConstraints {
+    ColumnWithConstraints(modifier) {
+        val fractionalIcon = remember { if (fractional == Token.Digit.dot) UnittoIcons.Dot else UnittoIcons.Comma }
+        val mainButtonHorizontalPadding by remember {
+            derivedStateOf { (it.maxWidth * 0.01f) }
+        }
+
         // Button modifier
         val bModifier = Modifier
             .fillMaxSize()
             .weight(1f)
+            .padding(mainButtonHorizontalPadding)
         // Column modifier
-        val cModifier = Modifier.weight(1f).padding(vertical = it.maxHeight * 0.01f)
-        val horizontalArrangement = Arrangement.spacedBy(it.maxWidth * 0.03f)
-        Row(cModifier, horizontalArrangement) {
+        val cModifier = Modifier.weight(1f)
+        Row(cModifier) {
             KeyboardButtonFilled(bModifier, UnittoIcons.LeftBracket, allowVibration) { addDigit(Token.Operator.leftBracket) }
             KeyboardButtonFilled(bModifier, UnittoIcons.RightBracket, allowVibration) { addDigit(Token.Operator.rightBracket) }
             KeyboardButtonFilled(bModifier, UnittoIcons.Exponent, allowVibration) { addDigit(Token.Operator.power) }
             KeyboardButtonFilled(bModifier, UnittoIcons.SquareRoot, allowVibration) { addDigit(Token.Operator.sqrt) }
         }
-        Row(cModifier, horizontalArrangement) {
+        Row(cModifier) {
             KeyboardButtonLight(bModifier, UnittoIcons.Key7, allowVibration) { addDigit(Token.Digit._7) }
             KeyboardButtonLight(bModifier, UnittoIcons.Key8, allowVibration) { addDigit(Token.Digit._8) }
             KeyboardButtonLight(bModifier, UnittoIcons.Key9, allowVibration) { addDigit(Token.Digit._9) }
             KeyboardButtonFilled(bModifier, UnittoIcons.Divide, allowVibration) { addDigit(Token.Operator.divide) }
         }
-        Row(cModifier, horizontalArrangement) {
+        Row(cModifier) {
             KeyboardButtonLight(bModifier, UnittoIcons.Key4, allowVibration) { addDigit(Token.Digit._4) }
             KeyboardButtonLight(bModifier, UnittoIcons.Key5, allowVibration) { addDigit(Token.Digit._5) }
             KeyboardButtonLight(bModifier, UnittoIcons.Key6, allowVibration) { addDigit(Token.Digit._6) }
             KeyboardButtonFilled(bModifier, UnittoIcons.Multiply, allowVibration) { addDigit(Token.Operator.multiply) }
         }
-        Row(cModifier, horizontalArrangement) {
+        Row(cModifier) {
             KeyboardButtonLight(bModifier, UnittoIcons.Key1, allowVibration) { addDigit(Token.Digit._1) }
             KeyboardButtonLight(bModifier, UnittoIcons.Key2, allowVibration) { addDigit(Token.Digit._2) }
             KeyboardButtonLight(bModifier, UnittoIcons.Key3, allowVibration) { addDigit(Token.Digit._3) }
             KeyboardButtonFilled(bModifier, UnittoIcons.Minus, allowVibration) { addDigit(Token.Operator.minus) }
         }
-        Row(cModifier, horizontalArrangement) {
+        Row(cModifier) {
             if (middleZero) {
                 KeyboardButtonLight(bModifier, fractionalIcon, allowVibration) { addDigit(Token.Digit.dot) }
                 KeyboardButtonLight(bModifier, UnittoIcons.Key0, allowVibration) { addDigit(Token.Digit._0) }
@@ -138,56 +116,90 @@ private fun DefaultKeyboard(
                 KeyboardButtonLight(bModifier, UnittoIcons.Key0, allowVibration) { addDigit(Token.Digit._0) }
                 KeyboardButtonLight(bModifier, fractionalIcon, allowVibration) { addDigit(Token.Digit.dot) }
             }
-            KeyboardButtonLight(bModifier, UnittoIcons.Backspace, allowVibration, clearInput) { deleteDigit() }
+            KeyboardButtonLight(bModifier, UnittoIcons.Backspace, allowVibration, onLongClick = clearInput) { deleteDigit() }
             KeyboardButtonFilled(bModifier, UnittoIcons.Plus, allowVibration) { addDigit(Token.Operator.plus) }
         }
     }
 }
 
 @Composable
-private fun BaseKeyboard(
+internal fun NumberBaseKeyboard(
+    modifier: Modifier,
     addDigit: (String) -> Unit,
     clearInput: () -> Unit,
     deleteDigit: () -> Unit,
     allowVibration: Boolean
 ) {
-    ColumnWithConstraints {
+    ColumnWithConstraints(modifier) {
+        val mainButtonHorizontalPadding by remember {
+            derivedStateOf { (it.maxWidth * 0.01f) }
+        }
+
         // Button modifier
         val bModifier = Modifier
             .fillMaxSize()
             .weight(1f)
+            .padding(mainButtonHorizontalPadding)
         // Column modifier
-        val cModifier = Modifier.weight(1f).padding(vertical = it.maxHeight * 0.01f)
-        val horizontalArrangement = Arrangement.spacedBy(it.maxWidth * 0.03f)
-        Row(cModifier, horizontalArrangement) {
+        val cModifier = Modifier.weight(1f)
+        Row(cModifier) {
             KeyboardButtonFilled(bModifier, UnittoIcons.KeyA, allowVibration) { addDigit(Token.Letter._A) }
             KeyboardButtonFilled(bModifier, UnittoIcons.KeyB, allowVibration) { addDigit(Token.Letter._B) }
             KeyboardButtonFilled(bModifier, UnittoIcons.KeyC, allowVibration) { addDigit(Token.Letter._C) }
         }
-        Row(cModifier, horizontalArrangement) {
+        Row(cModifier) {
             KeyboardButtonFilled(bModifier, UnittoIcons.KeyD, allowVibration) { addDigit(Token.Letter._D) }
             KeyboardButtonFilled(bModifier, UnittoIcons.KeyE, allowVibration) { addDigit(Token.Letter._E) }
             KeyboardButtonFilled(bModifier, UnittoIcons.KeyF, allowVibration) { addDigit(Token.Letter._F) }
         }
-        Row(cModifier, horizontalArrangement) {
+        Row(cModifier) {
             KeyboardButtonLight(bModifier, UnittoIcons.Key7, allowVibration) { addDigit(Token.Digit._7) }
             KeyboardButtonLight(bModifier, UnittoIcons.Key8, allowVibration) { addDigit(Token.Digit._8) }
             KeyboardButtonLight(bModifier, UnittoIcons.Key9, allowVibration) { addDigit(Token.Digit._9) }
         }
-        Row(cModifier, horizontalArrangement) {
+        Row(cModifier) {
             KeyboardButtonLight(bModifier, UnittoIcons.Key4, allowVibration) { addDigit(Token.Digit._4) }
             KeyboardButtonLight(bModifier, UnittoIcons.Key5, allowVibration) { addDigit(Token.Digit._5) }
             KeyboardButtonLight(bModifier, UnittoIcons.Key6, allowVibration) { addDigit(Token.Digit._6) }
         }
-        Row(cModifier, horizontalArrangement) {
+        Row(cModifier) {
             KeyboardButtonLight(bModifier, UnittoIcons.Key1, allowVibration) { addDigit(Token.Digit._1) }
             KeyboardButtonLight(bModifier, UnittoIcons.Key2, allowVibration) { addDigit(Token.Digit._2) }
             KeyboardButtonLight(bModifier, UnittoIcons.Key3, allowVibration) { addDigit(Token.Digit._3) }
         }
-        Row(cModifier, horizontalArrangement) {
+        Row(cModifier) {
             KeyboardButtonLight(bModifier, UnittoIcons.Key0, allowVibration) { addDigit(Token.Digit._0) }
             KeyboardButtonLight(
-                Modifier.fillMaxSize().weight(2f).padding(it.maxWidth * 0.015f, it.maxHeight * 0.008f), UnittoIcons.Backspace, allowVibration, clearInput) { deleteDigit() }
+                Modifier
+                    .fillMaxSize()
+                    .weight(2f)
+                    .padding(mainButtonHorizontalPadding), UnittoIcons.Backspace, allowVibration, onLongClick = clearInput) { deleteDigit() }
         }
     }
 }
+
+@Preview
+@Composable
+private fun PreviewConverterKeyboard() {
+    DefaultKeyboard(
+        modifier = Modifier,
+        addDigit = {},
+        clearInput = {},
+        deleteDigit = {},
+        allowVibration = false,
+        fractional = FormatterSymbols.Spaces.fractional,
+        middleZero = false
+    )
+}
+
+@Preview
+@Composable
+private fun PreviewConverterKeyboardNumberBase() {
+    NumberBaseKeyboard(
+        modifier = Modifier,
+        addDigit = {},
+        clearInput = {},
+        deleteDigit = {},
+        allowVibration = false,
+    )
+}
diff --git a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/FavoritesButton.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/FavoritesButton.kt
similarity index 95%
rename from feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/FavoritesButton.kt
rename to feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/FavoritesButton.kt
index 51b7fbc7..fdf78d25 100644
--- a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/FavoritesButton.kt
+++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/FavoritesButton.kt
@@ -1,6 +1,6 @@
 /*
  * Unitto is a unit converter for Android
- * Copyright (c) 2022-2023 Elshan Agaev
+ * Copyright (c) 2023 Elshan Agaev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.feature.unitslist.components
+package com.sadellie.unitto.feature.converter.components
 
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.SizeTransform
diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/MyTextField.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/MyTextField.kt
deleted file mode 100644
index e69de29b..00000000
diff --git a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/SearchPlaceholder.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/SearchPlaceholder.kt
similarity index 91%
rename from feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/SearchPlaceholder.kt
rename to feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/SearchPlaceholder.kt
index c0c72c38..006bfab4 100644
--- a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/SearchPlaceholder.kt
+++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/SearchPlaceholder.kt
@@ -1,6 +1,6 @@
 /*
  * Unitto is a unit converter for Android
- * Copyright (c) 2022-2023 Elshan Agaev
+ * Copyright (c) 2023 Elshan Agaev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.feature.unitslist.components
+package com.sadellie.unitto.feature.converter.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -37,11 +37,6 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.core.base.R
 
-/**
- * Placeholder that can be seen when there are no units found
- *
- * @param navigateToSettingsAction Action to perform when clicking open settings button.
- */
 @Composable
 internal fun SearchPlaceholder(navigateToSettingsAction: () -> Unit) {
     Column(
diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/TopScreen.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/TopScreen.kt
deleted file mode 100644
index 0c5abe2b..00000000
--- a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/TopScreen.kt
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * Unitto is a unit converter for Android
- * Copyright (c) 2022-2023 Elshan Agaev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.sadellie.unitto.feature.converter.components
-
-import androidx.compose.animation.AnimatedContent
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.Crossfade
-import androidx.compose.animation.SizeTransform
-import androidx.compose.animation.core.FastOutSlowInEasing
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.expandHorizontally
-import androidx.compose.animation.expandVertically
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.shrinkVertically
-import androidx.compose.animation.togetherWith
-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.material.icons.Icons
-import androidx.compose.material.icons.outlined.SwapHoriz
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-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.draw.rotate
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.TextRange
-import androidx.compose.ui.text.input.TextFieldValue
-import androidx.compose.ui.text.style.TextAlign
-import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.core.base.Token
-import com.sadellie.unitto.core.ui.common.ColumnWithConstraints
-import com.sadellie.unitto.core.ui.common.textfield.ExpressionTextField
-import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols
-import com.sadellie.unitto.core.ui.common.textfield.UnformattedTextField
-import com.sadellie.unitto.core.ui.common.textfield.formatExpression
-import com.sadellie.unitto.core.ui.common.textfield.formatTime
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.feature.converter.ConversionResult
-import com.sadellie.unitto.feature.converter.ConverterMode
-
-/**
- * Top of the main screen. Contains input and output TextFields, and unit selection row of buttons.
- * It's a separate composable, so that we support album orientation (this element will be on the left)
- *
- * @param modifier Modifier that is applied to Column.
- * @param inputValue Current input value (like big decimal).
- * @param calculatedValue Current calculated value (like big decimal), will be shown under input when it
- * has an expression in it.
- * @param outputValue Current output value (like big decimal).
- * @param unitFrom [AbstractUnit] on the left.
- * @param unitTo [AbstractUnit] on the right.
- * @param navigateToLeftScreen Function that is called when clicking left unit selection button.
- * @param navigateToRightScreen Function that is called when clicking right unit selection button.
- * @param swapUnits Method to swap units.
- * @param converterMode [ConverterMode.BASE] doesn't use formatting for input/output.
- */
-@Composable
-internal fun TopScreenPart(
-    modifier: Modifier,
-    inputValue: TextFieldValue,
-    calculatedValue: String?,
-    outputValue: ConversionResult,
-    unitFrom: AbstractUnit?,
-    unitTo: AbstractUnit?,
-    navigateToLeftScreen: (String) -> Unit,
-    navigateToRightScreen: (unitFrom: String, unitTo: String, input: String?) -> Unit,
-    swapUnits: () -> Unit,
-    converterMode: ConverterMode,
-    onCursorChange: (TextRange) -> Unit,
-    cutCallback: () -> Unit,
-    pasteCallback: (String) -> Unit,
-    formatterSymbols: FormatterSymbols,
-    onErrorClick: () -> Unit,
-) {
-    var swapped by remember { mutableStateOf(false) }
-    val swapButtonRotation: Float by animateFloatAsState(
-        targetValue = if (swapped) 0f else 180f,
-        animationSpec = tween(easing = FastOutSlowInEasing),
-        label = "Swap button rotation"
-    )
-    val mContext = LocalContext.current
-
-    ColumnWithConstraints(
-        modifier = modifier,
-    ) {
-        Crossfade(modifier = Modifier.weight(2f), targetState = converterMode) { mode ->
-            if (mode == ConverterMode.BASE) {
-                UnformattedTextField(
-                    modifier = Modifier,
-                    value = inputValue,
-                    onCursorChange = onCursorChange,
-                    minRatio = 0.7f,
-                    cutCallback = cutCallback,
-                    pasteCallback = pasteCallback,
-                    placeholder = Token.Digit._0
-                )
-            } else {
-                ExpressionTextField(
-                    modifier = Modifier,
-                    value = inputValue,
-                    onCursorChange = onCursorChange,
-                    formatterSymbols = formatterSymbols,
-                    minRatio = 0.7f,
-                    cutCallback = cutCallback,
-                    pasteCallback = pasteCallback,
-                    placeholder = Token.Digit._0
-                )
-            }
-        }
-        AnimatedVisibility(
-            visible = !calculatedValue.isNullOrEmpty(),
-            modifier = Modifier.weight(1f),
-            enter = expandVertically(clip = false),
-            exit = shrinkVertically(clip = false)
-        ) {
-            var calculatedTextFieldValue by remember(calculatedValue) {
-                mutableStateOf(
-                    TextFieldValue(calculatedValue?.formatExpression(formatterSymbols) ?: "")
-                )
-            }
-            ExpressionTextField(
-                modifier = Modifier,
-                value = calculatedTextFieldValue,
-                onCursorChange = { newSelection ->
-                    calculatedTextFieldValue =
-                        calculatedTextFieldValue.copy(selection = newSelection)
-                },
-                formatterSymbols = formatterSymbols,
-                textColor = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.6f),
-                minRatio = 0.7f
-            )
-        }
-        AnimatedContent(
-            modifier = Modifier.fillMaxWidth(),
-            targetState = stringResource(unitFrom?.shortName ?: R.string.loading_label),
-            transitionSpec = {
-                // Enter animation
-                (expandHorizontally(clip = false, expandFrom = Alignment.Start) + fadeIn()
-                        togetherWith fadeOut())
-                    .using(SizeTransform(clip = false))
-            },
-            label = "Animated short name from"
-        ) { value ->
-            Text(
-                text = value,
-                style = MaterialTheme.typography.bodyMedium.copy(textAlign = TextAlign.End)
-            )
-        }
-
-        when (outputValue) {
-            is ConversionResult.Default -> {
-                var outputTextFieldValue: TextFieldValue by remember(outputValue) {
-                    mutableStateOf(TextFieldValue(outputValue.result))
-                }
-                ExpressionTextField(
-                    modifier = Modifier.weight(2f),
-                    value = outputTextFieldValue,
-                    onCursorChange = { newSelection ->
-                        outputTextFieldValue = outputTextFieldValue.copy(selection = newSelection)
-                    },
-                    formatterSymbols = formatterSymbols,
-                    readOnly = true,
-                    minRatio = 0.7f
-                )
-            }
-
-            is ConversionResult.Time -> {
-                var outputTextFieldValue: TextFieldValue by remember(outputValue) {
-                    mutableStateOf(
-                        TextFieldValue(
-                            outputValue.result
-                                .formatTime(mContext, unitTo?.basicUnit, formatterSymbols)
-                        )
-                    )
-                }
-                UnformattedTextField(
-                    modifier = Modifier.weight(2f),
-                    value = outputTextFieldValue,
-                    onCursorChange = { newSelection ->
-                        outputTextFieldValue = outputTextFieldValue.copy(selection = newSelection)
-                    },
-                    minRatio = 0.7f,
-                    readOnly = true
-                )
-            }
-
-            is ConversionResult.NumberBase -> {
-                var outputTextFieldValue: TextFieldValue by remember(outputValue) {
-                    mutableStateOf(TextFieldValue(outputValue.result.uppercase()))
-                }
-                UnformattedTextField(
-                    modifier = Modifier.weight(2f),
-                    value = outputTextFieldValue,
-                    onCursorChange = { newSelection ->
-                        outputTextFieldValue = outputTextFieldValue.copy(selection = newSelection)
-                    },
-                    minRatio = 0.7f,
-                    readOnly = true
-                )
-            }
-
-            is ConversionResult.Loading -> {
-                UnformattedTextField(
-                    modifier = Modifier.weight(2f),
-                    value = TextFieldValue(stringResource(R.string.loading_label)),
-                    onCursorChange = {},
-                    minRatio = 0.7f,
-                    readOnly = true
-                )
-            }
-
-            is ConversionResult.Error -> {
-                UnformattedTextField(
-                    modifier = Modifier.weight(2f),
-                    value = TextFieldValue(stringResource(R.string.error_label)),
-                    onCursorChange = { onErrorClick() },
-                    minRatio = 0.7f,
-                    readOnly = true,
-                    textColor = MaterialTheme.colorScheme.error
-                )
-            }
-        }
-
-        val supportLabelTo = when {
-            outputValue is ConversionResult.Error -> R.string.try_again_label
-            (unitTo?.shortName != null) -> unitTo.shortName
-            else -> R.string.loading_label
-        }
-
-        AnimatedContent(
-            modifier = Modifier.fillMaxWidth(),
-            targetState = stringResource(supportLabelTo),
-            transitionSpec = {
-                // Enter animation
-                (expandHorizontally(clip = false, expandFrom = Alignment.Start) + fadeIn()
-                        // Exit animation
-                        togetherWith fadeOut())
-                    .using(SizeTransform(clip = false))
-            },
-            label = "Animated short label to"
-        ) { value ->
-            Text(
-                text = value,
-                style = MaterialTheme.typography.bodyMedium.copy(textAlign = TextAlign.End)
-            )
-        }
-
-        Spacer(modifier = Modifier.height(it.maxHeight * 0.03f))
-
-        Row(verticalAlignment = Alignment.CenterVertically) {
-            UnitSelectionButton(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .weight(1f),
-                onClick = { unitFrom?.let { unit -> navigateToLeftScreen(unit.unitId) } },
-                label = unitFrom?.displayName ?: R.string.loading_label,
-            )
-            IconButton(
-                onClick = {
-                    swapUnits()
-                    swapped = !swapped
-                },
-                enabled = unitFrom != null
-            ) {
-                Icon(
-                    modifier = Modifier.rotate(swapButtonRotation),
-                    imageVector = Icons.Outlined.SwapHoriz,
-                    contentDescription = stringResource(R.string.swap_units_description)
-                )
-            }
-            UnitSelectionButton(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .weight(1f),
-                onClick = {
-                    if (unitTo == null) return@UnitSelectionButton
-                    if (unitFrom == null) return@UnitSelectionButton
-
-                    val input = when (outputValue) {
-                        is ConversionResult.Error, ConversionResult.Loading -> null
-                        else -> calculatedValue ?: inputValue.text
-                    }
-
-                    navigateToRightScreen(
-                        unitFrom.unitId,
-                        unitTo.unitId,
-                        input?.ifEmpty { "0" }
-                    )
-                },
-                label = unitTo?.displayName ?: R.string.loading_label,
-            )
-        }
-    }
-}
diff --git a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/UnitGroupHeader.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/UnitGroupHeader.kt
similarity index 95%
rename from feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/UnitGroupHeader.kt
rename to feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/UnitGroupHeader.kt
index cc3d3e3d..97a3dcfe 100644
--- a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/UnitGroupHeader.kt
+++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/UnitGroupHeader.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.feature.unitslist.components
+package com.sadellie.unitto.feature.converter.components
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.runtime.Composable
diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/UnitSelectionButton.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/UnitSelectionButton.kt
index 40097f47..8d9a31eb 100644
--- a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/UnitSelectionButton.kt
+++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/UnitSelectionButton.kt
@@ -32,10 +32,8 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.core.ui.common.UnittoButton
 
 /**
@@ -50,17 +48,18 @@ import com.sadellie.unitto.core.ui.common.UnittoButton
 internal fun UnitSelectionButton(
     modifier: Modifier = Modifier,
     onClick: () -> Unit = {},
-    label: Int?,
+    label: String,
+    enabled: Boolean = true
 ) {
     UnittoButton(
         modifier = modifier,
         onClick = onClick,
-        enabled = label != null,
+        enabled = enabled,
         containerColor = MaterialTheme.colorScheme.primaryContainer,
         contentPadding = PaddingValues(vertical = 16.dp, horizontal = 8.dp),
     ) {
         AnimatedContent(
-            targetState = label ?: 0,
+            targetState = label,
             transitionSpec = {
                 if (targetState > initialState) {
                     (slideInVertically { height -> height } + fadeIn()) togetherWith
@@ -71,13 +70,14 @@ internal fun UnitSelectionButton(
                 }.using(
                     SizeTransform(clip = false)
                 )
-            }
+            },
+            label = "Unit change"
         ) {
             Text(
-                text = stringResource(label ?: R.string.loading_label),
+                text = it,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis,
-                color = MaterialTheme.colorScheme.onSecondaryContainer
+                color = MaterialTheme.colorScheme.onPrimaryContainer
             )
         }
     }
diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/navigation/ConverterNavigation.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/navigation/ConverterNavigation.kt
index 0dbdb170..9a6904b1 100644
--- a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/navigation/ConverterNavigation.kt
+++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/navigation/ConverterNavigation.kt
@@ -18,38 +18,78 @@
 
 package com.sadellie.unitto.feature.converter.navigation
 
+import androidx.compose.runtime.remember
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavGraphBuilder
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.navigation
+import androidx.navigation.NavHostController
 import androidx.navigation.navDeepLink
 import com.sadellie.unitto.core.base.TopLevelDestinations
+import com.sadellie.unitto.core.ui.unittoComposable
+import com.sadellie.unitto.core.ui.unittoNavigation
 import com.sadellie.unitto.feature.converter.ConverterRoute
 import com.sadellie.unitto.feature.converter.ConverterViewModel
+import com.sadellie.unitto.feature.converter.LeftSideRoute
+import com.sadellie.unitto.feature.converter.RightSideRoute
 
 private val graph = TopLevelDestinations.Converter.graph
 private val start = TopLevelDestinations.Converter.start
+private const val LEFT = "left"
+private const val RIGHT = "right"
 
 fun NavGraphBuilder.converterGraph(
-    navigateToLeftScreen: (String) -> Unit,
-    navigateToRightScreen: (unitFrom: String, unitTo: String, input: String?) -> Unit,
+    openDrawer: () -> Unit,
+    navController: NavHostController,
     navigateToSettings: () -> Unit,
-    navigateToMenu: () -> Unit,
-    viewModel: ConverterViewModel
+    navigateToUnitGroups: () -> Unit,
 ) {
-    navigation(
+    unittoNavigation(
         startDestination = start,
         route = graph,
         deepLinks = listOf(
             navDeepLink { uriPattern = "app://com.sadellie.unitto/$graph" }
         )
     ) {
-        composable(start) {
+        unittoComposable(start) { backStackEntry ->
+            val parentEntry = remember(backStackEntry) {
+                navController.getBackStackEntry(graph)
+            }
+
+            val parentViewModel = hiltViewModel<ConverterViewModel>(parentEntry)
+
             ConverterRoute(
-                viewModel = viewModel,
-                navigateToLeftScreen = navigateToLeftScreen,
-                navigateToRightScreen = navigateToRightScreen,
+                viewModel = parentViewModel,
+                navigateToLeftScreen = { navController.navigate(LEFT) },
+                navigateToRightScreen = { navController.navigate(RIGHT) },
                 navigateToSettings = navigateToSettings,
-                navigateToMenu = navigateToMenu
+                navigateToMenu = openDrawer
+            )
+        }
+
+        unittoComposable(LEFT) { backStackEntry ->
+            val parentEntry = remember(backStackEntry) {
+                navController.getBackStackEntry(graph)
+            }
+
+            val parentViewModel = hiltViewModel<ConverterViewModel>(parentEntry)
+
+            LeftSideRoute(
+                viewModel = parentViewModel,
+                navigateUp = navController::navigateUp,
+                navigateToUnitGroups = navigateToUnitGroups
+            )
+        }
+
+        unittoComposable(RIGHT) { backStackEntry ->
+            val parentEntry = remember(backStackEntry) {
+                navController.getBackStackEntry(graph)
+            }
+
+            val parentViewModel = hiltViewModel<ConverterViewModel>(parentEntry)
+
+            RightSideRoute(
+                viewModel = parentViewModel,
+                navigateUp = navController::navigateUp,
+                navigateToUnitGroups = navigateToUnitGroups
             )
         }
     }
diff --git a/feature/converter/src/test/java/com/sadellie/unitto/feature/converter/ConverterUIStateKtTest.kt b/feature/converter/src/test/java/com/sadellie/unitto/feature/converter/ConverterUIStateKtTest.kt
new file mode 100644
index 00000000..79fcee6a
--- /dev/null
+++ b/feature/converter/src/test/java/com/sadellie/unitto/feature/converter/ConverterUIStateKtTest.kt
@@ -0,0 +1,133 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.feature.converter
+
+import android.content.Context
+import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import java.math.BigDecimal
+
+@RunWith(RobolectricTestRunner::class)
+class ConverterUIStateKtTest {
+
+    @Test
+    fun format() {
+        val formatterSymbols = FormatterSymbols.Spaces
+        var basicValue = BigDecimal.valueOf(1)
+        val mContext: Context = RuntimeEnvironment.getApplication().applicationContext
+
+        fun String.formatTime() = formatTime(basicValue.multiply(BigDecimal(this)))
+            .format(mContext, formatterSymbols)
+
+        // Edgy things (minus, decimals and zeros)
+        Assert.assertEquals("−28as", "-28".formatTime())
+        Assert.assertEquals("−0.05as", "-0.05".formatTime())
+        Assert.assertEquals("0", "0".formatTime())
+
+        basicValue = BigDecimal.valueOf(86_400_000_000_000_000_000_000.0)
+        Assert.assertEquals("−28d", "-28".formatTime())
+        Assert.assertEquals("−1h 12m", "-0.05".formatTime())
+        Assert.assertEquals("0", "0".formatTime())
+        Assert.assertEquals("0", "-0".formatTime())
+
+        // DAYS
+        basicValue = BigDecimal.valueOf(86_400_000_000_000_000_000_000.0)
+        Assert.assertEquals("12h", "0.5".formatTime())
+        Assert.assertEquals("1h 12m", "0.05".formatTime())
+        Assert.assertEquals("7m 12s", "0.005".formatTime())
+        Assert.assertEquals("28d", "28".formatTime())
+        Assert.assertEquals("90d", "90".formatTime())
+        Assert.assertEquals("90d 12h", "90.5".formatTime())
+        Assert.assertEquals("90d 7m 12s", "90.005".formatTime())
+
+        // HOURS
+        basicValue = BigDecimal.valueOf(3_600_000_000_000_000_000_000.0)
+        Assert.assertEquals("30m", "0.5".formatTime())
+        Assert.assertEquals("3m", "0.05".formatTime())
+        Assert.assertEquals("18s", "0.005".formatTime())
+        Assert.assertEquals("1d 4h", "28".formatTime())
+        Assert.assertEquals("3d 18h", "90".formatTime())
+        Assert.assertEquals("3d 18h 30m", "90.5".formatTime())
+        Assert.assertEquals("3d 18h 18s", "90.005".formatTime())
+
+        // MINUTES
+        basicValue = BigDecimal.valueOf(60_000_000_000_000_000_000.0)
+        Assert.assertEquals("30s", "0.5".formatTime())
+        Assert.assertEquals("3s", "0.05".formatTime())
+        Assert.assertEquals("300ms", "0.005".formatTime())
+        Assert.assertEquals("28m", "28".formatTime())
+        Assert.assertEquals("1h 30m", "90".formatTime())
+        Assert.assertEquals("1h 30m 30s", "90.5".formatTime())
+        Assert.assertEquals("1h 30m 300ms", "90.005".formatTime())
+
+        // SECONDS
+        basicValue = BigDecimal.valueOf(1_000_000_000_000_000_000)
+        Assert.assertEquals("500ms", "0.5".formatTime())
+        Assert.assertEquals("50ms", "0.05".formatTime())
+        Assert.assertEquals("5ms", "0.005".formatTime())
+        Assert.assertEquals("28s", "28".formatTime())
+        Assert.assertEquals("1m 30s", "90".formatTime())
+        Assert.assertEquals("1m 30s 500ms", "90.5".formatTime())
+        Assert.assertEquals("1m 30s 5ms", "90.005".formatTime())
+
+        // MILLISECONDS
+        basicValue = BigDecimal.valueOf(1_000_000_000_000_000)
+        Assert.assertEquals("500µs", "0.5".formatTime())
+        Assert.assertEquals("50µs", "0.05".formatTime())
+        Assert.assertEquals("5µs", "0.005".formatTime())
+        Assert.assertEquals("28ms", "28".formatTime())
+        Assert.assertEquals("90ms", "90".formatTime())
+        Assert.assertEquals("90ms 500µs", "90.5".formatTime())
+        Assert.assertEquals("90ms 5µs", "90.005".formatTime())
+
+        // MICROSECONDS
+        basicValue = BigDecimal.valueOf(1_000_000_000_000)
+        Assert.assertEquals("500ns", "0.5".formatTime())
+        Assert.assertEquals("50ns", "0.05".formatTime())
+        Assert.assertEquals("5ns", "0.005".formatTime())
+        Assert.assertEquals("28µs", "28".formatTime())
+        Assert.assertEquals("90µs", "90".formatTime())
+        Assert.assertEquals("90µs 500ns", "90.5".formatTime())
+        Assert.assertEquals("90µs 5ns", "90.005".formatTime())
+
+        // NANOSECONDS
+        basicValue = BigDecimal.valueOf(1_000_000_000)
+        Assert.assertEquals("500 000 000as", "0.5".formatTime())
+        Assert.assertEquals("50 000 000as", "0.05".formatTime())
+        Assert.assertEquals("5 000 000as", "0.005".formatTime())
+        Assert.assertEquals("28ns", "28".formatTime())
+        Assert.assertEquals("90ns", "90".formatTime())
+        Assert.assertEquals("90ns 500 000 000as", "90.5".formatTime())
+        Assert.assertEquals("90ns 5 000 000as", "90.005".formatTime())
+
+        // ATTOSECONDS
+        basicValue = BigDecimal.valueOf(1)
+        Assert.assertEquals("0.5as", "0.5".formatTime())
+        Assert.assertEquals("0.05as", "0.05".formatTime())
+        Assert.assertEquals("0.005as", "0.005".formatTime())
+        Assert.assertEquals("28as", "28".formatTime())
+        Assert.assertEquals("90as", "90".formatTime())
+        Assert.assertEquals("90.5as", "90.5".formatTime())
+        Assert.assertEquals("90.005as", "90.005".formatTime())
+    }
+}
diff --git a/feature/datecalculator/build.gradle.kts b/feature/datecalculator/build.gradle.kts
index 48377011..3a53ce37 100644
--- a/feature/datecalculator/build.gradle.kts
+++ b/feature/datecalculator/build.gradle.kts
@@ -28,7 +28,7 @@ android {
 }
 
 dependencies {
-    testImplementation(libs.junit)
+    testImplementation(libs.junit.junit)
 
-    implementation(project(mapOf("path" to ":data:userprefs")))
+    implementation(project(":data:userprefs"))
 }
diff --git a/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/DateCalculatorScreen.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/DateCalculatorScreen.kt
index d9337f73..8f27280c 100644
--- a/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/DateCalculatorScreen.kt
+++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/DateCalculatorScreen.kt
@@ -26,8 +26,11 @@ import androidx.compose.material3.Tab
 import androidx.compose.material3.TabRow
 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.rememberCoroutineScope
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalFocusManager
@@ -60,6 +63,8 @@ internal fun DateCalculatorScreen(
     val addSubtractLabel = "${stringResource(R.string.add)}/${stringResource(R.string.subtract)}"
     val differenceLabel = stringResource(R.string.difference)
     val focusManager = LocalFocusManager.current
+    var topBarShown by remember { mutableStateOf(true) }
+    var showKeyboard by remember { mutableStateOf(false) }
 
     val allTabs = remember { mutableListOf(addSubtractLabel, differenceLabel) }
     val pagerState = rememberPagerState { allTabs.size }
@@ -69,9 +74,8 @@ internal fun DateCalculatorScreen(
         modifier = Modifier,
         title = { Text(stringResource(R.string.date_calculator)) },
         navigationIcon = { MenuButton(navigateToMenu) },
-        actions = {
-            SettingsButton(navigateToSettings)
-        },
+        actions = { SettingsButton(navigateToSettings) },
+        showTopBar = topBarShown,
     ) { paddingValues ->
         Column(
             modifier = Modifier.padding(paddingValues),
@@ -97,9 +101,17 @@ internal fun DateCalculatorScreen(
                 verticalAlignment = Alignment.Top
             ) { page ->
                 when (page) {
-                    0 -> AddSubtractPage()
-                    1 -> DateDifferencePage().also {
+                    0 -> AddSubtractPage(
+                        toggleTopBar = { topBarShown = it },
+                        showKeyboard = showKeyboard,
+                        toggleKeyboard = {showKeyboard = it }
+                    )
+                    1 -> {
                         focusManager.clearFocus(true)
+                        topBarShown = true
+                        showKeyboard = false
+
+                        DateDifferencePage()
                     }
                 }
             }
diff --git a/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractPage.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractPage.kt
index e7e2279d..0c59ea84 100644
--- a/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractPage.kt
+++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractPage.kt
@@ -23,39 +23,57 @@ import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.provider.CalendarContract
-import android.widget.Toast
+import androidx.activity.compose.BackHandler
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
-import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Event
 import androidx.compose.material.icons.outlined.Add
 import androidx.compose.material.icons.outlined.Remove
 import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SegmentedButton
 import androidx.compose.material3.SegmentedButtonDefaults
 import androidx.compose.material3.SingleChoiceSegmentedButtonRow
 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.Modifier
+import androidx.compose.ui.focus.onFocusEvent
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.sadellie.unitto.core.base.R
+import com.sadellie.unitto.core.ui.common.textfield.addTokens
+import com.sadellie.unitto.core.ui.common.textfield.deleteTokens
+import com.sadellie.unitto.core.ui.isPortrait
+import com.sadellie.unitto.core.ui.showToast
+import com.sadellie.unitto.feature.datecalculator.components.AddSubtractKeyboard
 import com.sadellie.unitto.feature.datecalculator.components.DateTimeDialogs
 import com.sadellie.unitto.feature.datecalculator.components.DateTimeSelectorBlock
 import com.sadellie.unitto.feature.datecalculator.components.DialogState
@@ -65,18 +83,24 @@ import java.time.ZonedDateTime
 @Composable
 internal fun AddSubtractPage(
     viewModel: AddSubtractViewModel = hiltViewModel(),
+    toggleTopBar: (Boolean) -> Unit,
+    showKeyboard: Boolean,
+    toggleKeyboard: (Boolean) -> Unit,
 ) {
     val uiState = viewModel.uiState.collectAsStateWithLifecycle().value
 
     AddSubtractView(
         uiState = uiState,
+        toggleTopBar = toggleTopBar,
+        showKeyboard = showKeyboard,
+        toggleKeyboard = toggleKeyboard,
         updateStart = viewModel::updateStart,
         updateYears = viewModel::updateYears,
         updateMonths = viewModel::updateMonths,
         updateDays = viewModel::updateDays,
         updateHours = viewModel::updateHours,
         updateMinutes = viewModel::updateMinutes,
-        updateAddition = viewModel::updateAddition
+        updateAddition = viewModel::updateAddition,
     )
 }
 
@@ -85,35 +109,66 @@ internal fun AddSubtractPage(
 @Composable
 private fun AddSubtractView(
     uiState: AddSubtractState,
+    toggleTopBar: (Boolean) -> Unit,
+    showKeyboard: Boolean,
+    toggleKeyboard: (Boolean) -> Unit,
     updateStart: (ZonedDateTime) -> Unit,
-    updateYears: (String) -> Unit,
-    updateMonths: (String) -> Unit,
-    updateDays: (String) -> Unit,
-    updateHours: (String) -> Unit,
-    updateMinutes: (String) -> Unit,
+    updateYears: (TextFieldValue) -> Unit,
+    updateMonths: (TextFieldValue) -> Unit,
+    updateDays: (TextFieldValue) -> Unit,
+    updateHours: (TextFieldValue) -> Unit,
+    updateMinutes: (TextFieldValue) -> Unit,
     updateAddition: (Boolean) -> Unit,
 ) {
-    var dialogState by remember { mutableStateOf(DialogState.NONE) }
     val mContext = LocalContext.current
+    val focusManager = LocalFocusManager.current
+    val landscape = !isPortrait()
 
-    Scaffold(
-        floatingActionButton = {
-            FloatingActionButton(onClick = { mContext.addEvent(uiState.start, uiState.result) }) {
-                Icon(
-                    imageVector = Icons.Default.Event,
-                    contentDescription = null,
-                )
-            }
-        }
-    ) {
-        LazyColumn(
-            modifier = Modifier.padding(start = 16.dp, end = 16.dp, top = 16.dp),
-            verticalArrangement = Arrangement.spacedBy(16.dp),
-            contentPadding = PaddingValues(bottom = 88.dp)
+    var dialogState by remember { mutableStateOf(DialogState.NONE) }
+    var addSymbol: ((TextFieldValue) -> Unit)? by remember { mutableStateOf(null) }
+    var focusedTextFieldValue: TextFieldValue? by remember { mutableStateOf(null) }
+
+    LaunchedEffect(showKeyboard, landscape) {
+        toggleTopBar(!(showKeyboard and landscape))
+    }
+
+    LaunchedEffect(addSymbol, focusedTextFieldValue) {
+        toggleKeyboard((addSymbol != null) and (focusedTextFieldValue != null))
+    }
+
+    BackHandler(showKeyboard) {
+        focusManager.clearFocus()
+        addSymbol = null
+        focusedTextFieldValue = null
+    }
+
+    Column(Modifier.fillMaxSize()) {
+        Scaffold(
+            modifier = Modifier
+                .fillMaxHeight()
+                .weight(1f),
+            floatingActionButton = {
+                FloatingActionButton(
+                    onClick = {
+                        mContext.addEvent(uiState.start, uiState.result)
+                    }
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.Event,
+                        contentDescription = null,
+                    )
+                }
+            },
+            contentWindowInsets = WindowInsets(0,0,0,0)
         ) {
-            item("dates") {
+            Column(
+                modifier = Modifier
+                    .verticalScroll(rememberScrollState())
+                    .padding(horizontal = 16.dp),
+                verticalArrangement = Arrangement.spacedBy(2.dp),
+            ) {
                 FlowRow(
-                    modifier = Modifier,
+                    modifier = Modifier.padding(vertical = 16.dp),
                     maxItemsInEachRow = 2,
                     verticalArrangement = Arrangement.spacedBy(16.dp),
                     horizontalArrangement = Arrangement.spacedBy(16.dp)
@@ -138,9 +193,7 @@ private fun AddSubtractView(
                         dateTime = uiState.result,
                     )
                 }
-            }
 
-            item("modes") {
                 SingleChoiceSegmentedButtonRow(
                     modifier = Modifier
                         .fillMaxWidth(),
@@ -148,58 +201,120 @@ private fun AddSubtractView(
                     SegmentedButton(
                         selected = uiState.addition,
                         onClick = { updateAddition(true) },
-                        shape = SegmentedButtonDefaults.shape(position = 0, count = 2),
+                        shape = SegmentedButtonDefaults.itemShape(index = 0, count = 2),
                         icon = {}
                     ) {
-                        Icon(Icons.Outlined.Add, null)
+                        Icon(Icons.Outlined.Add, stringResource(R.string.add))
                     }
                     SegmentedButton(
                         selected = !uiState.addition,
                         onClick = { updateAddition(false) },
-                        shape = SegmentedButtonDefaults.shape(position = 1, count = 2),
+                        shape = SegmentedButtonDefaults.itemShape(index = 1, count = 2),
                         icon = {}
                     ) {
-                        Icon(Icons.Outlined.Remove, null)
+                        Icon(Icons.Outlined.Remove, stringResource(R.string.subtract))
                     }
                 }
-            }
 
-            item("textFields") {
-                Column {
-                    TimeUnitTextField(
-                        value = uiState.years,
-                        onValueChange = updateYears,
-                        label = stringResource(R.string.date_difference_years),
-                        formatterSymbols = uiState.formatterSymbols
-                    )
-                    TimeUnitTextField(
-                        value = uiState.months,
-                        onValueChange = updateMonths,
-                        label = stringResource(R.string.date_difference_months),
-                        formatterSymbols = uiState.formatterSymbols
-                    )
-                    TimeUnitTextField(
-                        value = uiState.days,
-                        onValueChange = updateDays,
-                        label = stringResource(R.string.date_difference_days),
-                        formatterSymbols = uiState.formatterSymbols
-                    )
-                    TimeUnitTextField(
-                        value = uiState.hours,
-                        onValueChange = updateHours,
-                        label = stringResource(R.string.date_difference_hours),
-                        formatterSymbols = uiState.formatterSymbols
-                    )
-                    TimeUnitTextField(
-                        value = uiState.minutes,
-                        onValueChange = updateMinutes,
-                        label = stringResource(R.string.date_difference_minutes),
-                        imeAction = ImeAction.Done,
-                        formatterSymbols = uiState.formatterSymbols
-                    )
-                }
+                TimeUnitTextField(
+                    modifier = Modifier.onFocusEvent {
+                        if (it.hasFocus) {
+                            addSymbol = updateYears
+                            focusedTextFieldValue = uiState.years
+                        }
+                    },
+                    value = uiState.years,
+                    onValueChange = updateYears,
+                    label = stringResource(R.string.date_difference_years),
+                    formatterSymbols = uiState.formatterSymbols
+                )
+
+                TimeUnitTextField(
+                    modifier = Modifier.onFocusEvent {
+                        if (it.hasFocus) {
+                            addSymbol = updateMonths
+                            focusedTextFieldValue = uiState.months
+                        }
+                    },
+                    value = uiState.months,
+                    onValueChange = updateMonths,
+                    label = stringResource(R.string.date_difference_months),
+                    formatterSymbols = uiState.formatterSymbols
+                )
+
+                TimeUnitTextField(
+                    modifier = Modifier.onFocusEvent {
+                        if (it.hasFocus) {
+                            addSymbol = updateDays
+                            focusedTextFieldValue = uiState.days
+                        }
+                    },
+                    value = uiState.days,
+                    onValueChange = updateDays,
+                    label = stringResource(R.string.date_difference_days),
+                    formatterSymbols = uiState.formatterSymbols
+                )
+
+                TimeUnitTextField(
+                    modifier = Modifier.onFocusEvent {
+                        if (it.hasFocus) {
+                            addSymbol = updateHours
+                            focusedTextFieldValue = uiState.hours
+                        }
+                    },
+                    value = uiState.hours,
+                    onValueChange = updateHours,
+                    label = stringResource(R.string.date_difference_hours),
+                    formatterSymbols = uiState.formatterSymbols
+                )
+
+                TimeUnitTextField(
+                    modifier = Modifier.onFocusEvent {
+                        if (it.hasFocus) {
+                            addSymbol = updateMinutes
+                            focusedTextFieldValue = uiState.minutes
+                        }
+                    },
+                    value = uiState.minutes,
+                    onValueChange = updateMinutes,
+                    label = stringResource(R.string.date_difference_minutes),
+                    formatterSymbols = uiState.formatterSymbols
+                )
             }
         }
+        AnimatedVisibility(
+            visible = showKeyboard,
+            enter = slideInVertically { it / 2 } + fadeIn(),
+            exit = slideOutVertically { it / 2 } + fadeOut()
+        ) {
+            HorizontalDivider()
+            AddSubtractKeyboard(
+                modifier = Modifier
+                    .weight(1f)
+                    .fillMaxWidth()
+                    .fillMaxHeight(if (isPortrait()) 0.4f else 0.6f)
+                    .padding(2.dp, 4.dp),
+                addSymbol = {
+                    val newValue = focusedTextFieldValue?.addTokens(it)
+                    if (newValue != null) {
+                        addSymbol?.invoke(newValue)
+                    }
+                },
+                deleteSymbol = {
+                    val newValue = focusedTextFieldValue?.deleteTokens()
+                    if (newValue != null) {
+                        addSymbol?.invoke(newValue)
+                    }
+                },
+                onConfirm = {
+                    focusManager.clearFocus()
+                    addSymbol = null
+                    focusedTextFieldValue = null
+                },
+                allowVibration = uiState.allowVibration,
+                imeAction = if (addSymbol == updateMinutes) ImeAction.Done else ImeAction.Next
+            )
+        }
     }
 
     DateTimeDialogs(
@@ -225,7 +340,7 @@ private fun Context.addEvent(start: ZonedDateTime, end: ZonedDateTime) {
     try {
         startActivity(intent)
     } catch (e: ActivityNotFoundException) {
-        Toast.makeText(this, R.string.error_label, Toast.LENGTH_SHORT).show()
+        showToast(this, this.getString(R.string.error_label))
     }
 }
 
@@ -234,14 +349,17 @@ private fun Context.addEvent(start: ZonedDateTime, end: ZonedDateTime) {
 fun AddSubtractViewPreview() {
     AddSubtractView(
         uiState = AddSubtractState(
-            years = "12"
+            years = TextFieldValue("12")
         ),
+        toggleTopBar = {},
+        showKeyboard = false,
+        toggleKeyboard = {},
         updateStart = {},
         updateYears = {},
         updateMonths = {},
         updateDays = {},
         updateHours = {},
         updateMinutes = {},
-        updateAddition = {}
+        updateAddition = {},
     )
 }
diff --git a/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractUIState.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractUIState.kt
index 6afe641c..740830b2 100644
--- a/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractUIState.kt
+++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractUIState.kt
@@ -18,17 +18,19 @@
 
 package com.sadellie.unitto.feature.datecalculator.addsubtract
 
+import androidx.compose.ui.text.input.TextFieldValue
 import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols
 import java.time.ZonedDateTime
 
 internal data class AddSubtractState(
     val start: ZonedDateTime = ZonedDateTime.now(),
     val result: ZonedDateTime = ZonedDateTime.now(),
-    val years: String = "",
-    val months: String = "",
-    val days: String = "",
-    val hours: String = "",
-    val minutes: String = "",
+    val years: TextFieldValue = TextFieldValue(),
+    val months: TextFieldValue = TextFieldValue(),
+    val days: TextFieldValue = TextFieldValue(),
+    val hours: TextFieldValue = TextFieldValue(),
+    val minutes: TextFieldValue = TextFieldValue(),
     val addition: Boolean = true,
     val formatterSymbols: FormatterSymbols = FormatterSymbols.Spaces,
+    val allowVibration: Boolean = false,
 )
diff --git a/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractViewModel.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractViewModel.kt
index 09395f49..2245f157 100644
--- a/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractViewModel.kt
+++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractViewModel.kt
@@ -18,6 +18,8 @@
 
 package com.sadellie.unitto.feature.datecalculator.addsubtract
 
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.input.TextFieldValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.sadellie.unitto.core.ui.common.textfield.AllFormatterSymbols
@@ -42,9 +44,10 @@ internal class AddSubtractViewModel @Inject constructor(
     private val _uiState = MutableStateFlow(AddSubtractState())
 
     val uiState: StateFlow<AddSubtractState> = _uiState
-        .combine(userPreferencesRepository.allPreferencesFlow) { uiState, userPrefs ->
+        .combine(userPreferencesRepository.addSubtractPrefs) { uiState, userPrefs ->
             return@combine uiState.copy(
-                formatterSymbols = AllFormatterSymbols.getById(userPrefs.separator)
+                formatterSymbols = AllFormatterSymbols.getById(userPrefs.separator),
+                allowVibration = userPrefs.enableVibrations,
             )
         }
         .onEach { updateResult() }
@@ -52,78 +55,57 @@ internal class AddSubtractViewModel @Inject constructor(
 
     fun updateStart(newValue: ZonedDateTime) = _uiState.update { it.copy(start = newValue) }
 
-    fun updateYears(newValue: String) = _uiState.update {
-        val years = when {
-            newValue.isEmpty() -> newValue
-            newValue.toLong() > 9_999L -> "9999"
-            else -> newValue
-        }
-
-        it.copy(years = years)
+    fun updateYears(value: TextFieldValue) = _uiState.update {
+        it.copy(years = checkWithMax(value, 9_999L))
     }
 
-    fun updateMonths(newValue: String) = _uiState.update {
-        val months = when {
-            newValue.isEmpty() -> newValue
-            newValue.toLong() > 9_999L -> "9999"
-            else -> newValue
-        }
-
-        it.copy(months = months)
+    fun updateMonths(value: TextFieldValue) = _uiState.update {
+        it.copy(months = checkWithMax(value, 9_999L))
     }
 
-    fun updateDays(newValue: String) = _uiState.update {
-        val days = when {
-            newValue.isEmpty() -> newValue
-            newValue.toLong() > 99_999L -> "99999"
-            else -> newValue
-        }
-
-        it.copy(days = days)
+    fun updateDays(value: TextFieldValue) = _uiState.update {
+        it.copy(days = checkWithMax(value, 99_999L))
     }
 
-    fun updateHours(newValue: String) = _uiState.update {
-        val hours = when {
-            newValue.isEmpty() -> newValue
-            newValue.toLong() > 9_999_999L -> "9999999"
-            else -> newValue
-        }
-
-        it.copy(hours = hours)
+    fun updateHours(value: TextFieldValue) = _uiState.update {
+        it.copy(hours = checkWithMax(value, 9_999_999L))
     }
 
-    fun updateMinutes(newValue: String) = _uiState.update {
-        val minutes = when {
-            newValue.isEmpty() -> newValue
-            newValue.toLong() > 99_999_999L -> "99999999"
-            else -> newValue
-        }
-
-        it.copy(minutes = minutes)
+    fun updateMinutes(value: TextFieldValue) = _uiState.update {
+        it.copy(minutes = checkWithMax(value, 99_999_999L))
     }
 
     // BCE is not handled properly because who gives a shit...
-    fun updateAddition(newValue: Boolean) = _uiState.update { it.copy(addition = newValue) }
+    fun updateAddition(newValue: Boolean) = _uiState.update {
+        it.copy(addition = newValue)
+    }
 
     private fun updateResult() = viewModelScope.launch(Dispatchers.Default) {
         // Gets canceled, works with latest _uiState only
         _uiState.update { ui ->
             val newResult = if (ui.addition) {
                 ui.start
-                    .plusYears(ui.years.ifEmpty { "0" }.toLong())
-                    .plusMonths(ui.months.ifEmpty { "0" }.toLong())
-                    .plusDays(ui.days.ifEmpty { "0" }.toLong())
-                    .plusHours(ui.hours.ifEmpty { "0" }.toLong())
-                    .plusMinutes(ui.minutes.ifEmpty { "0" }.toLong())
+                    .plusYears(ui.years.text.ifEmpty { "0" }.toLong())
+                    .plusMonths(ui.months.text.ifEmpty { "0" }.toLong())
+                    .plusDays(ui.days.text.ifEmpty { "0" }.toLong())
+                    .plusHours(ui.hours.text.ifEmpty { "0" }.toLong())
+                    .plusMinutes(ui.minutes.text.ifEmpty { "0" }.toLong())
             } else {
                 ui.start
-                    .minusYears(ui.years.ifEmpty { "0" }.toLong())
-                    .minusMonths(ui.months.ifEmpty { "0" }.toLong())
-                    .minusDays(ui.days.ifEmpty { "0" }.toLong())
-                    .minusHours(ui.hours.ifEmpty { "0" }.toLong())
-                    .minusMinutes(ui.minutes.ifEmpty { "0" }.toLong())
+                    .minusYears(ui.years.text.ifEmpty { "0" }.toLong())
+                    .minusMonths(ui.months.text.ifEmpty { "0" }.toLong())
+                    .minusDays(ui.days.text.ifEmpty { "0" }.toLong())
+                    .minusHours(ui.hours.text.ifEmpty { "0" }.toLong())
+                    .minusMinutes(ui.minutes.text.ifEmpty { "0" }.toLong())
             }
             ui.copy(result = newResult)
         }
     }
+
+    private fun checkWithMax(value: TextFieldValue, maxValue: Long): TextFieldValue {
+        if (value.text.isEmpty()) return value
+        if (value.text.toLong() <= maxValue) return value
+        val maxValueText = maxValue.toString()
+        return TextFieldValue(maxValueText, TextRange(maxValueText.length))
+    }
 }
diff --git a/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/Keyboard.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/Keyboard.kt
new file mode 100644
index 00000000..59d11355
--- /dev/null
+++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/Keyboard.kt
@@ -0,0 +1,145 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.feature.datecalculator.components
+
+import androidx.compose.animation.Crossfade
+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.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusDirection
+import androidx.compose.ui.focus.FocusManager
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.unit.dp
+import com.sadellie.unitto.core.base.Token
+import com.sadellie.unitto.core.ui.common.KeyboardButtonFilled
+import com.sadellie.unitto.core.ui.common.KeyboardButtonLight
+import com.sadellie.unitto.core.ui.common.key.UnittoIcons
+import com.sadellie.unitto.core.ui.common.key.unittoicons.Backspace
+import com.sadellie.unitto.core.ui.common.key.unittoicons.Check
+import com.sadellie.unitto.core.ui.common.key.unittoicons.Key0
+import com.sadellie.unitto.core.ui.common.key.unittoicons.Key1
+import com.sadellie.unitto.core.ui.common.key.unittoicons.Key2
+import com.sadellie.unitto.core.ui.common.key.unittoicons.Key3
+import com.sadellie.unitto.core.ui.common.key.unittoicons.Key4
+import com.sadellie.unitto.core.ui.common.key.unittoicons.Key5
+import com.sadellie.unitto.core.ui.common.key.unittoicons.Key6
+import com.sadellie.unitto.core.ui.common.key.unittoicons.Key7
+import com.sadellie.unitto.core.ui.common.key.unittoicons.Key8
+import com.sadellie.unitto.core.ui.common.key.unittoicons.Key9
+import com.sadellie.unitto.core.ui.common.key.unittoicons.Tab
+import com.sadellie.unitto.core.ui.isPortrait
+
+@Composable
+internal fun AddSubtractKeyboard(
+    modifier: Modifier,
+    addSymbol: (String) -> Unit,
+    deleteSymbol: () -> Unit,
+    onConfirm: () -> Unit,
+    allowVibration: Boolean,
+    imeAction: ImeAction,
+    focusManager: FocusManager = LocalFocusManager.current
+) {
+    Row(modifier) {
+        val weightModifier = Modifier.weight(1f)
+        val mainButtonModifier = Modifier
+            .fillMaxSize()
+            .weight(1f)
+            .padding(4.dp)
+        val actionIconHeight = if (isPortrait()) 0.35f else 0.6f
+
+        fun keyboardAction() {
+            when (imeAction) {
+                ImeAction.Next -> focusManager.moveFocus(FocusDirection.Next)
+                else -> onConfirm()
+            }
+        }
+
+        Column(weightModifier) {
+            KeyboardButtonLight(mainButtonModifier, UnittoIcons.Key7, allowVibration) {
+                addSymbol(Token.Digit._7)
+            }
+            KeyboardButtonLight(mainButtonModifier, UnittoIcons.Key4, allowVibration) {
+                addSymbol(Token.Digit._4
+                )
+            }
+            KeyboardButtonLight(mainButtonModifier, UnittoIcons.Key1, allowVibration) {
+                addSymbol(Token.Digit._1)
+            }
+            Spacer(mainButtonModifier)
+        }
+
+        Column(weightModifier) {
+            KeyboardButtonLight(mainButtonModifier, UnittoIcons.Key8, allowVibration) {
+                addSymbol(Token.Digit._8)
+            }
+            KeyboardButtonLight(mainButtonModifier, UnittoIcons.Key5, allowVibration) {
+                addSymbol(Token.Digit._5)
+            }
+            KeyboardButtonLight(mainButtonModifier, UnittoIcons.Key2, allowVibration) {
+                addSymbol(Token.Digit._2)
+            }
+            KeyboardButtonLight(mainButtonModifier, UnittoIcons.Key0, allowVibration) {
+                addSymbol(Token.Digit._0)
+            }
+        }
+
+        Column(weightModifier) {
+            KeyboardButtonLight(mainButtonModifier, UnittoIcons.Key9, allowVibration) {
+                addSymbol(Token.Digit._9)
+            }
+            KeyboardButtonLight(mainButtonModifier, UnittoIcons.Key6, allowVibration) {
+                addSymbol(Token.Digit._6)
+            }
+            KeyboardButtonLight(mainButtonModifier, UnittoIcons.Key3, allowVibration) {
+                addSymbol(Token.Digit._3)
+            }
+            Spacer(mainButtonModifier)
+        }
+
+        Column(weightModifier) {
+            Crossfade(targetState = imeAction, modifier = mainButtonModifier) {
+                when (it) {
+                    ImeAction.Next -> KeyboardButtonFilled(
+                        Modifier.fillMaxSize(),
+                        UnittoIcons.Tab,
+                        allowVibration,
+                        actionIconHeight
+                    ) { keyboardAction() }
+                    else -> KeyboardButtonFilled(
+                        Modifier.fillMaxSize(),
+                        UnittoIcons.Check,
+                        allowVibration,
+                        actionIconHeight
+                    ) { keyboardAction() }
+                }
+            }
+            KeyboardButtonLight(
+                mainButtonModifier,
+                UnittoIcons.Backspace,
+                allowVibration,
+                actionIconHeight
+            ) { deleteSymbol() }
+        }
+    }
+}
diff --git a/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/TimeUnitTextField.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/TimeUnitTextField.kt
index b6472698..8e63858e 100644
--- a/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/TimeUnitTextField.kt
+++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/TimeUnitTextField.kt
@@ -22,7 +22,6 @@ import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.scaleIn
 import androidx.compose.animation.scaleOut
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Clear
 import androidx.compose.material3.Icon
@@ -31,43 +30,39 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.platform.LocalTextInputService
+import androidx.compose.ui.text.input.TextFieldValue
 import com.sadellie.unitto.core.ui.common.textfield.ExpressionTransformer
 import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols
 
 @Composable
 internal fun TimeUnitTextField(
-    value: String,
-    onValueChange: (String) -> Unit,
+    modifier: Modifier,
+    value: TextFieldValue,
+    onValueChange: (TextFieldValue) -> Unit,
     label: String,
-    imeAction: ImeAction = ImeAction.Next,
     formatterSymbols: FormatterSymbols
-) {
+) = CompositionLocalProvider(LocalTextInputService provides null) {
     OutlinedTextField(
-        modifier = Modifier.fillMaxWidth(),
+        modifier = modifier.fillMaxWidth(),
         value = value,
         onValueChange = { newValue ->
-            onValueChange(newValue.filter { it.isDigit() })
+            onValueChange(newValue.copy(newValue.text.filter { it.isDigit() }))
         },
         label = { Text(label, color = MaterialTheme.colorScheme.onSurfaceVariant) },
         trailingIcon = {
             AnimatedVisibility(
-                visible = value.isNotBlank(),
+                visible = value.text.isNotBlank(),
                 enter = scaleIn(),
                 exit = scaleOut()
             ) {
-                IconButton(onClick = { onValueChange("") }) {
+                IconButton(onClick = { onValueChange(TextFieldValue()) }) {
                     Icon(Icons.Outlined.Clear, null)
                 }
             }
         },
-        keyboardOptions = KeyboardOptions(
-            autoCorrect = false,
-            keyboardType = KeyboardType.Decimal,
-            imeAction = imeAction
-        ),
         visualTransformation = ExpressionTransformer(formatterSymbols)
     )
 }
diff --git a/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/navigation/DateCalculatorNavigation.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/navigation/DateCalculatorNavigation.kt
index 735bda80..3db5e215 100644
--- a/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/navigation/DateCalculatorNavigation.kt
+++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/navigation/DateCalculatorNavigation.kt
@@ -19,10 +19,10 @@
 package com.sadellie.unitto.feature.datecalculator.navigation
 
 import androidx.navigation.NavGraphBuilder
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.navigation
 import androidx.navigation.navDeepLink
 import com.sadellie.unitto.core.base.TopLevelDestinations
+import com.sadellie.unitto.core.ui.unittoComposable
+import com.sadellie.unitto.core.ui.unittoNavigation
 import com.sadellie.unitto.feature.datecalculator.DateCalculatorRoute
 
 private val graph = TopLevelDestinations.DateCalculator.graph
@@ -32,14 +32,14 @@ fun NavGraphBuilder.dateCalculatorGraph(
     navigateToMenu: () -> Unit,
     navigateToSettings: () -> Unit
 ) {
-    navigation(
+    unittoNavigation(
         startDestination = start,
         route = graph,
         deepLinks = listOf(
             navDeepLink { uriPattern = "app://com.sadellie.unitto/$graph" }
         )
     ) {
-        composable(start) {
+        unittoComposable(start) {
             DateCalculatorRoute(
                 navigateToMenu = navigateToMenu,
                 navigateToSettings = navigateToSettings
diff --git a/feature/epoch/.gitignore b/feature/epoch/.gitignore
deleted file mode 100644
index 42afabfd..00000000
--- a/feature/epoch/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/feature/epoch/consumer-rules.pro b/feature/epoch/consumer-rules.pro
deleted file mode 100644
index e69de29b..00000000
diff --git a/feature/epoch/src/main/AndroidManifest.xml b/feature/epoch/src/main/AndroidManifest.xml
deleted file mode 100644
index 44008a43..00000000
--- a/feature/epoch/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest>
-
-</manifest>
\ No newline at end of file
diff --git a/feature/epoch/src/main/java/com/sadellie/unitto/feature/epoch/EpochScreen.kt b/feature/epoch/src/main/java/com/sadellie/unitto/feature/epoch/EpochScreen.kt
deleted file mode 100644
index a8d17e30..00000000
--- a/feature/epoch/src/main/java/com/sadellie/unitto/feature/epoch/EpochScreen.kt
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Unitto is a unit converter for Android
- * Copyright (c) 2023 Elshan Agaev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.sadellie.unitto.feature.epoch
-
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.TextRange
-import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.core.ui.common.MenuButton
-import com.sadellie.unitto.core.ui.common.PortraitLandscape
-import com.sadellie.unitto.core.ui.common.UnittoScreenWithTopBar
-import com.sadellie.unitto.feature.epoch.component.EpochKeyboard
-import com.sadellie.unitto.feature.epoch.component.TopPart
-
-@Composable
-internal fun EpochRoute(
-    navigateToMenu: () -> Unit,
-    viewModel: EpochViewModel = hiltViewModel()
-) {
-    val uiState = viewModel.uiState.collectAsStateWithLifecycle()
-    EpochScreen(
-        navigateToMenu = navigateToMenu,
-        uiState = uiState.value,
-        addSymbol = viewModel::addSymbol,
-        deleteSymbol = viewModel::deleteSymbol,
-        swap = viewModel::swap,
-        clearSymbols = viewModel::clearSymbols,
-        onCursorChange = viewModel::onCursorChange
-    )
-}
-
-@Composable
-private fun EpochScreen(
-    navigateToMenu: () -> Unit,
-    uiState: EpochUIState,
-    addSymbol: (String) -> Unit,
-    deleteSymbol: () -> Unit,
-    clearSymbols: () -> Unit,
-    swap: () -> Unit,
-    onCursorChange: (IntRange) -> Unit
-) {
-    UnittoScreenWithTopBar(
-        title = { Text(stringResource(R.string.epoch_converter)) },
-        navigationIcon = { MenuButton { navigateToMenu() } }
-    ) { padding ->
-        PortraitLandscape(
-            modifier = Modifier.padding(padding),
-            content1 = { topContentModifier ->
-                TopPart(
-                    modifier = topContentModifier.padding(horizontal = 8.dp),
-                    dateToUnix = uiState.dateToUnix,
-                    dateValue = uiState.dateField,
-                    unixValue = uiState.unixField,
-                    swap = swap,
-                    selection = TextRange(uiState.selection.first, uiState.selection.last),
-                    onCursorChange = onCursorChange
-                )
-            },
-            content2 = { bottomModifier ->
-                EpochKeyboard(
-                    modifier = bottomModifier,
-                    addSymbol = addSymbol,
-                    clearSymbols = clearSymbols,
-                    deleteSymbol = deleteSymbol
-                )
-            }
-        )
-    }
-}
diff --git a/feature/epoch/src/main/java/com/sadellie/unitto/feature/epoch/EpochViewModel.kt b/feature/epoch/src/main/java/com/sadellie/unitto/feature/epoch/EpochViewModel.kt
deleted file mode 100644
index 9c4bdf36..00000000
--- a/feature/epoch/src/main/java/com/sadellie/unitto/feature/epoch/EpochViewModel.kt
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Unitto is a unit converter for Android
- * Copyright (c) 2023 Elshan Agaev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.sadellie.unitto.feature.epoch
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.sadellie.unitto.data.epoch.EpochDateConverter
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.flow.update
-import javax.inject.Inject
-
-data class EpochUIState(
-    val dateField: String = "",
-    val unixField: String = "",
-    val dateToUnix: Boolean = true,
-    val selection: IntRange = 0..0
-)
-
-@HiltViewModel
-class EpochViewModel @Inject constructor() : ViewModel() {
-
-    private val _input: MutableStateFlow<String> = MutableStateFlow("")
-    private val _fromDateToUnix: MutableStateFlow<Boolean> = MutableStateFlow(true)
-    private val _selection: MutableStateFlow<IntRange> = MutableStateFlow(IntRange(0, 0))
-
-    val uiState: StateFlow<EpochUIState> = combine(
-        _input, _fromDateToUnix, _selection
-    ) { input, fromDateToUnix, selection ->
-        if (fromDateToUnix) {
-            EpochUIState(
-                dateField = input,
-                unixField = EpochDateConverter.convertDateToUnix(input),
-                dateToUnix = fromDateToUnix,
-                selection = selection
-            )
-        } else {
-            val date = try {
-                EpochDateConverter.convertUnixToDate(input)
-            } catch (e: IllegalArgumentException) {
-                ""
-            }
-
-            EpochUIState(
-                unixField = input,
-                dateField = date,
-                dateToUnix = fromDateToUnix,
-                selection = selection
-            )
-        }
-    }.stateIn(
-        viewModelScope, SharingStarted.WhileSubscribed(5000L), EpochUIState()
-    )
-
-    fun addSymbol(symbol: String) {
-        val selection = _selection.value
-        val maxSymbols = if (_fromDateToUnix.value) 14 else 10
-        if (_input.value.length >= maxSymbols) return
-
-        _input.update { 
-            if (it.isEmpty()) symbol else it.replaceRange(selection.first, selection.last, symbol)
-        }
-        _selection.update { it.first + 1..it.first + 1 }
-    }
-
-    fun deleteSymbol() {
-        val selection = _selection.value
-        val newSelectionStart = when (selection.last) {
-            0 -> return
-            selection.first -> _selection.value.first - 1
-            else -> _selection.value.first
-        }
-
-        _selection.update { newSelectionStart..newSelectionStart }
-        _input.update { it.removeRange(newSelectionStart, selection.last) }
-    }
-
-    fun clearSymbols() {
-        _selection.update { 0..0 }
-        _input.update { "" }
-    }
-
-    fun swap() {
-        clearSymbols()
-        _fromDateToUnix.update { !it }
-    }
-
-    fun onCursorChange(selectionRange: IntRange) {
-        _selection.update { selectionRange }
-    }
-}
diff --git a/feature/epoch/src/main/java/com/sadellie/unitto/feature/epoch/component/DateTextFieldUtils.kt b/feature/epoch/src/main/java/com/sadellie/unitto/feature/epoch/component/DateTextFieldUtils.kt
deleted file mode 100644
index 6ca7165c..00000000
--- a/feature/epoch/src/main/java/com/sadellie/unitto/feature/epoch/component/DateTextFieldUtils.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Unitto is a unit converter for Android
- * Copyright (c) 2023 Elshan Agaev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.sadellie.unitto.feature.epoch.component
-
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.input.OffsetMapping
-import androidx.compose.ui.text.input.TransformedText
-import androidx.compose.ui.text.input.VisualTransformation
-
-internal object DateVisTrans : VisualTransformation {
-    override fun filter(text: AnnotatedString): TransformedText = TransformedText(
-        text = AnnotatedString(text.text.toDateMask()),
-        offsetMapping = offsetMapping
-    )
-
-    private val offsetMapping = object : OffsetMapping {
-        override fun originalToTransformed(offset: Int): Int {
-            if (offset <= 2) return offset
-            if (offset <= 4) return offset + 1
-            if (offset <= 6) return offset + 2
-            if (offset <= 8) return offset + 3
-            if (offset <= 10) return offset + 4
-            if (offset <= 14) return offset + 5
-            return 20
-        }
-
-        override fun transformedToOriginal(offset: Int): Int {
-            if (offset <= 2) return offset
-            if (offset <= 5) return offset - 1
-            if (offset <= 9) return offset - 2
-            if (offset <= 11) return offset - 3
-            if (offset <= 14) return offset - 4
-            if (offset <= 19) return offset - 5
-            return 14
-        }
-    }
-}
-
-internal fun String.toDateMask(): String {
-    var maskedText = this
-
-    if (maskedText.length > 2) maskedText = maskedText.replaceRange(2, 2, ":")
-    if (maskedText.length > 5) maskedText = maskedText.replaceRange(5, 5, ":")
-    if (maskedText.length > 8) maskedText = maskedText.replaceRange(8, 8, "\n")
-    if (maskedText.length > 10) maskedText = maskedText.replaceRange(11, 11, "d")
-    if (maskedText.length > 13) maskedText = maskedText.replaceRange(14, 14, "m")
-    if (maskedText.length > 18) maskedText = maskedText.replaceRange(19, 19, "y")
-
-    return maskedText
-}
diff --git a/feature/epoch/src/main/java/com/sadellie/unitto/feature/epoch/component/DateUnixTextFields.kt b/feature/epoch/src/main/java/com/sadellie/unitto/feature/epoch/component/DateUnixTextFields.kt
deleted file mode 100644
index 736b6077..00000000
--- a/feature/epoch/src/main/java/com/sadellie/unitto/feature/epoch/component/DateUnixTextFields.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Unitto is a unit converter for Android
- * Copyright (c) 2023 Elshan Agaev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.sadellie.unitto.feature.epoch.component
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.ui.platform.LocalTextInputService
-import androidx.compose.ui.text.input.TextFieldValue
-import androidx.compose.ui.text.input.VisualTransformation
-import androidx.compose.ui.text.style.TextAlign
-import com.sadellie.unitto.core.ui.theme.NumbersTextStyleDisplayMedium
-
-@Composable
-internal fun DateUnixTextFields(
-    fromTextFieldValue: TextFieldValue,
-    onCursorChange: (IntRange) -> Unit,
-    fromSupportText: String,
-    toTextValue: String,
-    toSupportText: String,
-    visualTransformation: VisualTransformation,
-    fromPlaceholderText: String,
-    toPlaceholderText: String
-) {
-    Column {
-        CompositionLocalProvider(
-            LocalTextInputService provides null
-        ) {
-            BasicTextField(
-                value = fromTextFieldValue,
-                onValueChange = { onCursorChange(it.selection.start..it.selection.end) },
-                textStyle = NumbersTextStyleDisplayMedium.copy(
-                    textAlign = TextAlign.Start,
-                    color = MaterialTheme.colorScheme.onBackground
-                ),
-                minLines = 1,
-                maxLines = 2,
-                visualTransformation = visualTransformation,
-                decorationBox = { innerTextField ->
-                    Text(
-                        text = fromPlaceholderText,
-                        minLines = 1,
-                        maxLines = 2,
-                        style = NumbersTextStyleDisplayMedium,
-                        color = MaterialTheme.colorScheme.outline,
-                        textAlign = TextAlign.Start
-                    )
-                    innerTextField()
-                }
-            )
-        }
-        Text(text = fromSupportText)
-        Text(
-            text = toTextValue.ifEmpty { toPlaceholderText },
-            style = NumbersTextStyleDisplayMedium,
-        )
-        Text(text = toSupportText)
-    }
-}
diff --git a/feature/epoch/src/main/java/com/sadellie/unitto/feature/epoch/component/EpochKeyboard.kt b/feature/epoch/src/main/java/com/sadellie/unitto/feature/epoch/component/EpochKeyboard.kt
deleted file mode 100644
index 7dbf64d1..00000000
--- a/feature/epoch/src/main/java/com/sadellie/unitto/feature/epoch/component/EpochKeyboard.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Unitto is a unit converter for Android
- * Copyright (c) 2023 Elshan Agaev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.sadellie.unitto.feature.epoch.component
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import com.sadellie.unitto.core.base.Token
-import com.sadellie.unitto.core.ui.common.KeyboardButtonLight
-import com.sadellie.unitto.core.ui.common.key.UnittoIcons
-import com.sadellie.unitto.core.ui.common.key.unittoicons.Backspace
-import com.sadellie.unitto.core.ui.common.key.unittoicons.Key0
-import com.sadellie.unitto.core.ui.common.key.unittoicons.Key1
-import com.sadellie.unitto.core.ui.common.key.unittoicons.Key2
-import com.sadellie.unitto.core.ui.common.key.unittoicons.Key3
-import com.sadellie.unitto.core.ui.common.key.unittoicons.Key4
-import com.sadellie.unitto.core.ui.common.key.unittoicons.Key5
-import com.sadellie.unitto.core.ui.common.key.unittoicons.Key6
-import com.sadellie.unitto.core.ui.common.key.unittoicons.Key7
-import com.sadellie.unitto.core.ui.common.key.unittoicons.Key8
-import com.sadellie.unitto.core.ui.common.key.unittoicons.Key9
-
-@Composable
-internal fun EpochKeyboard(
-    modifier: Modifier,
-    addSymbol: (String) -> Unit,
-    clearSymbols: () -> Unit,
-    deleteSymbol: () -> Unit
-) {
-    Column(
-        modifier = modifier
-    ) {
-        // Button modifier
-        val bModifier = Modifier
-            .fillMaxSize()
-            .weight(1f)
-            .padding(4.dp)
-        // Column modifier
-        val cModifier = Modifier.weight(1f)
-        val dModifier = Modifier
-            .fillMaxSize()
-            .weight(2f)
-            .padding(4.dp)
-        Row(cModifier) {
-            KeyboardButtonLight(bModifier, UnittoIcons.Key7, false) { addSymbol(Token._7) }
-            KeyboardButtonLight(bModifier, UnittoIcons.Key8, false) { addSymbol(Token._8) }
-            KeyboardButtonLight(bModifier, UnittoIcons.Key9, false) { addSymbol(Token._9) }
-        }
-        Row(cModifier) {
-            KeyboardButtonLight(bModifier, UnittoIcons.Key4, false) { addSymbol(Token._4) }
-            KeyboardButtonLight(bModifier, UnittoIcons.Key5, false) { addSymbol(Token._5) }
-            KeyboardButtonLight(bModifier, UnittoIcons.Key6, false) { addSymbol(Token._6) }
-        }
-        Row(cModifier) {
-            KeyboardButtonLight(bModifier, UnittoIcons.Key1, false) { addSymbol(Token._1) }
-            KeyboardButtonLight(bModifier, UnittoIcons.Key2, false) { addSymbol(Token._2) }
-            KeyboardButtonLight(bModifier, UnittoIcons.Key3, false) { addSymbol(Token._3) }
-        }
-        Row(cModifier) {
-            KeyboardButtonLight(bModifier, UnittoIcons.Key0, false) { addSymbol(Token._0) }
-            KeyboardButtonLight(dModifier, UnittoIcons.Backspace, false, clearSymbols) { deleteSymbol() }
-        }
-    }
-}
\ No newline at end of file
diff --git a/feature/epoch/src/main/java/com/sadellie/unitto/feature/epoch/component/SwapButton.kt b/feature/epoch/src/main/java/com/sadellie/unitto/feature/epoch/component/SwapButton.kt
deleted file mode 100644
index f4cead05..00000000
--- a/feature/epoch/src/main/java/com/sadellie/unitto/feature/epoch/component/SwapButton.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Unitto is a unit converter for Android
- * Copyright (c) 2023 Elshan Agaev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.sadellie.unitto.feature.epoch.component
-
-import androidx.compose.animation.core.FastOutSlowInEasing
-import androidx.compose.animation.core.animateIntAsState
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.interaction.collectIsPressedAsState
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.SwapHoriz
-import androidx.compose.material3.Button
-import androidx.compose.material3.Icon
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-
-@Composable
-internal fun SwapButton(
-    modifier: Modifier,
-    swap: () -> Unit
-) {
-    val interactionSource = remember { MutableInteractionSource() }
-    val isPressed by interactionSource.collectIsPressedAsState()
-    val cornerRadius: Int by animateIntAsState(
-        targetValue = if (isPressed) 30 else 50,
-        animationSpec = tween(easing = FastOutSlowInEasing),
-    )
-
-    Button(
-        onClick = swap,
-        shape = RoundedCornerShape(cornerRadius),
-        modifier = modifier,
-        contentPadding = PaddingValues(vertical = 26.dp, horizontal = 8.dp),
-        interactionSource = interactionSource
-    ) {
-        Icon(Icons.Default.SwapHoriz, null)
-        Spacer(modifier = Modifier.width(8.dp))
-        Text("SWAP")
-    }
-}
diff --git a/feature/epoch/src/main/java/com/sadellie/unitto/feature/epoch/component/TopPart.kt b/feature/epoch/src/main/java/com/sadellie/unitto/feature/epoch/component/TopPart.kt
deleted file mode 100644
index d43d1ef2..00000000
--- a/feature/epoch/src/main/java/com/sadellie/unitto/feature/epoch/component/TopPart.kt
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Unitto is a unit converter for Android
- * Copyright (c) 2023 Elshan Agaev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.sadellie.unitto.feature.epoch.component
-
-import androidx.compose.animation.Crossfade
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.TextRange
-import androidx.compose.ui.text.input.TextFieldValue
-import androidx.compose.ui.text.input.VisualTransformation
-import androidx.compose.ui.unit.dp
-
-@Composable
-fun TopPart(
-    modifier: Modifier,
-    dateToUnix: Boolean,
-    swap: () -> Unit,
-    dateValue: String,
-    unixValue: String,
-    selection: TextRange,
-    onCursorChange: (IntRange) -> Unit
-) {
-    Column(
-        modifier = modifier,
-        verticalArrangement = Arrangement.spacedBy(8.dp)
-    ) {
-        Crossfade(dateToUnix) {
-            if (it) {
-                DateUnixTextFields(
-                    fromTextFieldValue = TextFieldValue(text = dateValue, selection = selection),
-                    onCursorChange = onCursorChange,
-                    fromSupportText = "date",
-                    toTextValue = unixValue,
-                    toSupportText = "unix",
-                    visualTransformation = DateVisTrans,
-                    fromPlaceholderText = dateValue.padEnd(14, '0').toDateMask(),
-                    toPlaceholderText = "0"
-                )
-            } else {
-                val dateMasked = dateValue.padEnd(14, '0').toDateMask()
-                DateUnixTextFields(
-                    fromTextFieldValue = TextFieldValue(text = unixValue, selection = selection),
-                    onCursorChange = onCursorChange,
-                    fromSupportText = "unix",
-                    toTextValue = dateMasked,
-                    toSupportText = "date",
-                    visualTransformation = VisualTransformation.None,
-                    fromPlaceholderText = if (unixValue.isEmpty()) "0" else "",
-                    toPlaceholderText = dateMasked,
-                )
-            }
-        }
-        SwapButton(modifier = Modifier.fillMaxWidth(), swap = swap)
-    }
-}
diff --git a/feature/settings/build.gradle.kts b/feature/settings/build.gradle.kts
index 9badfbd5..5e28fcd7 100644
--- a/feature/settings/build.gradle.kts
+++ b/feature/settings/build.gradle.kts
@@ -29,10 +29,12 @@ android {
 
 dependencies {
     implementation(libs.com.github.sadellie.themmo)
-    implementation(libs.org.burnoutcrew.composereorderable)
+    implementation(libs.org.burnoutcrew.composereorderable.reorderable)
+    implementation(libs.androidx.appcompat.appcompat)
 
-    implementation(project(mapOf("path" to ":data:common")))
-    implementation(project(mapOf("path" to ":data:model")))
-    implementation(project(mapOf("path" to ":data:userprefs")))
-    implementation(project(mapOf("path" to ":data:licenses")))
+    implementation(project(":data:common"))
+    implementation(project(":data:database"))
+    implementation(project(":data:model"))
+    implementation(project(":data:userprefs"))
+    implementation(project(":data:licenses"))
 }
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/SettingsScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/SettingsScreen.kt
index 1e4276c4..f3f78236 100644
--- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/SettingsScreen.kt
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/SettingsScreen.kt
@@ -18,267 +18,190 @@
 
 package com.sadellie.unitto.feature.settings
 
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+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.ExposureZero
+import androidx.compose.material.icons.filled.Cached
+import androidx.compose.material.icons.filled.Calculate
 import androidx.compose.material.icons.filled.Home
 import androidx.compose.material.icons.filled.Info
 import androidx.compose.material.icons.filled.Palette
 import androidx.compose.material.icons.filled.RateReview
-import androidx.compose.material.icons.filled.Rule
-import androidx.compose.material.icons.filled.Sort
-import androidx.compose.material.icons.filled.Timer
+import androidx.compose.material.icons.filled.SwapHoriz
 import androidx.compose.material.icons.filled.Vibration
 import androidx.compose.material.icons.filled._123
-import androidx.compose.material3.Icon
-import androidx.compose.material3.ListItem
-import androidx.compose.material3.Text
 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.mutableFloatStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.sadellie.unitto.core.base.BuildConfig
 import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.core.base.TOP_LEVEL_GRAPH_ROUTES
 import com.sadellie.unitto.core.ui.common.Header
 import com.sadellie.unitto.core.ui.common.NavigateUpButton
 import com.sadellie.unitto.core.ui.common.UnittoListItem
 import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar
 import com.sadellie.unitto.core.ui.openLink
-import com.sadellie.unitto.data.model.UnitsListSorting
-import com.sadellie.unitto.feature.settings.components.AlertDialogWithList
+import com.sadellie.unitto.core.ui.showToast
+import com.sadellie.unitto.data.userprefs.GeneralPreferences
 import com.sadellie.unitto.feature.settings.navigation.aboutRoute
+import com.sadellie.unitto.feature.settings.navigation.calculatorSettingsRoute
+import com.sadellie.unitto.feature.settings.navigation.converterSettingsRoute
+import com.sadellie.unitto.feature.settings.navigation.displayRoute
 import com.sadellie.unitto.feature.settings.navigation.formattingRoute
-import com.sadellie.unitto.feature.settings.navigation.themesRoute
-import com.sadellie.unitto.feature.settings.navigation.unitsGroupRoute
+import com.sadellie.unitto.feature.settings.navigation.startingScreenRoute
 
 @Composable
-internal fun SettingsScreen(
+internal fun SettingsRoute(
     viewModel: SettingsViewModel = hiltViewModel(),
-    menuButtonClick: () -> Unit,
-    navControllerAction: (String) -> Unit
+    navigateUp: () -> Unit,
+    navControllerAction: (String) -> Unit,
+) {
+    val userPrefs = viewModel.userPrefs.collectAsStateWithLifecycle()
+    val cachePercentage = viewModel.cachePercentage.collectAsStateWithLifecycle()
+
+    SettingsScreen(
+        userPrefs = userPrefs.value,
+        navigateUp = navigateUp,
+        navControllerAction = navControllerAction,
+        updateVibrations = viewModel::updateVibrations,
+        cachePercentage = cachePercentage.value,
+        clearCache = viewModel::clearCache,
+    )
+}
+
+@Composable
+private fun SettingsScreen(
+    userPrefs: GeneralPreferences,
+    navigateUp: () -> Unit,
+    navControllerAction: (String) -> Unit,
+    updateVibrations: (Boolean) -> Unit,
+    cachePercentage: Float,
+    clearCache: () -> Unit,
 ) {
     val mContext = LocalContext.current
-    val userPrefs = viewModel.userPrefs.collectAsStateWithLifecycle()
-    var dialogState: DialogState by rememberSaveable {
-        mutableStateOf(DialogState.NONE)
-    }
 
     UnittoScreenWithLargeTopBar(
         title = stringResource(R.string.settings_screen),
-        navigationIcon = { NavigateUpButton(menuButtonClick) }
+        navigationIcon = { NavigateUpButton(navigateUp) }
     ) { padding ->
-        LazyColumn(contentPadding = padding) {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .verticalScroll(rememberScrollState())
+                .padding(padding)
+        ) {
+            UnittoListItem(
+                icon = Icons.Default.Palette,
+                iconDescription = stringResource(R.string.display_settings),
+                headlineText = stringResource(R.string.display_settings),
+                supportingText = stringResource(R.string.theme_setting_support),
+                modifier = Modifier.clickable { navControllerAction(displayRoute) }
+            )
 
-            // THEME
-            item {
-                ListItem(
-                    leadingContent = {
-                        Icon(
-                            Icons.Default.Palette,
-                            stringResource(R.string.theme_setting),
-                        )
-                    },
-                    headlineContent = { Text(stringResource(R.string.theme_setting)) },
-                    supportingContent = { Text(stringResource(R.string.theme_setting_support)) },
-                    modifier = Modifier.clickable { navControllerAction(themesRoute) }
-                )
-            }
+            UnittoListItem(
+                icon = Icons.Default.Home,
+                iconDescription = stringResource(R.string.starting_screen_setting),
+                headlineText = stringResource(R.string.starting_screen_setting),
+                supportingText = stringResource(R.string.starting_screen_setting_support),
+                modifier = Modifier.clickable { navControllerAction(startingScreenRoute) }
+            )
 
-            // START SCREEN
-            item {
-                ListItem(
-                    leadingContent = {
-                        Icon(
-                            Icons.Default.Home,
-                            stringResource(R.string.starting_screen_setting),
-                        )
-                    },
-                    headlineContent = { Text(stringResource(R.string.starting_screen_setting)) },
-                    supportingContent = { Text(stringResource(R.string.starting_screen_setting_support)) },
-                    modifier = Modifier.clickable { dialogState = DialogState.START_SCREEN }
-                )
-            }
+            UnittoListItem(
+                icon = Icons.Default._123,
+                iconDescription = stringResource(R.string.formatting_setting),
+                headlineText = stringResource(R.string.formatting_setting),
+                supportingText = stringResource(R.string.formatting_setting_support),
+                modifier = Modifier.clickable { navControllerAction(formattingRoute) }
+            )
 
-            // FORMATTING
-            item {
-                ListItem(
-                    leadingContent = {
-                        Icon(
-                            Icons.Default._123,
-                            stringResource(R.string.formatting_setting),
-                        )
-                    },
-                    headlineContent = { Text(stringResource(R.string.formatting_setting)) },
-                    supportingContent = { Text(stringResource(R.string.formatting_setting_support)) },
-                    modifier = Modifier.clickable { navControllerAction(formattingRoute) }
-                )
-            }
+            UnittoListItem(
+                icon = Icons.Default.Calculate,
+                iconDescription = stringResource(R.string.calculator),
+                headlineText = stringResource(R.string.calculator),
+                supportingText = stringResource(R.string.calculator_settings_support),
+                modifier = Modifier.clickable { navControllerAction(calculatorSettingsRoute) }
+            )
 
-            // UNIT CONVERTER GROUP
-            item { Header(stringResource(R.string.unit_converter)) }
+            UnittoListItem(
+                icon = Icons.Default.SwapHoriz,
+                iconDescription = stringResource(R.string.unit_converter),
+                headlineText = stringResource(R.string.unit_converter),
+                supportingText = stringResource(R.string.converter_settings_support),
+                modifier = Modifier.clickable { navControllerAction(converterSettingsRoute) }
+            )
 
-            // UNIT GROUPS
-            item {
-                ListItem(
-                    leadingContent = {
-                        Icon(
-                            Icons.Default.Rule,
-                            stringResource(R.string.disable_unit_group_description),
-                        )
-                    },
-                    headlineContent = { Text(stringResource(R.string.unit_groups_setting)) },
-                    supportingContent = { Text(stringResource(R.string.unit_groups_support)) },
-                    modifier = Modifier.clickable { navControllerAction(unitsGroupRoute) }
-                )
-            }
+            Header(stringResource(R.string.additional_settings_group))
 
-            // UNITS LIST SORTING
-            item {
-                ListItem(
-                    leadingContent = {
-                        Icon(
-                            Icons.Default.Sort,
-                            stringResource(R.string.units_sorting)
-                        )
-                    },
-                    headlineContent = { Text(stringResource(R.string.units_sorting)) },
-                    supportingContent = { Text(stringResource(R.string.units_sorting_support)) },
-                    modifier = Modifier.clickable { dialogState = DialogState.UNIT_LIST_SORTING }
-                )
-            }
+            UnittoListItem(
+                icon = Icons.Default.Vibration,
+                iconDescription = stringResource(R.string.enable_vibrations),
+                headlineText = stringResource(R.string.enable_vibrations),
+                supportingText = stringResource(R.string.enable_vibrations_support),
+                modifier = Modifier.clickable { navControllerAction(converterSettingsRoute) },
+                switchState = userPrefs.enableVibrations,
+                onSwitchChange = updateVibrations
+            )
 
-            // FORMAT TIME
-            item {
+            AnimatedVisibility(
+                visible = cachePercentage > 0,
+                enter = expandVertically() + fadeIn(),
+                exit = shrinkVertically() + fadeOut(),
+            ) {
                 UnittoListItem(
-                    label = stringResource(R.string.format_time),
-                    leadingContent = {
-                        Icon(
-                            Icons.Default.Timer,
-                            stringResource(R.string.format_time)
-                        )
-                    },
-                    supportContent = stringResource(R.string.format_time_support),
-                    switchState = userPrefs.value.unitConverterFormatTime,
-                    onSwitchChange = viewModel::updateUnitConverterFormatTime
+                    headlineText = stringResource(R.string.clear_cache),
+                    icon = Icons.Default.Cached,
+                    iconDescription = stringResource(R.string.clear_cache),
+                    modifier = Modifier.clickable { clearCache(); showToast(mContext, "👌") },
                 )
             }
 
-            // ADDITIONAL GROUP
-            item { Header(stringResource(R.string.additional_settings_group)) }
-
-            // MIDDLE ZERO
-            item {
-                UnittoListItem(
-                    label = stringResource(R.string.middle_zero_option),
-                    leadingContent = {
-                        Icon(
-                            Icons.Default.ExposureZero,
-                            stringResource(R.string.middle_zero_option)
-                        )
-                    },
-                    supportContent = stringResource(R.string.middle_zero_option_support),
-                    switchState = userPrefs.value.middleZero,
-                    onSwitchChange = viewModel::updateMiddleZero
-                )
-            }
-
-            // VIBRATIONS
-            item {
-                UnittoListItem(
-                    label = stringResource(R.string.enable_vibrations),
-                    leadingContent = {
-                        Icon(
-                            Icons.Default.Vibration,
-                            stringResource(R.string.enable_vibrations)
-                        )
-                    },
-                    supportContent = stringResource(R.string.enable_vibrations_support),
-                    switchState = userPrefs.value.enableVibrations,
-                    onSwitchChange = viewModel::updateVibrations
-                )
-            }
-
-            // RATE THIS APP
             if (BuildConfig.STORE_LINK.isNotEmpty()) {
-                item {
-                    ListItem(
-                        leadingContent = {
-                            Icon(
-                                Icons.Default.RateReview,
-                                stringResource(R.string.rate_this_app),
-                            )
-                        },
-                        headlineContent = { Text(stringResource(R.string.rate_this_app)) },
-                        modifier = Modifier.clickable { openLink(mContext, BuildConfig.STORE_LINK) }
-                    )
-                }
-            }
-
-            // More settings
-            item {
-                ListItem(
-                    leadingContent = {
-                        Icon(
-                            Icons.Default.Info,
-                            stringResource(R.string.about_unitto),
-                        )
-                    },
-                    headlineContent = { Text(stringResource(R.string.about_unitto)) },
-                    supportingContent = { Text(stringResource(R.string.about_unitto_support)) },
-                    modifier = Modifier.clickable { navControllerAction(aboutRoute) }
+                UnittoListItem(
+                    icon = Icons.Default.RateReview,
+                    iconDescription = stringResource(R.string.rate_this_app),
+                    headlineText = stringResource(R.string.rate_this_app),
+                    modifier = Modifier.clickable { openLink(mContext, BuildConfig.STORE_LINK) }
                 )
             }
-        }
-    }
 
-    /**
-     * Function to reset currently displayed dialog.
-     */
-    fun resetDialog() {
-        dialogState = DialogState.NONE
-    }
-
-    // Showing dialog
-    when (dialogState) {
-        DialogState.START_SCREEN -> {
-            AlertDialogWithList(
-                title = stringResource(R.string.starting_screen_setting),
-                selectedItemIndex = userPrefs.value.startingScreen,
-                listItems = TOP_LEVEL_GRAPH_ROUTES,
-                selectAction = viewModel::updateStartingScreen,
-                dismissAction = { resetDialog() }
+            UnittoListItem(
+                icon = Icons.Default.Info,
+                iconDescription = stringResource(R.string.about_unitto),
+                headlineText = stringResource(R.string.about_unitto),
+                supportingText = stringResource(R.string.about_unitto_support),
+                modifier = Modifier.clickable { navControllerAction(aboutRoute) }
             )
         }
-        DialogState.UNIT_LIST_SORTING -> {
-            AlertDialogWithList(
-                title = stringResource(R.string.units_sorting),
-                listItems = mapOf(
-                    UnitsListSorting.USAGE to R.string.sort_by_usage,
-                    UnitsListSorting.ALPHABETICAL to R.string.sort_by_alphabetical,
-                    UnitsListSorting.SCALE_DESC to R.string.sort_by_scale_desc,
-                    UnitsListSorting.SCALE_ASC to R.string.sort_by_scale_asc,
-                ),
-                selectedItemIndex = userPrefs.value.unitConverterSorting,
-                selectAction = viewModel::updateUnitConverterSorting,
-                dismissAction = { resetDialog() }
-            )
-        }
-        // Dismissing alert dialog
-        else -> {}
     }
 }
 
-/**
- * All possible states for alert dialog that opens when user clicks on settings.
- */
-private enum class DialogState {
-    NONE, START_SCREEN, UNIT_LIST_SORTING
+@Preview
+@Composable
+private fun PreviewSettingsScreen() {
+    var cacheSize by remember { mutableFloatStateOf(0.9f) }
+
+    SettingsScreen(
+        userPrefs = GeneralPreferences(),
+        navigateUp = {},
+        navControllerAction = {},
+        updateVibrations = {},
+        cachePercentage = cacheSize,
+        clearCache = { cacheSize = 0f }
+    )
 }
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/SettingsViewModel.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/SettingsViewModel.kt
index a9e7720d..a8f7c389 100644
--- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/SettingsViewModel.kt
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/SettingsViewModel.kt
@@ -20,77 +20,38 @@ package com.sadellie.unitto.feature.settings
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.sadellie.unitto.data.model.UnitsListSorting
-import com.sadellie.unitto.data.userprefs.UserPreferences
+import com.sadellie.unitto.data.common.stateIn
+import com.sadellie.unitto.data.database.CurrencyRatesDao
+import com.sadellie.unitto.data.userprefs.GeneralPreferences
 import com.sadellie.unitto.data.userprefs.UserPreferencesRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
-class SettingsViewModel @Inject constructor(
+internal class SettingsViewModel @Inject constructor(
     private val userPrefsRepository: UserPreferencesRepository,
+    private val currencyRatesDao: CurrencyRatesDao,
 ) : ViewModel() {
-    val userPrefs = userPrefsRepository.allPreferencesFlow
-        .stateIn(
-            viewModelScope,
-            SharingStarted.WhileSubscribed(5000),
-            UserPreferences()
-        )
+    val userPrefs = userPrefsRepository.generalPrefs
+        .stateIn(viewModelScope, GeneralPreferences())
+
+    val cachePercentage = currencyRatesDao.size()
+        .map {
+            (it / 100_000f).coerceIn(0f, 1f)
+        }
+        .stateIn(viewModelScope, 0f)
 
     /**
      * @see UserPreferencesRepository.updateVibrations
      */
-    fun updateVibrations(enabled: Boolean) {
-        viewModelScope.launch {
-            userPrefsRepository.updateVibrations(enabled)
-        }
+    fun updateVibrations(enabled: Boolean) = viewModelScope.launch {
+        userPrefsRepository.updateVibrations(enabled)
     }
 
-    /**
-     * @see UserPreferencesRepository.updateMiddleZero
-     */
-    fun updateMiddleZero(enabled: Boolean) {
-        viewModelScope.launch {
-            userPrefsRepository.updateMiddleZero(enabled)
-        }
-    }
-
-    /**
-     * @see UserPreferencesRepository.updateStartingScreen
-     */
-    fun updateStartingScreen(startingScreen: String) {
-        viewModelScope.launch {
-            userPrefsRepository.updateStartingScreen(startingScreen)
-        }
-    }
-
-    /**
-     * @see UserPreferencesRepository.updateToolsExperiment
-     */
-    fun enableToolsExperiment() {
-        viewModelScope.launch {
-            userPrefsRepository.updateToolsExperiment(true)
-        }
-    }
-
-    /**
-     * @see UserPreferencesRepository.updateUnitConverterFormatTime
-     */
-    fun updateUnitConverterFormatTime(enabled: Boolean) {
-        viewModelScope.launch {
-            userPrefsRepository.updateUnitConverterFormatTime(enabled)
-        }
-    }
-
-    /**
-     * @see UserPreferencesRepository.updateUnitConverterSorting
-     */
-    fun updateUnitConverterSorting(sorting: UnitsListSorting) {
-        viewModelScope.launch {
-            userPrefsRepository.updateUnitConverterSorting(sorting)
-        }
+    fun clearCache() = viewModelScope.launch(Dispatchers.IO) {
+        currencyRatesDao.clear()
     }
 }
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/AboutScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/about/AboutScreen.kt
similarity index 56%
rename from feature/settings/src/main/java/com/sadellie/unitto/feature/settings/AboutScreen.kt
rename to feature/settings/src/main/java/com/sadellie/unitto/feature/settings/about/AboutScreen.kt
index 0bae6585..5851beb0 100644
--- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/AboutScreen.kt
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/about/AboutScreen.kt
@@ -16,23 +16,20 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.feature.settings
+package com.sadellie.unitto.feature.settings.about
 
 import android.widget.Toast
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.Help
 import androidx.compose.material.icons.filled.Code
 import androidx.compose.material.icons.filled.Copyright
-import androidx.compose.material.icons.filled.Help
 import androidx.compose.material.icons.filled.Info
 import androidx.compose.material.icons.filled.Policy
 import androidx.compose.material.icons.filled.PrivacyTip
-import androidx.compose.material.icons.filled.Translate
 import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Icon
-import androidx.compose.material3.ListItem
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
@@ -44,22 +41,42 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.sadellie.unitto.core.base.BuildConfig
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.core.ui.common.NavigateUpButton
+import com.sadellie.unitto.core.ui.common.UnittoListItem
 import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar
 import com.sadellie.unitto.core.ui.openLink
+import com.sadellie.unitto.core.ui.showToast
+import com.sadellie.unitto.data.userprefs.AboutPreferences
 
 @Composable
-internal fun AboutScreen(
+internal fun AboutRoute(
+    viewModel: AboutViewModel = hiltViewModel(),
     navigateUpAction: () -> Unit,
     navigateToThirdParty: () -> Unit,
-    viewModel: SettingsViewModel = hiltViewModel()
+) {
+    val prefs = viewModel.prefs.collectAsStateWithLifecycle()
+
+    AboutScreen(
+        prefs = prefs.value,
+        navigateUpAction = navigateUpAction,
+        navigateToThirdParty = navigateToThirdParty,
+        enableToolsExperiment = viewModel::enableToolsExperiment
+    )
+}
+
+@Composable
+private fun AboutScreen(
+    prefs: AboutPreferences,
+    navigateUpAction: () -> Unit,
+    navigateToThirdParty: () -> Unit,
+    enableToolsExperiment: () -> Unit,
 ) {
     val mContext = LocalContext.current
-    val userPrefs = viewModel.userPrefs.collectAsStateWithLifecycle()
     var aboutItemClick: Int by rememberSaveable { mutableIntStateOf(0) }
     var showDialog: Boolean by rememberSaveable { mutableStateOf(false) }
 
@@ -70,28 +87,20 @@ internal fun AboutScreen(
         LazyColumn(contentPadding = padding) {
             // CURRENCY RATE NOTE
             item {
-                ListItem(
-                    leadingContent = {
-                        Icon(
-                            Icons.Default.Help,
-                            stringResource(R.string.currency_rates_note_setting)
-                        )
-                    },
-                    headlineContent = { Text(stringResource(R.string.currency_rates_note_setting)) },
+                UnittoListItem(
+                    icon = Icons.AutoMirrored.Filled.Help,
+                    iconDescription = stringResource(R.string.currency_rates_note_setting),
+                    headlineText = stringResource(R.string.currency_rates_note_setting),
                     modifier = Modifier.clickable { showDialog = true }
                 )
             }
 
             // TERMS AND CONDITIONS
             item {
-                ListItem(
-                    leadingContent = {
-                        Icon(
-                            Icons.Default.PrivacyTip,
-                            stringResource(R.string.terms_and_conditions)
-                        )
-                    },
-                    headlineContent = { Text(stringResource(R.string.terms_and_conditions)) },
+                UnittoListItem(
+                    icon = Icons.Default.PrivacyTip,
+                    iconDescription = stringResource(R.string.terms_and_conditions),
+                    headlineText = stringResource(R.string.terms_and_conditions),
                     modifier = Modifier.clickable {
                         openLink(
                             mContext,
@@ -103,14 +112,10 @@ internal fun AboutScreen(
 
             // PRIVACY POLICY
             item {
-                ListItem(
-                    leadingContent = {
-                        Icon(
-                            Icons.Default.Policy,
-                            stringResource(R.string.privacy_policy)
-                        )
-                    },
-                    headlineContent = { Text(stringResource(R.string.privacy_policy)) },
+                UnittoListItem(
+                    icon = Icons.Default.Policy,
+                    iconDescription = stringResource(R.string.privacy_policy),
+                    headlineText = stringResource(R.string.privacy_policy),
                     modifier = Modifier.clickable {
                         openLink(
                             mContext,
@@ -122,14 +127,10 @@ internal fun AboutScreen(
 
             // OPEN SOURCE
             item {
-                ListItem(
-                    leadingContent = {
-                        Icon(
-                            Icons.Default.Code,
-                            stringResource(R.string.open_source)
-                        )
-                    },
-                    headlineContent = { Text(stringResource(R.string.open_source)) },
+                UnittoListItem(
+                    icon = Icons.Default.Code,
+                    iconDescription = stringResource(R.string.open_source),
+                    headlineText = stringResource(R.string.open_source),
                     modifier = Modifier.clickable {
                         openLink(
                             mContext,
@@ -139,62 +140,34 @@ internal fun AboutScreen(
                 )
             }
 
-            // TRANSLATE
-            item {
-                ListItem(
-                    leadingContent = {
-                        Icon(
-                            Icons.Default.Translate,
-                            stringResource(R.string.translate_app)
-                        )
-                    },
-                    headlineContent = { Text(stringResource(R.string.translate_app)) },
-                    supportingContent = { Text(stringResource(R.string.translate_app_support)) },
-                    modifier = Modifier.clickable {
-                        openLink(
-                            mContext,
-                            "https://poeditor.com/join/project/T4zjmoq8dx"
-                        )
-                    }
-                )
-            }
-
             // THIRD PARTY
             item {
-                ListItem(
-                    leadingContent = {
-                        Icon(
-                            Icons.Default.Copyright,
-                            stringResource(R.string.third_party_licenses)
-                        )
-                    },
-                    headlineContent = { Text(stringResource(R.string.third_party_licenses)) },
+                UnittoListItem(
+                    icon = Icons.Default.Copyright,
+                    iconDescription = stringResource(R.string.third_party_licenses),
+                    headlineText = stringResource(R.string.third_party_licenses),
                     modifier = Modifier.clickable { navigateToThirdParty() }
                 )
             }
 
             // APP VERSION
             item {
-                ListItem(
-                    leadingContent = {
-                        Icon(
-                            Icons.Default.Info,
-                            stringResource(R.string.app_version_name_setting)
-                        )
-                    },
-                    headlineContent = { Text(stringResource(R.string.app_version_name_setting)) },
-                    supportingContent = { Text("${BuildConfig.APP_NAME} (${BuildConfig.APP_CODE})") },
+                UnittoListItem(
+                    icon = Icons.Default.Info,
+                    iconDescription = stringResource(R.string.app_version_name_setting),
+                    headlineText = stringResource(R.string.app_version_name_setting),
+                    supportingText = "${BuildConfig.APP_NAME} (${BuildConfig.APP_CODE})",
                     modifier = Modifier.combinedClickable {
-                        if (userPrefs.value.enableToolsExperiment) {
-                            Toast.makeText(mContext, "Tools already enabled!", Toast.LENGTH_LONG).show()
+                        if (prefs.enableToolsExperiment) {
+                            showToast(mContext, "Experiments features are already enabled!", Toast.LENGTH_LONG)
                             return@combinedClickable
                         }
 
                         aboutItemClick++
                         if (aboutItemClick < 7) return@combinedClickable
 
-                        viewModel.enableToolsExperiment()
-                        Toast.makeText(mContext, "Tools enabled!", Toast.LENGTH_LONG).show()
+                        enableToolsExperiment()
+                        showToast(mContext, "Experimental features enabled!", Toast.LENGTH_LONG)
                     }
                 )
             }
@@ -218,3 +191,14 @@ internal fun AboutScreen(
         )
     }
 }
+
+@Preview
+@Composable
+fun PreviewAboutScreen() {
+    AboutScreen(
+        prefs = AboutPreferences(),
+        navigateUpAction = {},
+        navigateToThirdParty = {},
+        enableToolsExperiment = {}
+    )
+}
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/about/AboutViewModel.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/about/AboutViewModel.kt
new file mode 100644
index 00000000..60bc004d
--- /dev/null
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/about/AboutViewModel.kt
@@ -0,0 +1,40 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.feature.settings.about
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.sadellie.unitto.data.common.stateIn
+import com.sadellie.unitto.data.userprefs.AboutPreferences
+import com.sadellie.unitto.data.userprefs.UserPreferencesRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+internal class AboutViewModel @Inject constructor(
+    private val userPrefsRepository: UserPreferencesRepository,
+) : ViewModel() {
+    val prefs = userPrefsRepository.aboutPrefs
+        .stateIn(viewModelScope, AboutPreferences())
+
+    fun enableToolsExperiment() = viewModelScope.launch {
+        userPrefsRepository.updateToolsExperiment(true)
+    }
+}
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/calculator/CalculatorSettingsScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/calculator/CalculatorSettingsScreen.kt
new file mode 100644
index 00000000..d20a7092
--- /dev/null
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/calculator/CalculatorSettingsScreen.kt
@@ -0,0 +1,82 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.feature.settings.calculator
+
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Timer
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.sadellie.unitto.core.base.R
+import com.sadellie.unitto.core.ui.common.NavigateUpButton
+import com.sadellie.unitto.core.ui.common.UnittoListItem
+import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar
+import com.sadellie.unitto.data.userprefs.CalculatorPreferences
+
+@Composable
+internal fun CalculatorSettingsRoute(
+    viewModel: CalculatorViewModel = hiltViewModel(),
+    navigateUpAction: () -> Unit,
+) {
+    val prefs = viewModel.prefs.collectAsStateWithLifecycle()
+
+    CalculatorSettingsScreen(
+        prefs = prefs.value,
+        navigateUpAction = navigateUpAction,
+        updatePartialHistoryView = viewModel::updatePartialHistoryView
+    )
+}
+
+@Composable
+private fun CalculatorSettingsScreen(
+    prefs: CalculatorPreferences,
+    navigateUpAction: () -> Unit,
+    updatePartialHistoryView: (Boolean) -> Unit,
+) {
+    UnittoScreenWithLargeTopBar(
+        title = stringResource(R.string.calculator),
+        navigationIcon = { NavigateUpButton(navigateUpAction) }
+    ) { padding ->
+        LazyColumn(contentPadding = padding) {
+            item("partial history") {
+                UnittoListItem(
+                    headlineText = stringResource(R.string.partial_history_view_setting),
+                    icon = Icons.Default.Timer,
+                    iconDescription = stringResource(R.string.partial_history_view_setting),
+                    supportingText = stringResource(R.string.partial_history_view_setting_support),
+                    switchState = prefs.partialHistoryView,
+                    onSwitchChange = updatePartialHistoryView
+                )
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun PreviewCalculatorSettingsScreen() {
+    CalculatorSettingsScreen(
+        prefs = CalculatorPreferences(),
+        navigateUpAction = {},
+        updatePartialHistoryView = {}
+    )
+}
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/calculator/CalculatorViewModel.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/calculator/CalculatorViewModel.kt
new file mode 100644
index 00000000..550cb750
--- /dev/null
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/calculator/CalculatorViewModel.kt
@@ -0,0 +1,40 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.feature.settings.calculator
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.sadellie.unitto.data.common.stateIn
+import com.sadellie.unitto.data.userprefs.CalculatorPreferences
+import com.sadellie.unitto.data.userprefs.UserPreferencesRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class CalculatorViewModel @Inject constructor(
+    private val userPrefsRepository: UserPreferencesRepository,
+) : ViewModel() {
+    val prefs = userPrefsRepository.calculatorPrefs
+        .stateIn(viewModelScope, CalculatorPreferences())
+
+    fun updatePartialHistoryView(enabled: Boolean) = viewModelScope.launch {
+        userPrefsRepository.updatePartialHistoryView(enabled)
+    }
+}
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/components/ColorCheckbox.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/components/ColorCheckbox.kt
index 4a38d6d3..73daf62e 100644
--- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/components/ColorCheckbox.kt
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/components/ColorCheckbox.kt
@@ -55,25 +55,23 @@ internal fun ColorSelector(
     selected: Color,
     onItemClick: (Color) -> Unit,
     colorSchemes: List<Color>,
-    defaultColor: Color? = null
+    defaultColor: Color
 ) {
     LazyRow(
         modifier = modifier,
         horizontalArrangement = Arrangement.spacedBy(8.dp)
     ) {
-        if (defaultColor != null) {
-            // Default, Unitto colors
-            item {
-                ColorCheckbox(
-                    color = defaultColor,
-                    selected = Color.Unspecified == selected,
-                    onClick = { onItemClick(Color.Unspecified) }
-                )
-            }
+        // Default, Unitto colors
+        item(defaultColor.value.toLong()) {
+            ColorCheckbox(
+                color = defaultColor,
+                selected = Color.Unspecified == selected,
+                onClick = { onItemClick(Color.Unspecified) }
+            )
         }
 
         colorSchemes.forEach {
-            item {
+            item(it.value.toLong()) {
                 ColorCheckbox(
                     color = it,
                     selected = it == selected,
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/converter/ConverterSettingsScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/converter/ConverterSettingsScreen.kt
new file mode 100644
index 00000000..f1206356
--- /dev/null
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/converter/ConverterSettingsScreen.kt
@@ -0,0 +1,136 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.feature.settings.converter
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.Rule
+import androidx.compose.material.icons.automirrored.filled.Sort
+import androidx.compose.material.icons.filled.Timer
+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 androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.sadellie.unitto.core.base.R
+import com.sadellie.unitto.core.ui.common.NavigateUpButton
+import com.sadellie.unitto.core.ui.common.UnittoListItem
+import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar
+import com.sadellie.unitto.data.model.UnitsListSorting
+import com.sadellie.unitto.data.userprefs.ConverterPreferences
+import com.sadellie.unitto.feature.settings.components.AlertDialogWithList
+
+@Composable
+internal fun ConverterSettingsRoute(
+    viewModel: ConverterViewModel = hiltViewModel(),
+    navigateUpAction: () -> Unit,
+    navigateToUnitsGroup: () -> Unit,
+) {
+    val prefs = viewModel.prefs.collectAsStateWithLifecycle()
+
+    ConverterSettingsScreen(
+        prefs = prefs.value,
+        navigateUpAction = navigateUpAction,
+        navigateToUnitsGroup = navigateToUnitsGroup,
+        updateUnitConverterFormatTime = viewModel::updateUnitConverterFormatTime,
+        updateUnitConverterSorting = viewModel::updateUnitConverterSorting
+    )
+}
+
+@Composable
+private fun ConverterSettingsScreen(
+    prefs: ConverterPreferences,
+    navigateUpAction: () -> Unit,
+    navigateToUnitsGroup: () -> Unit,
+    updateUnitConverterFormatTime: (Boolean) -> Unit,
+    updateUnitConverterSorting: (UnitsListSorting) -> Unit,
+) {
+    var showDialog: Boolean by rememberSaveable { mutableStateOf(false) }
+
+    UnittoScreenWithLargeTopBar(
+        title = stringResource(R.string.unit_converter),
+        navigationIcon = { NavigateUpButton(navigateUpAction) }
+    ) { padding ->
+        LazyColumn(contentPadding = padding) {
+            item("unit group") {
+                UnittoListItem(
+                    icon = Icons.AutoMirrored.Filled.Rule,
+                    iconDescription = stringResource(R.string.unit_groups_setting),
+                    headlineText = stringResource(R.string.unit_groups_setting),
+                    supportingText = stringResource(R.string.unit_groups_support),
+                    modifier = Modifier.clickable { navigateToUnitsGroup() }
+                )
+            }
+
+            item("units sorting") {
+                UnittoListItem(
+                    icon = Icons.AutoMirrored.Filled.Sort,
+                    iconDescription = stringResource(R.string.units_sorting),
+                    headlineText = stringResource(R.string.units_sorting),
+                    supportingText = stringResource(R.string.units_sorting_support),
+                    modifier = Modifier.clickable { showDialog = true }
+                )
+            }
+
+            item("format time") {
+                UnittoListItem(
+                    icon = Icons.Default.Timer,
+                    iconDescription = stringResource(R.string.format_time),
+                    headlineText = stringResource(R.string.format_time),
+                    supportingText = stringResource(R.string.format_time_support),
+                    switchState = prefs.unitConverterFormatTime,
+                    onSwitchChange = updateUnitConverterFormatTime
+                )
+            }
+        }
+    }
+
+    if (showDialog) {
+        AlertDialogWithList(
+            title = stringResource(R.string.units_sorting),
+            listItems = mapOf(
+                UnitsListSorting.USAGE to R.string.sort_by_usage,
+                UnitsListSorting.ALPHABETICAL to R.string.sort_by_alphabetical,
+                UnitsListSorting.SCALE_DESC to R.string.sort_by_scale_desc,
+                UnitsListSorting.SCALE_ASC to R.string.sort_by_scale_asc,
+            ),
+            selectedItemIndex = prefs.unitConverterSorting,
+            selectAction = updateUnitConverterSorting,
+            dismissAction = { showDialog = false }
+        )
+    }
+}
+
+@Preview
+@Composable
+private fun PreviewConverterSettingsScreen() {
+    ConverterSettingsScreen(
+        prefs = ConverterPreferences(),
+        navigateUpAction = {},
+        navigateToUnitsGroup = {},
+        updateUnitConverterFormatTime = {},
+        updateUnitConverterSorting = {}
+    )
+}
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/converter/ConverterViewModel.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/converter/ConverterViewModel.kt
new file mode 100644
index 00000000..993ac33b
--- /dev/null
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/converter/ConverterViewModel.kt
@@ -0,0 +1,45 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.feature.settings.converter
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.sadellie.unitto.data.common.stateIn
+import com.sadellie.unitto.data.model.UnitsListSorting
+import com.sadellie.unitto.data.userprefs.ConverterPreferences
+import com.sadellie.unitto.data.userprefs.UserPreferencesRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+internal class ConverterViewModel @Inject constructor(
+    private val userPrefsRepository: UserPreferencesRepository,
+) : ViewModel() {
+    val prefs = userPrefsRepository.converterPrefs
+        .stateIn(viewModelScope, ConverterPreferences())
+
+    fun updateUnitConverterFormatTime(enabled: Boolean) = viewModelScope.launch {
+        userPrefsRepository.updateUnitConverterFormatTime(enabled)
+    }
+
+    fun updateUnitConverterSorting(sorting: UnitsListSorting) = viewModelScope.launch {
+        userPrefsRepository.updateUnitConverterSorting(sorting)
+    }
+}
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/display/Color.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/display/Color.kt
new file mode 100644
index 00000000..eb210493
--- /dev/null
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/display/Color.kt
@@ -0,0 +1,186 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.feature.settings.display
+
+import androidx.compose.ui.graphics.Color
+
+internal val colorSchemes: List<Color> by lazy {
+    listOf(
+        Color(0xFFe8f8f5),
+        Color(0xFFd1f2eb),
+        Color(0xFFa3e4d7),
+        Color(0xFF76d7c4),
+        Color(0xFF48c9b0),
+        Color(0xFF1abc9c),
+        Color(0xFF17a589),
+        Color(0xFF148f77),
+        Color(0xFF117864),
+        Color(0xFF0e6251),
+        Color(0xFFe8f6f3),
+        Color(0xFFd0ece7),
+        Color(0xFFa2d9ce),
+        Color(0xFF73c6b6),
+        Color(0xFF45b39d),
+        Color(0xFF16a085),
+        Color(0xFF138d75),
+        Color(0xFF117a65),
+        Color(0xFF0e6655),
+        Color(0xFF0b5345),
+        Color(0xFFeafaf1),
+        Color(0xFFd5f5e3),
+        Color(0xFFabebc6),
+        Color(0xFF82e0aa),
+        Color(0xFF58d68d),
+        Color(0xFF2ecc71),
+        Color(0xFF28b463),
+        Color(0xFF239b56),
+        Color(0xFF1d8348),
+        Color(0xFF186a3b),
+        Color(0xFFe9f7ef),
+        Color(0xFFd4efdf),
+        Color(0xFFa9dfbf),
+        Color(0xFF7dcea0),
+        Color(0xFF52be80),
+        Color(0xFF27ae60),
+        Color(0xFF229954),
+        Color(0xFF1e8449),
+        Color(0xFF196f3d),
+        Color(0xFF145a32),
+        Color(0xFFebf5fb),
+        Color(0xFFd6eaf8),
+        Color(0xFFaed6f1),
+        Color(0xFF85c1e9),
+        Color(0xFF5dade2),
+        Color(0xFF3498db),
+        Color(0xFF2e86c1),
+        Color(0xFF2874a6),
+        Color(0xFF21618c),
+        Color(0xFF1b4f72),
+        Color(0xFFeaf2f8),
+        Color(0xFFd4e6f1),
+        Color(0xFFa9cce3),
+        Color(0xFF7fb3d5),
+        Color(0xFF5499c7),
+        Color(0xFF2980b9),
+        Color(0xFF2471a3),
+        Color(0xFF1f618d),
+        Color(0xFF1a5276),
+        Color(0xFF154360),
+        Color(0xFFf5eef8),
+        Color(0xFFebdef0),
+        Color(0xFFd7bde2),
+        Color(0xFFc39bd3),
+        Color(0xFFaf7ac5),
+        Color(0xFF9b59b6),
+        Color(0xFF884ea0),
+        Color(0xFF76448a),
+        Color(0xFF633974),
+        Color(0xFF512e5f),
+        Color(0xFFf4ecf7),
+        Color(0xFFe8daef),
+        Color(0xFFd2b4de),
+        Color(0xFFbb8fce),
+        Color(0xFFa569bd),
+        Color(0xFF8e44ad),
+        Color(0xFF7d3c98),
+        Color(0xFF6c3483),
+        Color(0xFF5b2c6f),
+        Color(0xFF4a235a),
+        Color(0xFFebedef),
+        Color(0xFFd6dbdf),
+        Color(0xFFaeb6bf),
+        Color(0xFF85929e),
+        Color(0xFF5d6d7e),
+        Color(0xFF34495e),
+        Color(0xFF2e4053),
+        Color(0xFF283747),
+        Color(0xFF212f3c),
+        Color(0xFF1b2631),
+        Color(0xFFeaecee),
+        Color(0xFFd5d8dc),
+        Color(0xFFabb2b9),
+        Color(0xFF808b96),
+        Color(0xFF566573),
+        Color(0xFF2c3e50),
+        Color(0xFF273746),
+        Color(0xFF212f3d),
+        Color(0xFF1c2833),
+        Color(0xFF17202a),
+        Color(0xFFfef9e7),
+        Color(0xFFfcf3cf),
+        Color(0xFFf9e79f),
+        Color(0xFFf7dc6f),
+        Color(0xFFf4d03f),
+        Color(0xFFf1c40f),
+        Color(0xFFd4ac0d),
+        Color(0xFFb7950b),
+        Color(0xFF9a7d0a),
+        Color(0xFF7d6608),
+        Color(0xFFfef5e7),
+        Color(0xFFfdebd0),
+        Color(0xFFfad7a0),
+        Color(0xFFf8c471),
+        Color(0xFFf5b041),
+        Color(0xFFf39c12),
+        Color(0xFFd68910),
+        Color(0xFFb9770e),
+        Color(0xFF9c640c),
+        Color(0xFF7e5109),
+        Color(0xFFfdf2e9),
+        Color(0xFFfae5d3),
+        Color(0xFFf5cba7),
+        Color(0xFFf0b27a),
+        Color(0xFFeb984e),
+        Color(0xFFe67e22),
+        Color(0xFFca6f1e),
+        Color(0xFFaf601a),
+        Color(0xFF935116),
+        Color(0xFF784212),
+        Color(0xFFfbeee6),
+        Color(0xFFf6ddcc),
+        Color(0xFFedbb99),
+        Color(0xFFe59866),
+        Color(0xFFdc7633),
+        Color(0xFFd35400),
+        Color(0xFFba4a00),
+        Color(0xFFa04000),
+        Color(0xFF873600),
+        Color(0xFF6e2c00),
+        Color(0xFFfdedec),
+        Color(0xFFfadbd8),
+        Color(0xFFf5b7b1),
+        Color(0xFFf1948a),
+        Color(0xFFec7063),
+        Color(0xFFe74c3c),
+        Color(0xFFcb4335),
+        Color(0xFFb03a2e),
+        Color(0xFF943126),
+        Color(0xFF78281f),
+        Color(0xFFf9ebea),
+        Color(0xFFf2d7d5),
+        Color(0xFFe6b0aa),
+        Color(0xFFd98880),
+        Color(0xFFcd6155),
+        Color(0xFFc0392b),
+        Color(0xFFa93226),
+        Color(0xFF922b21),
+        Color(0xFF7b241c),
+        Color(0xFF641e16),
+    )
+}
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/themes/ThemesScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/display/DisplayScreen.kt
similarity index 54%
rename from feature/settings/src/main/java/com/sadellie/unitto/feature/settings/themes/ThemesScreen.kt
rename to feature/settings/src/main/java/com/sadellie/unitto/feature/settings/display/DisplayScreen.kt
index 22cb2c82..315743e1 100644
--- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/themes/ThemesScreen.kt
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/display/DisplayScreen.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.feature.settings.themes
+package com.sadellie.unitto.feature.settings.display
 
 import android.os.Build
 import androidx.compose.animation.AnimatedVisibility
@@ -24,21 +24,26 @@ import androidx.compose.animation.expandVertically
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.shrinkVertically
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentWidth
-import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Colorize
 import androidx.compose.material.icons.filled.DarkMode
+import androidx.compose.material.icons.filled.ExposureZero
+import androidx.compose.material.icons.filled.FontDownload
+import androidx.compose.material.icons.filled.Language
 import androidx.compose.material.icons.filled.Palette
 import androidx.compose.material.icons.outlined.DarkMode
 import androidx.compose.material.icons.outlined.HdrAuto
 import androidx.compose.material.icons.outlined.LightMode
 import androidx.compose.material3.Icon
-import androidx.compose.material3.ListItem
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
@@ -48,6 +53,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.core.ui.common.Header
 import com.sadellie.unitto.core.ui.common.NavigateUpButton
@@ -62,29 +68,17 @@ import io.github.sadellie.themmo.ThemingMode
 import io.github.sadellie.themmo.Themmo
 import io.github.sadellie.themmo.ThemmoController
 
-private val colorSchemes: List<Color> by lazy {
-    listOf(
-        Color(0xFFF6A1BC),
-        Color(0xFFFDA387),
-        Color(0xFFEAAF60),
-        Color(0xFFC2BD64),
-        Color(0xFF94C78A),
-        Color(0xFF73C9B5),
-        Color(0xFF72C6DA),
-        Color(0xFF8FBEF2),
-        Color(0xFFB6B3F6),
-        Color(0xFFDCA8E4),
-    )
-}
-
 @Composable
-internal fun ThemesRoute(
-    navigateUpAction: () -> Unit = {},
+internal fun DisplayRoute(
+    viewModel: DisplayViewModel = hiltViewModel(),
+    navigateUp: () -> Unit = {},
     themmoController: ThemmoController,
-    viewModel: ThemesViewModel = hiltViewModel()
+    navigateToLanguages: () -> Unit,
 ) {
-    ThemesScreen(
-        navigateUpAction = navigateUpAction,
+    val prefs = viewModel.prefs.collectAsStateWithLifecycle()
+
+    DisplayScreen(
+        navigateUp = navigateUp,
         currentThemingMode = themmoController.currentThemingMode,
         onThemeChange = {
             themmoController.setThemingMode(it)
@@ -94,8 +88,8 @@ internal fun ThemesRoute(
         onDynamicThemeChange = {
             // Prevent old devices from using other monet modes when dynamic theming is on
             if (it) {
-                themmoController.setMonetMode(MonetMode.TONAL_SPOT)
-                viewModel.updateMonetMode(MonetMode.TONAL_SPOT)
+                themmoController.setMonetMode(MonetMode.TonalSpot)
+                viewModel.updateMonetMode(MonetMode.TonalSpot)
             }
             themmoController.enableDynamicTheme(it)
             viewModel.updateDynamicTheme(it)
@@ -114,13 +108,18 @@ internal fun ThemesRoute(
         onMonetModeChange = {
             themmoController.setMonetMode(it)
             viewModel.updateMonetMode(it)
-        }
+        },
+        systemFont = prefs.value.systemFont,
+        updateSystemFont = viewModel::updateSystemFont,
+        middleZero = prefs.value.middleZero,
+        updateMiddleZero = viewModel::updateMiddleZero,
+        navigateToLanguages = navigateToLanguages
     )
 }
 
 @Composable
-private fun ThemesScreen(
-    navigateUpAction: () -> Unit,
+private fun DisplayScreen(
+    navigateUp: () -> Unit,
     currentThemingMode: ThemingMode,
     onThemeChange: (ThemingMode) -> Unit,
     isDynamicThemeEnabled: Boolean,
@@ -130,103 +129,92 @@ private fun ThemesScreen(
     selectedColor: Color,
     onColorChange: (Color) -> Unit,
     monetMode: MonetMode,
-    onMonetModeChange: (MonetMode) -> Unit
+    onMonetModeChange: (MonetMode) -> Unit,
+    systemFont: Boolean,
+    updateSystemFont: (Boolean) -> Unit,
+    middleZero: Boolean,
+    updateMiddleZero: (Boolean) -> Unit,
+    navigateToLanguages: () -> Unit,
 ) {
     UnittoScreenWithLargeTopBar(
-        title = stringResource(R.string.theme_setting),
-        navigationIcon = { NavigateUpButton(navigateUpAction) }
+        title = stringResource(R.string.display_settings),
+        navigationIcon = { NavigateUpButton(navigateUp) }
     ) { paddingValues ->
-        LazyColumn(contentPadding = paddingValues) {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .verticalScroll(rememberScrollState())
+                .padding(paddingValues)
+        ) {
+            UnittoListItem(
+                leadingContent = {
+                    Icon(
+                        Icons.Default.Palette,
+                        stringResource(R.string.color_theme),
+                    )
+                },
+                headlineContent = { Text(stringResource(R.string.color_theme)) },
+                supportingContent = { Text(stringResource(R.string.color_theme_support)) },
+            )
 
-            item {
-                ListItem(
-                    leadingContent = {
-                        Icon(
-                            Icons.Default.Palette,
-                            stringResource(R.string.color_theme),
-                        )
-                    },
-                    headlineContent = { Text(stringResource(R.string.color_theme)) },
-                    supportingContent = { Text(stringResource(R.string.color_theme_support)) },
+            Row(
+                Modifier
+                    .horizontalScroll(rememberScrollState())
+                    .wrapContentWidth()
+            ) {
+                SegmentedButtonsRow(modifier = Modifier.padding(56.dp, 8.dp, 24.dp, 2.dp)) {
+                    SegmentedButton(
+                        label = stringResource(R.string.auto_label),
+                        onClick = { onThemeChange(ThemingMode.AUTO) },
+                        selected = ThemingMode.AUTO == currentThemingMode,
+                        icon = Icons.Outlined.HdrAuto
+                    )
+                    SegmentedButton(
+                        label = stringResource(R.string.force_light_mode),
+                        onClick = { onThemeChange(ThemingMode.FORCE_LIGHT) },
+                        selected = ThemingMode.FORCE_LIGHT == currentThemingMode,
+                        icon = Icons.Outlined.LightMode
+                    )
+                    SegmentedButton(
+                        label = stringResource(R.string.force_dark_mode),
+                        onClick = { onThemeChange(ThemingMode.FORCE_DARK) },
+                        selected = ThemingMode.FORCE_DARK == currentThemingMode,
+                        icon = Icons.Outlined.DarkMode
+                    )
+                }
+            }
+
+            AnimatedVisibility(
+                visible = currentThemingMode != ThemingMode.FORCE_LIGHT,
+                enter = expandVertically() + fadeIn(),
+                exit = shrinkVertically() + fadeOut(),
+            ) {
+                UnittoListItem(
+                    icon = Icons.Default.DarkMode,
+                    iconDescription = stringResource(R.string.force_amoled_mode),
+                    headlineText = stringResource(R.string.force_amoled_mode),
+                    supportingText = stringResource(R.string.force_amoled_mode_support),
+                    switchState = isAmoledThemeEnabled,
+                    onSwitchChange = onAmoledThemeChange
                 )
             }
 
-            item {
-                Row(
-                    Modifier
-                        .horizontalScroll(rememberScrollState())
-                        .wrapContentWidth()
-                ) {
-                    SegmentedButtonsRow(modifier = Modifier.padding(56.dp, 8.dp, 24.dp, 2.dp)) {
-                        SegmentedButton(
-                            label = stringResource(R.string.auto_label),
-                            onClick = { onThemeChange(ThemingMode.AUTO) },
-                            selected = ThemingMode.AUTO == currentThemingMode,
-                            icon = Icons.Outlined.HdrAuto
-                        )
-                        SegmentedButton(
-                            label = stringResource(R.string.force_light_mode),
-                            onClick = { onThemeChange(ThemingMode.FORCE_LIGHT) },
-                            selected = ThemingMode.FORCE_LIGHT == currentThemingMode,
-                            icon = Icons.Outlined.LightMode
-                        )
-                        SegmentedButton(
-                            label = stringResource(R.string.force_dark_mode),
-                            onClick = { onThemeChange(ThemingMode.FORCE_DARK) },
-                            selected = ThemingMode.FORCE_DARK == currentThemingMode,
-                            icon = Icons.Outlined.DarkMode
-                        )
-                    }
-                }
-            }
-
-            item {
-                AnimatedVisibility(
-                    visible = currentThemingMode != ThemingMode.FORCE_LIGHT,
-                    enter = expandVertically() + fadeIn(),
-                    exit = shrinkVertically() + fadeOut(),
-                ) {
-                    UnittoListItem(
-                        leadingContent = {
-                            Icon(
-                                Icons.Default.DarkMode,
-                                stringResource(R.string.force_amoled_mode),
-                            )
-                        },
-                        label = stringResource(R.string.force_amoled_mode),
-                        supportContent = stringResource(R.string.force_amoled_mode_support),
-                        switchState = isAmoledThemeEnabled,
-                        onSwitchChange = onAmoledThemeChange
-                    )
-                }
-            }
-
-            item { Header(stringResource(R.string.color_scheme)) }
-
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-                item {
-                    UnittoListItem(
-                        leadingContent = {
-                            Icon(
-                                Icons.Default.Colorize,
-                                stringResource(R.string.enable_dynamic_colors),
-                            )
-                        },
-                        label = stringResource(R.string.enable_dynamic_colors),
-                        supportContent = stringResource(R.string.enable_dynamic_colors_support),
-                        switchState = isDynamicThemeEnabled,
-                        onSwitchChange = onDynamicThemeChange
-                    )
-                }
-            }
+                UnittoListItem(
+                    icon = Icons.Default.Colorize,
+                    iconDescription = stringResource(R.string.enable_dynamic_colors),
+                    headlineText = stringResource(R.string.enable_dynamic_colors),
+                    supportingText = stringResource(R.string.enable_dynamic_colors_support),
+                    switchState = isDynamicThemeEnabled,
+                    onSwitchChange = onDynamicThemeChange
+                )
 
-            item {
                 AnimatedVisibility(
                     visible = !isDynamicThemeEnabled,
                     enter = expandVertically() + fadeIn(),
                     exit = shrinkVertically() + fadeOut(),
                 ) {
-                    ListItem(
+                    UnittoListItem(
                         headlineContent = { Text(stringResource(R.string.selected_color)) },
                         supportingContent = {
                             ColorSelector(
@@ -237,18 +225,16 @@ private fun ThemesScreen(
                                 defaultColor = Color(0xFF186c31)
                             )
                         },
-                        modifier = Modifier.padding(start = 40.dp)
+                        modifier = Modifier.padding(start = 40.dp),
                     )
                 }
-            }
 
-            item {
                 AnimatedVisibility(
                     visible = (!isDynamicThemeEnabled) and (selectedColor != Color.Unspecified),
                     enter = expandVertically() + fadeIn(),
                     exit = shrinkVertically() + fadeOut(),
                 ) {
-                    ListItem(
+                    UnittoListItem(
                         headlineContent = { Text(stringResource(R.string.monet_mode)) },
                         supportingContent = {
                             MonetModeSelector(
@@ -264,6 +250,34 @@ private fun ThemesScreen(
                     )
                 }
             }
+
+            Header(stringResource(R.string.additional_settings_group))
+
+            UnittoListItem(
+                icon = Icons.Default.FontDownload,
+                iconDescription = stringResource(R.string.system_font_setting),
+                headlineText = stringResource(R.string.system_font_setting),
+                supportingText = stringResource(R.string.system_font_setting_support),
+                switchState = systemFont,
+                onSwitchChange = updateSystemFont
+            )
+
+            UnittoListItem(
+                icon = Icons.Default.ExposureZero,
+                iconDescription = stringResource(R.string.middle_zero_option),
+                headlineText = stringResource(R.string.middle_zero_option),
+                supportingText = stringResource(R.string.middle_zero_option_support),
+                switchState = middleZero,
+                onSwitchChange = updateMiddleZero
+            )
+
+            UnittoListItem(
+                icon = Icons.Default.Language,
+                iconDescription = stringResource(R.string.language_setting),
+                headlineText = stringResource(R.string.language_setting),
+                supportingText = stringResource(R.string.language_setting_support),
+                modifier = Modifier.clickable { navigateToLanguages() }
+            )
         }
     }
 }
@@ -272,8 +286,8 @@ private fun ThemesScreen(
 @Composable
 private fun Preview() {
     Themmo { themmoController ->
-        ThemesScreen(
-            navigateUpAction = {},
+        DisplayScreen(
+            navigateUp = {},
             currentThemingMode = themmoController.currentThemingMode,
             onThemeChange = themmoController::setThemingMode,
             isDynamicThemeEnabled = themmoController.isDynamicThemeEnabled,
@@ -283,7 +297,12 @@ private fun Preview() {
             selectedColor = themmoController.currentCustomColor,
             onColorChange = themmoController::setCustomColor,
             monetMode = themmoController.currentMonetMode,
-            onMonetModeChange = themmoController::setMonetMode
+            onMonetModeChange = themmoController::setMonetMode,
+            systemFont = false,
+            updateSystemFont = {},
+            middleZero = false,
+            updateMiddleZero = {},
+            navigateToLanguages = {}
         )
     }
 }
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/themes/ThemesViewModel.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/display/DisplayViewModel.kt
similarity index 78%
rename from feature/settings/src/main/java/com/sadellie/unitto/feature/settings/themes/ThemesViewModel.kt
rename to feature/settings/src/main/java/com/sadellie/unitto/feature/settings/display/DisplayViewModel.kt
index d28bb490..1b0d8fb0 100644
--- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/themes/ThemesViewModel.kt
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/display/DisplayViewModel.kt
@@ -16,11 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.feature.settings.themes
+package com.sadellie.unitto.feature.settings.display
 
 import androidx.compose.ui.graphics.Color
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.sadellie.unitto.data.common.stateIn
+import com.sadellie.unitto.data.userprefs.DisplayPreferences
 import com.sadellie.unitto.data.userprefs.UserPreferencesRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import io.github.sadellie.themmo.MonetMode
@@ -29,10 +31,13 @@ import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
-class ThemesViewModel @Inject constructor(
+class DisplayViewModel @Inject constructor(
     private val userPrefsRepository: UserPreferencesRepository
 ) : ViewModel() {
 
+    val prefs = userPrefsRepository.displayPrefs
+        .stateIn(viewModelScope, DisplayPreferences())
+
     /**
      * @see UserPreferencesRepository.updateThemingMode
      */
@@ -77,4 +82,17 @@ class ThemesViewModel @Inject constructor(
             userPrefsRepository.updateMonetMode(monetMode)
         }
     }
+
+    /**
+     * @see UserPreferencesRepository.updateSystemFont
+     */
+    fun updateSystemFont(enabled: Boolean) {
+        viewModelScope.launch {
+            userPrefsRepository.updateSystemFont(enabled)
+        }
+    }
+
+    fun updateMiddleZero(enabled: Boolean) = viewModelScope.launch {
+        userPrefsRepository.updateMiddleZero(enabled)
+    }
 }
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/formatting/FormattingScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/formatting/FormattingScreen.kt
index a9929b51..cce34705 100644
--- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/formatting/FormattingScreen.kt
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/formatting/FormattingScreen.kt
@@ -34,7 +34,6 @@ import androidx.compose.material.icons.filled.Architecture
 import androidx.compose.material.icons.filled.EMobiledata
 import androidx.compose.material.icons.filled._123
 import androidx.compose.material3.Icon
-import androidx.compose.material3.ListItem
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -58,11 +57,12 @@ import com.sadellie.unitto.core.base.Separator
 import com.sadellie.unitto.core.ui.common.NavigateUpButton
 import com.sadellie.unitto.core.ui.common.SegmentedButton
 import com.sadellie.unitto.core.ui.common.SegmentedButtonsRow
+import com.sadellie.unitto.core.ui.common.UnittoListItem
 import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar
 import com.sadellie.unitto.core.ui.common.UnittoSlider
 import com.sadellie.unitto.core.ui.common.squashable
 import com.sadellie.unitto.core.ui.common.textfield.formatExpression
-import com.sadellie.unitto.core.ui.theme.NumbersTextStyleDisplayMedium
+import com.sadellie.unitto.core.ui.theme.numbersDisplayMedium
 import kotlin.math.roundToInt
 
 @Composable
@@ -135,7 +135,7 @@ fun FormattingScreen(
                     )
                     Text(
                         text = uiState.preview,
-                        style = NumbersTextStyleDisplayMedium,
+                        style = MaterialTheme.typography.numbersDisplayMedium,
                         maxLines = 1,
                         modifier = Modifier
                             .fillMaxWidth()
@@ -147,7 +147,7 @@ fun FormattingScreen(
             }
 
             item("precision_label") {
-                ListItem(
+                UnittoListItem(
                     leadingContent = {
                         Icon(Icons.Default.Architecture, stringResource(R.string.precision_setting))
                     },
@@ -176,7 +176,7 @@ fun FormattingScreen(
             }
 
             item("separator_label") {
-                ListItem(
+                UnittoListItem(
                     leadingContent = {
                         Icon(Icons.Default._123, stringResource(R.string.precision_setting))
                     },
@@ -213,7 +213,7 @@ fun FormattingScreen(
             }
 
             item("output_format_label") {
-                ListItem(
+                UnittoListItem(
                     leadingContent = {
                         Icon(Icons.Default.EMobiledata, stringResource(R.string.precision_setting))
                     },
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/formatting/FormattingViewModel.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/formatting/FormattingViewModel.kt
index a72de138..a65e46d2 100644
--- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/formatting/FormattingViewModel.kt
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/formatting/FormattingViewModel.kt
@@ -25,14 +25,13 @@ import com.sadellie.unitto.core.ui.common.textfield.AllFormatterSymbols
 import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols
 import com.sadellie.unitto.core.ui.common.textfield.formatExpression
 import com.sadellie.unitto.data.common.setMinimumRequiredScale
+import com.sadellie.unitto.data.common.stateIn
 import com.sadellie.unitto.data.common.toStringWith
 import com.sadellie.unitto.data.common.trimZeros
 import com.sadellie.unitto.data.userprefs.UserPreferencesRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import java.math.BigDecimal
@@ -43,10 +42,10 @@ import kotlin.math.ceil
 class FormattingViewModel @Inject constructor(
     private val userPreferencesRepository: UserPreferencesRepository
 ) : ViewModel() {
-    private val _mainPreferences = userPreferencesRepository.mainPreferencesFlow
+    private val _prefs = userPreferencesRepository.formattingPrefs
     private val _fractional = MutableStateFlow(false)
 
-    val uiState = combine(_mainPreferences, _fractional) { mainPrefs, fractional ->
+    val uiState = combine(_prefs, _fractional) { mainPrefs, fractional ->
         val formatterSymbols = AllFormatterSymbols.getById(mainPrefs.separator)
 
         return@combine FormattingUIState(
@@ -62,7 +61,7 @@ class FormattingViewModel @Inject constructor(
             formatterSymbols = formatterSymbols
         )
     }
-        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000L), FormattingUIState())
+        .stateIn(viewModelScope, FormattingUIState())
 
     fun togglePreview() = _fractional.update { !it }
 
@@ -88,29 +87,23 @@ class FormattingViewModel @Inject constructor(
     /**
      * @see UserPreferencesRepository.updateDigitsPrecision
      */
-    fun updatePrecision(precision: Int) {
-        viewModelScope.launch {
-            // In UI the slider for precision goes from 0 to 16, where 16 is treated as 1000 (MAX)
-            val newPrecision = if (precision > 15) MAX_PRECISION else precision
-            userPreferencesRepository.updateDigitsPrecision(newPrecision)
-        }
+    fun updatePrecision(precision: Int) = viewModelScope.launch {
+        // In UI the slider for precision goes from 0 to 16, where 16 is treated as 1000 (MAX)
+        val newPrecision = if (precision > 15) MAX_PRECISION else precision
+        userPreferencesRepository.updateDigitsPrecision(newPrecision)
     }
 
     /**
      * @see UserPreferencesRepository.updateSeparator
      */
-    fun updateSeparator(separator: Int) {
-        viewModelScope.launch {
-            userPreferencesRepository.updateSeparator(separator)
-        }
+    fun updateSeparator(separator: Int) = viewModelScope.launch {
+        userPreferencesRepository.updateSeparator(separator)
     }
 
     /**
      * @see UserPreferencesRepository.updateOutputFormat
      */
-    fun updateOutputFormat(outputFormat: Int) {
-        viewModelScope.launch {
-            userPreferencesRepository.updateOutputFormat(outputFormat)
-        }
+    fun updateOutputFormat(outputFormat: Int) = viewModelScope.launch {
+        userPreferencesRepository.updateOutputFormat(outputFormat)
     }
 }
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/language/LanguageScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/language/LanguageScreen.kt
new file mode 100644
index 00000000..8c155881
--- /dev/null
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/language/LanguageScreen.kt
@@ -0,0 +1,154 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.feature.settings.language
+
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+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.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Translate
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.RadioButton
+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.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.core.os.LocaleListCompat
+import com.sadellie.unitto.core.base.R
+import com.sadellie.unitto.core.ui.common.NavigateUpButton
+import com.sadellie.unitto.core.ui.common.UnittoListItem
+import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar
+import com.sadellie.unitto.core.ui.common.squashable
+import com.sadellie.unitto.core.ui.openLink
+
+@Composable
+internal fun LanguageRoute(
+    navigateUp: () -> Unit,
+) {
+    LanguageScreen(
+        navigateUp = navigateUp
+    )
+}
+
+@Composable
+private fun LanguageScreen(
+    navigateUp: () -> Unit,
+) {
+    val mContext = LocalContext.current
+    val currentLangKey by remember {
+        mutableStateOf(AppCompatDelegate.getApplicationLocales().toLanguageTags())
+    }
+
+    fun changeLanguage(langKey: String) {
+        val selectedLocale = if (langKey == "") LocaleListCompat.getEmptyLocaleList()
+        else LocaleListCompat.forLanguageTags(langKey)
+
+        AppCompatDelegate.setApplicationLocales(selectedLocale)
+        navigateUp()
+    }
+
+    UnittoScreenWithLargeTopBar(
+        title = stringResource(R.string.language_setting),
+        navigationIcon = { NavigateUpButton(navigateUp) }
+    ) { padding ->
+        LazyColumn(contentPadding = padding) {
+            item("translate") {
+                Box(Modifier.padding(16.dp, 8.dp)) {
+                    Row(
+                        modifier = Modifier
+                            .squashable(
+                                onClick = {
+                                    openLink(mContext, "https://poeditor.com/join/project/T4zjmoq8dx")
+                                },
+                                interactionSource = remember { MutableInteractionSource() },
+                                cornerRadiusRange = 15..50
+                            )
+                            .background(MaterialTheme.colorScheme.secondaryContainer)
+                            .padding(16.dp, 4.dp),
+                        horizontalArrangement = Arrangement.spacedBy(16.dp),
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        Icon(
+                            imageVector = Icons.Default.Translate,
+                            contentDescription = stringResource(R.string.translate_app),
+                            modifier = Modifier.size(24.dp),
+                            tint = MaterialTheme.colorScheme.onSurfaceVariant
+                        )
+                        Column(
+                            Modifier
+                                .weight(1f)
+                                .padding(vertical = 8.dp)) {
+                            Text(
+                                text = stringResource(R.string.translate_app),
+                                style = MaterialTheme.typography.bodyLarge,
+                                color = MaterialTheme.colorScheme.onSecondaryContainer,
+                            )
+                            Text(
+                                text = stringResource(R.string.translate_app_support),
+                                style = MaterialTheme.typography.bodyMedium,
+                                color = MaterialTheme.colorScheme.onSecondaryContainer,
+                            )
+                        }
+                    }
+                }
+            }
+
+            languages.forEach { (key, res) ->
+                item(key) {
+                    UnittoListItem(
+                        modifier = Modifier.clickable { changeLanguage(key) },
+                        headlineContent = {
+                            Text(stringResource(res))
+                        },
+                        leadingContent = {
+                            RadioButton(
+                                selected = currentLangKey == key,
+                                onClick = { changeLanguage(key) }
+                            )
+                        }
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+fun LanguageScreenPreview() {
+    LanguageScreen(
+        navigateUp = {}
+    )
+}
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/language/Languages.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/language/Languages.kt
new file mode 100644
index 00000000..cae737d6
--- /dev/null
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/language/Languages.kt
@@ -0,0 +1,38 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.feature.settings.language
+
+import com.sadellie.unitto.core.base.R
+
+internal val languages by lazy {
+    mapOf(
+        "" to R.string.system,
+        "en" to R.string.locale_en,
+        "en-GB" to R.string.locale_en_rGB,
+        "de" to R.string.locale_de,
+        "es" to R.string.locale_es,
+        "fr" to R.string.locale_fr,
+        "hu" to R.string.locale_hu,
+        "id" to R.string.locale_in,
+        "it" to R.string.locale_it,
+        "nl" to R.string.locale_nl,
+        "ru" to R.string.locale_ru,
+        "tr" to R.string.locale_tr,
+    )
+}
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/navigation/SettingsNavigation.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/navigation/SettingsNavigation.kt
index 89e92de4..26a1cb4c 100644
--- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/navigation/SettingsNavigation.kt
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/navigation/SettingsNavigation.kt
@@ -21,25 +21,33 @@ package com.sadellie.unitto.feature.settings.navigation
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.navigation
 import androidx.navigation.navDeepLink
 import com.sadellie.unitto.core.base.TopLevelDestinations
-import com.sadellie.unitto.feature.settings.AboutScreen
-import com.sadellie.unitto.feature.settings.SettingsScreen
-import com.sadellie.unitto.feature.settings.ThirdPartyLicensesScreen
+import com.sadellie.unitto.core.ui.unittoComposable
+import com.sadellie.unitto.core.ui.unittoNavigation
+import com.sadellie.unitto.feature.settings.SettingsRoute
+import com.sadellie.unitto.feature.settings.about.AboutRoute
+import com.sadellie.unitto.feature.settings.calculator.CalculatorSettingsRoute
+import com.sadellie.unitto.feature.settings.converter.ConverterSettingsRoute
+import com.sadellie.unitto.feature.settings.display.DisplayRoute
 import com.sadellie.unitto.feature.settings.formatting.FormattingRoute
-import com.sadellie.unitto.feature.settings.themes.ThemesRoute
+import com.sadellie.unitto.feature.settings.language.LanguageRoute
+import com.sadellie.unitto.feature.settings.startingscreen.StartingScreenRoute
+import com.sadellie.unitto.feature.settings.thirdparty.ThirdPartyLicensesScreen
 import com.sadellie.unitto.feature.settings.unitgroups.UnitGroupsScreen
 import io.github.sadellie.themmo.ThemmoController
 
 private val graph = TopLevelDestinations.Settings.graph
 private val start = TopLevelDestinations.Settings.start
-internal const val themesRoute = "themes_route"
+internal const val displayRoute = "display_route"
+internal const val languageRoute = "language_route"
+internal const val startingScreenRoute = "starting_screen_route"
 internal const val unitsGroupRoute = "units_group_route"
 internal const val thirdPartyRoute = "third_party_route"
 internal const val aboutRoute = "about_route"
 internal const val formattingRoute = "formatting_route"
+internal const val calculatorSettingsRoute = "calculator_settings_route"
+internal const val converterSettingsRoute = "converter_settings_route"
 
 fun NavController.navigateToSettings() {
     navigate(TopLevelDestinations.Settings.start)
@@ -51,51 +59,77 @@ fun NavController.navigateToUnitGroups() {
 
 fun NavGraphBuilder.settingGraph(
     themmoController: ThemmoController,
-    navController: NavHostController
+    navController: NavHostController,
 ) {
-    navigation(
+    unittoNavigation(
         startDestination = start,
         route = graph,
         deepLinks = listOf(
             navDeepLink { uriPattern = "app://com.sadellie.unitto/$graph" }
         )
     ) {
-        composable(start) {
-            SettingsScreen(
-                menuButtonClick = navController::navigateUp,
+        unittoComposable(start) {
+            SettingsRoute(
+                navigateUp = navController::navigateUp,
                 navControllerAction = navController::navigate
             )
         }
 
-        composable(themesRoute) {
-            ThemesRoute(
-                navigateUpAction = navController::navigateUp,
+        unittoComposable(displayRoute) {
+            DisplayRoute(
+                navigateUp = navController::navigateUp,
                 themmoController = themmoController,
+                navigateToLanguages = { navController.navigate(languageRoute) }
             )
         }
 
-        composable(thirdPartyRoute) {
-            ThirdPartyLicensesScreen(
+        unittoComposable(languageRoute) {
+            LanguageRoute(
+                navigateUp = navController::navigateUp,
+            )
+        }
+
+        unittoComposable(startingScreenRoute) {
+            StartingScreenRoute(
+                navigateUp = navController::navigateUp,
+            )
+        }
+
+        unittoComposable(formattingRoute) {
+            FormattingRoute(
+                navigateUpAction = navController::navigateUp
+            )
+        }
+
+        unittoComposable(calculatorSettingsRoute) {
+            CalculatorSettingsRoute(
                 navigateUpAction = navController::navigateUp,
             )
         }
 
-        composable(aboutRoute) {
-            AboutScreen(
+        unittoComposable(converterSettingsRoute) {
+            ConverterSettingsRoute(
                 navigateUpAction = navController::navigateUp,
-                navigateToThirdParty = { navController.navigate(thirdPartyRoute) },
+                navigateToUnitsGroup = { navController.navigate(unitsGroupRoute) }
             )
         }
 
-        composable(unitsGroupRoute) {
+        unittoComposable(unitsGroupRoute) {
             UnitGroupsScreen(
                 navigateUpAction = navController::navigateUp,
             )
         }
 
-        composable(formattingRoute) {
-            FormattingRoute(
-                navigateUpAction = navController::navigateUp
+        unittoComposable(aboutRoute) {
+            AboutRoute(
+                navigateUpAction = navController::navigateUp,
+                navigateToThirdParty = { navController.navigate(thirdPartyRoute) }
+            )
+        }
+
+        unittoComposable(thirdPartyRoute) {
+            ThirdPartyLicensesScreen(
+                navigateUpAction = navController::navigateUp,
             )
         }
     }
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/startingscreen/StartingScreenScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/startingscreen/StartingScreenScreen.kt
new file mode 100644
index 00000000..e0983403
--- /dev/null
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/startingscreen/StartingScreenScreen.kt
@@ -0,0 +1,120 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.feature.settings.startingscreen
+
+import android.os.Build
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.AppShortcut
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.RadioButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.sadellie.unitto.core.base.R
+import com.sadellie.unitto.core.base.Shortcut
+import com.sadellie.unitto.core.base.TOP_LEVEL_DESTINATIONS
+import com.sadellie.unitto.core.base.TopLevelDestinations
+import com.sadellie.unitto.core.ui.addShortcut
+import com.sadellie.unitto.core.ui.common.NavigateUpButton
+import com.sadellie.unitto.core.ui.common.UnittoListItem
+import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar
+
+@Composable
+internal fun StartingScreenRoute(
+    viewModel: StartingScreenViewModel = hiltViewModel(),
+    navigateUp: () -> Unit
+) {
+    val prefs = viewModel.prefs.collectAsStateWithLifecycle()
+
+    StartingScreenScreen(
+        startingScreen = prefs.value.startingScreen,
+        updateStartingScreen = viewModel::updateStartingScreen,
+        navigateUp = navigateUp
+    )
+}
+
+@Composable
+private fun StartingScreenScreen(
+    startingScreen: String,
+    updateStartingScreen: (String) -> Unit,
+    navigateUp: () -> Unit
+) {
+    val mContext = LocalContext.current
+
+    UnittoScreenWithLargeTopBar(
+        title = stringResource(R.string.starting_screen_setting),
+        navigationIcon = { NavigateUpButton(navigateUp) }
+    ) { padding ->
+        LazyColumn(contentPadding = padding) {
+
+            TOP_LEVEL_DESTINATIONS.forEach { destination ->
+                item {
+                    UnittoListItem(
+                        modifier = Modifier.clickable { updateStartingScreen(destination.graph) },
+                        headlineContent = {
+                            Text(stringResource(destination.name))
+                        },
+                        leadingContent = {
+                            RadioButton(
+                                selected = destination.graph == startingScreen,
+                                onClick = { updateStartingScreen(destination.graph) }
+                            )
+                        },
+                        trailingContent = {
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+                                IconButton(
+                                    onClick = {
+                                        destination.shortcut?.let { shortcut: Shortcut ->
+                                            mContext.addShortcut(
+                                                destination.graph,
+                                                shortcut.shortcutShortLabel,
+                                                shortcut.shortcutLongLabel,
+                                                shortcut.shortcutDrawable
+                                            )
+                                        }
+                                    }
+                                ) {
+                                    Icon(Icons.Default.AppShortcut, null)
+                                }
+                            }
+                        }
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun StartingScreenPreview() {
+    StartingScreenScreen(
+        startingScreen = TopLevelDestinations.Converter.graph,
+        updateStartingScreen = {},
+        navigateUp = {}
+    )
+}
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/startingscreen/StartingScreenViewModel.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/startingscreen/StartingScreenViewModel.kt
new file mode 100644
index 00000000..45b61526
--- /dev/null
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/startingscreen/StartingScreenViewModel.kt
@@ -0,0 +1,40 @@
+/*
+ * Unitto is a unit converter for Android
+ * Copyright (c) 2023 Elshan Agaev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sadellie.unitto.feature.settings.startingscreen
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.sadellie.unitto.data.common.stateIn
+import com.sadellie.unitto.data.userprefs.StartingScreenPreferences
+import com.sadellie.unitto.data.userprefs.UserPreferencesRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+internal class StartingScreenViewModel @Inject constructor(
+    private val userPrefsRepository: UserPreferencesRepository,
+) : ViewModel() {
+    val prefs = userPrefsRepository.startingScreenPrefs
+        .stateIn(viewModelScope, StartingScreenPreferences())
+
+    fun updateStartingScreen(startingScreen: String) = viewModelScope.launch {
+        userPrefsRepository.updateStartingScreen(startingScreen)
+    }
+}
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/ThirdPartyLicensesScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/thirdparty/ThirdPartyLicensesScreen.kt
similarity index 98%
rename from feature/settings/src/main/java/com/sadellie/unitto/feature/settings/ThirdPartyLicensesScreen.kt
rename to feature/settings/src/main/java/com/sadellie/unitto/feature/settings/thirdparty/ThirdPartyLicensesScreen.kt
index 2bba1fe2..fc1a3311 100644
--- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/ThirdPartyLicensesScreen.kt
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/thirdparty/ThirdPartyLicensesScreen.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.feature.settings
+package com.sadellie.unitto.feature.settings.thirdparty
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/unitgroups/UnitGroupsScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/unitgroups/UnitGroupsScreen.kt
index 6956c7ed..af314a15 100644
--- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/unitgroups/UnitGroupsScreen.kt
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/unitgroups/UnitGroupsScreen.kt
@@ -61,7 +61,7 @@ import org.burnoutcrew.reorderable.reorderable
 @Composable
 internal fun UnitGroupsScreen(
     viewModel: UnitGroupsViewModel = hiltViewModel(),
-    navigateUpAction: () -> Unit
+    navigateUpAction: () -> Unit,
 ) {
     UnittoScreenWithLargeTopBar(
         title = stringResource(R.string.unit_groups_setting),
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/unitgroups/UnitGroupsViewModel.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/unitgroups/UnitGroupsViewModel.kt
index 229f6119..4116b704 100644
--- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/unitgroups/UnitGroupsViewModel.kt
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/unitgroups/UnitGroupsViewModel.kt
@@ -87,7 +87,7 @@ class UnitGroupsViewModel @Inject constructor(
     init {
         viewModelScope.launch {
             unitGroupsRepository.updateShownGroups(
-                userPrefsRepository.mainPreferencesFlow.first().shownUnitGroups
+                userPrefsRepository.unitGroupsPrefs.first().shownUnitGroups
             )
         }
     }
diff --git a/feature/timezone/build.gradle.kts b/feature/timezone/build.gradle.kts
index b0bcd246..a1603106 100644
--- a/feature/timezone/build.gradle.kts
+++ b/feature/timezone/build.gradle.kts
@@ -28,13 +28,13 @@ android {
 }
 
 dependencies {
-    testImplementation(libs.junit)
+    testImplementation(libs.junit.junit)
     implementation(libs.com.github.sadellie.themmo)
-    implementation(libs.org.burnoutcrew.composereorderable)
+    implementation(libs.org.burnoutcrew.composereorderable.reorderable)
 
-    implementation(project(mapOf("path" to ":data:common")))
-    implementation(project(mapOf("path" to ":data:userprefs")))
-    implementation(project(mapOf("path" to ":data:database")))
-    implementation(project(mapOf("path" to ":data:timezone")))
-    implementation(project(mapOf("path" to ":data:model")))
+    implementation(project(":data:common"))
+    implementation(project(":data:userprefs"))
+    implementation(project(":data:database"))
+    implementation(project(":data:timezone"))
+    implementation(project(":data:model"))
 }
diff --git a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/AddTimeZoneScreen.kt b/feature/timezone/src/main/java/com/sadellie/unitto/timezone/AddTimeZoneScreen.kt
index 73286280..11f41f5c 100644
--- a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/AddTimeZoneScreen.kt
+++ b/feature/timezone/src/main/java/com/sadellie/unitto/timezone/AddTimeZoneScreen.kt
@@ -40,6 +40,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -83,7 +84,7 @@ internal fun AddTimeZoneRoute(
 fun AddTimeZoneScreen(
     uiState: AddTimeZoneUIState,
     navigateUp: () -> Unit,
-    onQueryChange: (String) -> Unit,
+    onQueryChange: (TextFieldValue) -> Unit,
     addToFavorites: (UnittoTimeZone) -> Unit,
 ) {
     val listState = rememberLazyListState()
diff --git a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/AddTimeZoneUIState.kt b/feature/timezone/src/main/java/com/sadellie/unitto/timezone/AddTimeZoneUIState.kt
index affe3222..6b997383 100644
--- a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/AddTimeZoneUIState.kt
+++ b/feature/timezone/src/main/java/com/sadellie/unitto/timezone/AddTimeZoneUIState.kt
@@ -18,11 +18,12 @@
 
 package com.sadellie.unitto.timezone
 
+import androidx.compose.ui.text.input.TextFieldValue
 import com.sadellie.unitto.data.model.UnittoTimeZone
 import java.time.ZonedDateTime
 
 data class AddTimeZoneUIState(
-    val query: String = "",
+    val query: TextFieldValue = TextFieldValue(),
     val list: List<UnittoTimeZone> = emptyList(),
     val userTime: ZonedDateTime? = null,
 )
diff --git a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/AddTimeZoneViewModel.kt b/feature/timezone/src/main/java/com/sadellie/unitto/timezone/AddTimeZoneViewModel.kt
index c37032a2..73c2778f 100644
--- a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/AddTimeZoneViewModel.kt
+++ b/feature/timezone/src/main/java/com/sadellie/unitto/timezone/AddTimeZoneViewModel.kt
@@ -18,6 +18,7 @@
 
 package com.sadellie.unitto.timezone
 
+import androidx.compose.ui.text.input.TextFieldValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.sadellie.unitto.data.model.UnittoTimeZone
@@ -39,7 +40,7 @@ class AddTimeZoneViewModel @Inject constructor(
 ) : ViewModel() {
 
     private val _userTime = MutableStateFlow<ZonedDateTime?>(ZonedDateTime.now())
-    private val _query = MutableStateFlow("")
+    private val _query = MutableStateFlow(TextFieldValue())
 
     private val _filteredTimeZones = MutableStateFlow(emptyList<UnittoTimeZone>())
     val addTimeZoneUIState = combine(
@@ -56,9 +57,9 @@ class AddTimeZoneViewModel @Inject constructor(
         viewModelScope, SharingStarted.WhileSubscribed(5000), AddTimeZoneUIState()
     )
 
-    fun onQueryChange(query: String) {
+    fun onQueryChange(query: TextFieldValue) {
         _query.update { query }
-        filterTimeZones(query)
+        filterTimeZones(query.text)
     }
 
     private fun filterTimeZones(query: String = "") = viewModelScope.launch {
diff --git a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/TimeZoneScreen.kt b/feature/timezone/src/main/java/com/sadellie/unitto/timezone/TimeZoneScreen.kt
index d28a465b..55ae0560 100644
--- a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/TimeZoneScreen.kt
+++ b/feature/timezone/src/main/java/com/sadellie/unitto/timezone/TimeZoneScreen.kt
@@ -85,7 +85,7 @@ import com.sadellie.unitto.core.ui.common.UnittoScreenWithTopBar
 import com.sadellie.unitto.core.ui.common.squashable
 import com.sadellie.unitto.core.ui.datetime.UnittoDateTimeFormatter
 import com.sadellie.unitto.core.ui.datetime.formatLocal
-import com.sadellie.unitto.core.ui.theme.AppTypography
+import com.sadellie.unitto.core.ui.theme.TypographyUnitto
 import com.sadellie.unitto.core.ui.theme.DarkThemeColors
 import com.sadellie.unitto.core.ui.theme.LightThemeColors
 import com.sadellie.unitto.data.model.UnittoTimeZone
@@ -355,7 +355,7 @@ fun PreviewTimeZoneScreen() {
             lightColorScheme = LightThemeColors,
             darkColorScheme = DarkThemeColors,
         ),
-        typography = AppTypography,
+        typography = TypographyUnitto,
     ) {
         TimeZoneScreen(
             uiState = TimeZoneUIState(
diff --git a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/navigation/TimeZoneNavigation.kt b/feature/timezone/src/main/java/com/sadellie/unitto/timezone/navigation/TimeZoneNavigation.kt
index e4811c2d..ff992ec5 100644
--- a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/navigation/TimeZoneNavigation.kt
+++ b/feature/timezone/src/main/java/com/sadellie/unitto/timezone/navigation/TimeZoneNavigation.kt
@@ -22,11 +22,11 @@ import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.NavType
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.navigation
 import androidx.navigation.navArgument
 import androidx.navigation.navDeepLink
 import com.sadellie.unitto.core.base.TopLevelDestinations
+import com.sadellie.unitto.core.ui.unittoComposable
+import com.sadellie.unitto.core.ui.unittoNavigation
 import com.sadellie.unitto.timezone.AddTimeZoneRoute
 import com.sadellie.unitto.timezone.TimeZoneRoute
 import java.time.ZonedDateTime
@@ -52,14 +52,14 @@ fun NavGraphBuilder.timeZoneGraph(
     navigateToSettings: () -> Unit,
     navController: NavHostController,
 ) {
-    navigation(
+    unittoNavigation(
         startDestination = start,
         route = graph,
         deepLinks = listOf(
             navDeepLink { uriPattern = "app://com.sadellie.unitto/$graph" }
         )
     ) {
-        composable(start) {
+        unittoComposable(start) {
             TimeZoneRoute(
                 navigateToMenu = navigateToMenu,
                 navigateToSettings = navigateToSettings,
@@ -67,7 +67,7 @@ fun NavGraphBuilder.timeZoneGraph(
             )
         }
 
-        composable(
+        unittoComposable(
             route = "$ADD_TIME_ZONE_ROUTE/{$USER_TIME_ARG}",
             arguments = listOf(
                 navArgument(USER_TIME_ARG) {
diff --git a/feature/unitslist/.gitignore b/feature/unitslist/.gitignore
deleted file mode 100644
index 42afabfd..00000000
--- a/feature/unitslist/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/feature/unitslist/build.gradle.kts b/feature/unitslist/build.gradle.kts
deleted file mode 100644
index 065310e6..00000000
--- a/feature/unitslist/build.gradle.kts
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-* Unitto is a unit converter for Android
-* Copyright (c) 2023 Elshan Agaev
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-plugins {
-    id("unitto.library")
-    id("unitto.library.compose")
-    id("unitto.library.feature")
-    id("unitto.android.hilt")
-}
-
-android {
-    namespace = "com.sadellie.unitto.feature.unitslist"
-}
-
-dependencies {
-    implementation(project(mapOf("path" to ":data:model")))
-    implementation(project(mapOf("path" to ":data:userprefs")))
-    implementation(project(mapOf("path" to ":data:units")))
-    implementation(project(mapOf("path" to ":data:database")))
-}
\ No newline at end of file
diff --git a/feature/unitslist/consumer-rules.pro b/feature/unitslist/consumer-rules.pro
deleted file mode 100644
index e69de29b..00000000
diff --git a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/LeftSideScreen.kt b/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/LeftSideScreen.kt
deleted file mode 100644
index 6df6b26c..00000000
--- a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/LeftSideScreen.kt
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Unitto is a unit converter for Android
- * Copyright (c) 2023 Elshan Agaev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.sadellie.unitto.feature.unitslist
-
-import androidx.compose.animation.Crossfade
-import androidx.compose.animation.animateColorAsState
-import androidx.compose.animation.core.LinearOutSlowInEasing
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.background
-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.foundation.lazy.rememberLazyListState
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
-import androidx.compose.material3.surfaceColorAtElevation
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.derivedStateOf
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalFocusManager
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.core.ui.common.UnittoSearchBar
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.feature.unitslist.components.ChipsRow
-import com.sadellie.unitto.feature.unitslist.components.FavoritesButton
-import com.sadellie.unitto.feature.unitslist.components.SearchPlaceholder
-import com.sadellie.unitto.feature.unitslist.components.UnitGroupHeader
-import com.sadellie.unitto.feature.unitslist.components.UnitListItem
-
-/**
- * Left side screen. Unit to convert from.
- *
- * @param viewModel [UnitsListViewModel].
- * @param currentUnitId Currently selected [AbstractUnit] (by ID).
- * @param navigateUp Action to navigate up. Called when user click back button.
- * @param navigateToSettingsAction Action to perform when clicking settings chip at the end.
- * @param selectAction Action to perform when user clicks on [UnitListItem].
- */
-@Composable
-internal fun LeftSideScreen(
-    viewModel: UnitsListViewModel,
-    currentUnitId: String?,
-    navigateUp: () -> Unit,
-    navigateToSettingsAction: () -> Unit,
-    selectAction: (AbstractUnit) -> Unit
-) {
-    val uiState = viewModel.mainFlow.collectAsStateWithLifecycle()
-    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
-    val chipsRowLazyListState = rememberLazyListState()
-    val focusManager = LocalFocusManager.current
-
-    val elevatedColor = MaterialTheme.colorScheme.surfaceColorAtElevation(3.dp)
-    val needToTint by remember {
-        derivedStateOf { scrollBehavior.state.overlappedFraction > 0.01f }
-    }
-
-    val chipsBackground = animateColorAsState(
-        targetValue =  if (needToTint) elevatedColor else MaterialTheme.colorScheme.surface,
-        animationSpec = tween(durationMillis = 500, easing = LinearOutSlowInEasing),
-        label = "Chips background",
-    )
-
-    Scaffold(
-        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
-        topBar = {
-            Column(
-                Modifier.background(chipsBackground.value)
-            ) {
-                UnittoSearchBar(
-                    query = uiState.value.searchQuery,
-                    onQueryChange = { viewModel.onSearchQueryChange(it, false) },
-                    navigateUp = navigateUp,
-                    title = stringResource(R.string.units_screen_from),
-                    placeholder = stringResource(R.string.search_bar_placeholder),
-                    noSearchActions = {
-                        FavoritesButton(uiState.value.favoritesOnly) {
-                            viewModel.toggleFavoritesOnly(false)
-                        }
-                    }
-                )
-                ChipsRow(
-                    chosenUnitGroup = uiState.value.chosenUnitGroup,
-                    items = uiState.value.shownUnitGroups,
-                    selectAction = { viewModel.toggleSelectedChip(it, false) },
-                    lazyListState = chipsRowLazyListState,
-                    navigateToSettingsAction = navigateToSettingsAction
-                )
-            }
-        }
-    ) { paddingValues ->
-        Crossfade(
-            targetState = uiState.value.unitsToShow.isEmpty(),
-            modifier = Modifier.padding(paddingValues)
-        ) { noUnits ->
-            if (noUnits) {
-                SearchPlaceholder(navigateToSettingsAction = navigateToSettingsAction)
-            } else {
-                LazyColumn(Modifier.fillMaxSize()) {
-                    uiState.value.unitsToShow.forEach { (unitGroup, listOfUnits) ->
-                        item(unitGroup.name) {
-                            UnitGroupHeader(Modifier.animateItemPlacement(), unitGroup)
-                        }
-                        items(listOfUnits, { it.unitId }) { unit ->
-                            UnitListItem(
-                                modifier = Modifier.animateItemPlacement(),
-                                unit = unit,
-                                isSelected = currentUnitId == unit.unitId,
-                                selectAction = {
-                                    selectAction(it)
-                                    viewModel.onSearchQueryChange("", false)
-                                    focusManager.clearFocus(true)
-                                    navigateUp()
-                                },
-                                favoriteAction = { viewModel.favoriteUnit(it) },
-                            )
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    LaunchedEffect(uiState.value.shownUnitGroups, currentUnitId) {
-        if (currentUnitId == null) return@LaunchedEffect
-        // This is still wrong, but works good enough.
-        // Ideally we shouldn't use uiState.value.shownUnitGroups
-        viewModel.setSelectedChip(currentUnitId, false)
-        val groupToSelect = uiState.value.shownUnitGroups.indexOf(uiState.value.chosenUnitGroup)
-        if (groupToSelect > -1) {
-            chipsRowLazyListState.animateScrollToItem(groupToSelect)
-        }
-    }
-}
diff --git a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/RightSideScreen.kt b/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/RightSideScreen.kt
deleted file mode 100644
index 30484866..00000000
--- a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/RightSideScreen.kt
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Unitto is a unit converter for Android
- * Copyright (c) 2022-2023 Elshan Agaev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.sadellie.unitto.feature.unitslist
-
-import androidx.compose.animation.Crossfade
-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.material3.Scaffold
-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.platform.LocalFocusManager
-import androidx.compose.ui.res.stringResource
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.core.ui.common.UnittoSearchBar
-import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols
-import com.sadellie.unitto.core.ui.common.textfield.formatExpression
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.NumberBaseUnit
-import com.sadellie.unitto.data.model.UnitGroup
-import com.sadellie.unitto.feature.unitslist.components.FavoritesButton
-import com.sadellie.unitto.feature.unitslist.components.SearchPlaceholder
-import com.sadellie.unitto.feature.unitslist.components.UnitGroupHeader
-import com.sadellie.unitto.feature.unitslist.components.UnitListItem
-import java.math.BigDecimal
-
-/**
- * Right side screen. Unit to convert to.
- *
- * @param viewModel [UnitsListViewModel].
- * @param currentUnit Currently selected [AbstractUnit].
- * @param navigateUp Action to navigate up. Called when user click back button.
- * @param navigateToSettingsAction Action to perform when clicking settings chip at the end.
- * @param selectAction Action to perform when user clicks on [UnitListItem].
- * @param inputValue Current input value (upper text field on MainScreen)
- * @param unitFrom Unit we are converting from. Need it for conversion.
- */
-@Composable
-internal fun RightSideScreen(
-    viewModel: UnitsListViewModel,
-    currentUnit: String,
-    navigateUp: () -> Unit,
-    navigateToSettingsAction: () -> Unit,
-    selectAction: (AbstractUnit) -> Unit,
-    inputValue: String?,
-    unitFrom: AbstractUnit
-) {
-    val uiState = viewModel.mainFlow.collectAsStateWithLifecycle()
-    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
-    val focusManager = LocalFocusManager.current
-
-    val convertMethod: (AbstractUnit) -> String = try {
-        val inputAsBigDecimal = BigDecimal(inputValue)
-
-        when {
-            inputValue.isNullOrEmpty() -> { { "" } }
-
-            unitFrom.group == UnitGroup.NUMBER_BASE -> {
-                { (convertForSecondaryNumberBase(inputValue, unitFrom, it)) }
-            }
-
-            else -> {
-                {
-                    convertForSecondary(inputAsBigDecimal, unitFrom, it, uiState.value.formatterSymbols)
-                }
-            }
-        }
-    } catch (e: Exception) {
-        { "" }
-    }
-
-    Scaffold(
-        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
-        topBar = {
-            UnittoSearchBar(
-                query = uiState.value.searchQuery,
-                onQueryChange = { viewModel.onSearchQueryChange(it, true) },
-                navigateUp = navigateUp,
-                title = stringResource(R.string.units_screen_to),
-                placeholder = stringResource(R.string.search_bar_placeholder),
-                noSearchActions = {
-                    FavoritesButton(uiState.value.favoritesOnly) {
-                        viewModel.toggleFavoritesOnly(true)
-                    }
-                }
-            )
-        }
-    ) { paddingValues ->
-        Crossfade(
-            targetState = uiState.value.unitsToShow.isEmpty(),
-            modifier = Modifier.padding(paddingValues)
-        ) { noUnits ->
-            if (noUnits) {
-                SearchPlaceholder(navigateToSettingsAction = navigateToSettingsAction)
-            } else {
-                LazyColumn(Modifier.fillMaxSize()) {
-                    uiState.value.unitsToShow.forEach { (unitGroup, listOfUnits) ->
-                        item(unitGroup.name) {
-                            UnitGroupHeader(Modifier.animateItemPlacement(), unitGroup)
-                        }
-                        items(listOfUnits, { it.unitId }) { unit ->
-                            UnitListItem(
-                                modifier = Modifier.animateItemPlacement(),
-                                unit = unit,
-                                isSelected = currentUnit == unit.unitId,
-                                selectAction = {
-                                    selectAction(it)
-                                    viewModel.onSearchQueryChange("", true)
-                                    focusManager.clearFocus(true)
-                                    navigateUp()
-                                },
-                                favoriteAction = { viewModel.favoriteUnit(it) },
-                                convertValue = convertMethod
-                            )
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-private fun convertForSecondary(
-    inputValue: BigDecimal,
-    unitFrom: AbstractUnit,
-    unitTo: AbstractUnit,
-    formatterSymbols: FormatterSymbols
-): String {
-    return unitFrom.convert(unitTo, inputValue, 3).toPlainString()
-        .formatExpression(formatterSymbols) + " "
-}
-
-private fun convertForSecondaryNumberBase(
-    inputValue: String,
-    unitFrom: AbstractUnit,
-    unitTo: AbstractUnit
-): String {
-    return try {
-        (unitFrom as NumberBaseUnit).convertToBase(
-            inputValue,
-            (unitTo as NumberBaseUnit).base
-        ) + " "
-    } catch (e: NumberFormatException) {
-        ""
-    } catch (e: ClassCastException) {
-        ""
-    }
-}
diff --git a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/SecondScreenUIState.kt b/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/SecondScreenUIState.kt
deleted file mode 100644
index 57e15201..00000000
--- a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/SecondScreenUIState.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Unitto is a unit converter for Android
- * Copyright (c) 2022-2023 Elshan Agaev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.sadellie.unitto.feature.unitslist
-
-import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.UnitGroup
-
-/**
- * Second (unit list) screen UI state.
- *
- * @property favoritesOnly Whether or not show only favorite [AbstractUnit]s.
- * @property unitsToShow Grouped list of [AbstractUnit]s.
- * @property searchQuery Search query in search bar.
- * @property shownUnitGroups All [UnitGroup]s that can be seen in chips row
- * @property chosenUnitGroup Currently selected chip. Nul means that no chip is selected.
- */
-data class SecondScreenUIState(
-    val favoritesOnly: Boolean = false,
-    val unitsToShow: Map<UnitGroup, List<AbstractUnit>> = emptyMap(),
-    val searchQuery: String = "",
-    val shownUnitGroups: List<UnitGroup> = listOf(),
-    val chosenUnitGroup: UnitGroup? = null,
-    val formatterSymbols: FormatterSymbols = FormatterSymbols.Spaces,
-)
diff --git a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/UnitsListViewModel.kt b/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/UnitsListViewModel.kt
deleted file mode 100644
index 01b5a594..00000000
--- a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/UnitsListViewModel.kt
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Unitto is a unit converter for Android
- * Copyright (c) 2022-2023 Elshan Agaev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.sadellie.unitto.feature.unitslist
-
-import android.app.Application
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.sadellie.unitto.core.ui.common.textfield.AllFormatterSymbols
-import com.sadellie.unitto.data.database.UnitsEntity
-import com.sadellie.unitto.data.database.UnitsRepository
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.UnitGroup
-import com.sadellie.unitto.data.units.AllUnitsRepository
-import com.sadellie.unitto.data.userprefs.MainPreferences
-import com.sadellie.unitto.data.userprefs.UserPreferencesRepository
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import javax.inject.Inject
-
-@HiltViewModel
-class UnitsListViewModel @Inject constructor(
-    private val unitRepository: UnitsRepository,
-    private val allUnitsRepository: AllUnitsRepository,
-    private val mContext: Application,
-    private val userPrefsRepository: UserPreferencesRepository,
-) : ViewModel() {
-
-    private val _userPrefs: StateFlow<MainPreferences> =
-        userPrefsRepository.mainPreferencesFlow.stateIn(
-            viewModelScope,
-            SharingStarted.WhileSubscribed(5000L),
-            MainPreferences()
-        )
-    private val _unitsToShow = MutableStateFlow(emptyMap<UnitGroup, List<AbstractUnit>>())
-    private val _searchQuery = MutableStateFlow("")
-    private val _chosenUnitGroup: MutableStateFlow<UnitGroup?> = MutableStateFlow(null)
-
-    val mainFlow = combine(
-        _userPrefs,
-        _unitsToShow,
-        _searchQuery,
-        _chosenUnitGroup,
-    ) { userPrefs, unitsToShow, searchQuery, chosenUnitGroup ->
-        return@combine SecondScreenUIState(
-            favoritesOnly = userPrefs.unitConverterFavoritesOnly,
-            unitsToShow = unitsToShow,
-            searchQuery = searchQuery,
-            chosenUnitGroup = chosenUnitGroup,
-            shownUnitGroups = userPrefs.shownUnitGroups,
-            formatterSymbols = AllFormatterSymbols.getById(userPrefs.separator)
-        )
-    }
-        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), SecondScreenUIState())
-
-    fun toggleFavoritesOnly(hideBrokenUnits: Boolean) {
-        viewModelScope.launch {
-            userPrefsRepository.updateUnitConverterFavoritesOnly(
-                !_userPrefs.value.unitConverterFavoritesOnly
-            )
-            loadUnitsToShow(hideBrokenUnits)
-        }
-    }
-
-    fun onSearchQueryChange(newValue: String, hideBrokenUnits: Boolean) {
-        _searchQuery.update { newValue }
-        loadUnitsToShow(hideBrokenUnits)
-    }
-
-    /**
-     * Changes currently selected chip. Used only when navigating
-     *
-     * @param unit Will find group for unit with this id.
-     */
-    fun setSelectedChip(unit: String, hideBrokenUnits: Boolean) {
-        _chosenUnitGroup.update { allUnitsRepository.getById(unit).group }
-        loadUnitsToShow(hideBrokenUnits)
-    }
-
-    /**
-     * Changes currently selected chip, but acts as toggle when the given [UnitGroup] is same as
-     * already set [UnitGroup]. For example, if currently selected [UnitGroup] is [UnitGroup.TIME]
-     * and the provided [UnitGroup] is also [UnitGroup.TIME], currently selected unit will be set
-     * to null (toggle).
-     *
-     * @param unitGroup [UnitGroup], currently selected chip.
-     */
-    fun toggleSelectedChip(unitGroup: UnitGroup, hideBrokenUnits: Boolean) {
-        val newUnitGroup = if (_chosenUnitGroup.value == unitGroup) null else unitGroup
-        _chosenUnitGroup.update { newUnitGroup }
-        loadUnitsToShow(hideBrokenUnits)
-    }
-
-    /**
-     * Filters and groups [AllUnitsRepository.allUnits] in coroutine
-     *
-     * @param hideBrokenUnits Broken units come from currencies API (basic unit is zero)
-     */
-    private fun loadUnitsToShow(
-        hideBrokenUnits: Boolean
-    ) {
-        viewModelScope.launch {
-            // This is mostly not UI related stuff and viewModelScope.launch uses Dispatchers.Main
-            // So we switch to Default
-            withContext(Dispatchers.Default) {
-                val unitsToShow = allUnitsRepository.filterUnits(
-                    hideBrokenUnits = hideBrokenUnits,
-                    chosenUnitGroup = _chosenUnitGroup.value,
-                    favoritesOnly = _userPrefs.value.unitConverterFavoritesOnly,
-                    searchQuery = _searchQuery.value,
-                    allUnitsGroups = _userPrefs.value.shownUnitGroups,
-                    sorting = _userPrefs.value.unitConverterSorting
-                )
-
-                _unitsToShow.update { unitsToShow }
-            }
-        }
-    }
-
-    /**
-     * Add or remove from favorites (changes to the opposite of current state, toggle)
-     */
-    fun favoriteUnit(unit: AbstractUnit) {
-        viewModelScope.launch {
-            // Changing unit in list to the opposite
-            unit.isFavorite = !unit.isFavorite
-            // Updating it in database
-            unitRepository.insertUnits(
-                UnitsEntity(
-                    unitId = unit.unitId,
-                    isFavorite = unit.isFavorite,
-                    pairedUnitId = unit.pairedUnit,
-                    frequency = unit.counter
-                )
-            )
-        }
-    }
-
-    private fun loadUnitsFromDatabase() {
-        viewModelScope.launch(Dispatchers.IO) {
-            // Now we load units data from database
-            val allUnits = unitRepository.getAll()
-            allUnitsRepository.loadFromDatabase(mContext, allUnits)
-        }
-    }
-
-    init {
-        loadUnitsFromDatabase()
-    }
-}
diff --git a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/ChipsRow.kt b/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/ChipsRow.kt
deleted file mode 100644
index 2261fbb0..00000000
--- a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/ChipsRow.kt
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Unitto is a unit converter for Android
- * Copyright (c) 2022-2023 Elshan Agaev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.sadellie.unitto.feature.unitslist.components
-
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.RowScope
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyListState
-import androidx.compose.foundation.lazy.LazyRow
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Check
-import androidx.compose.material.icons.filled.Settings
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-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.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.sadellie.unitto.core.base.R
-import com.sadellie.unitto.data.model.ALL_UNIT_GROUPS
-import com.sadellie.unitto.data.model.UnitGroup
-
-/**
- * Row of chips with [UnitGroup]s. Temporary solution
- *
- * @param items All [UnitGroup]s
- * @param chosenUnitGroup Currently selected [UnitGroup]
- * @param selectAction Action to perform when a chip is clicked
- * @param navigateToSettingsAction Action to perform when clicking settings chip at the end
- * @param lazyListState Used for animated scroll when entering unit selection screen
- */
-@Composable
-internal fun ChipsRow(
-    items: List<UnitGroup> = ALL_UNIT_GROUPS,
-    chosenUnitGroup: UnitGroup?,
-    selectAction: (UnitGroup) -> Unit,
-    navigateToSettingsAction: () -> Unit,
-    lazyListState: LazyListState
-) {
-    LazyRow(
-        modifier = Modifier
-            .padding(bottom = 4.dp)
-            .fillMaxWidth(),
-        state = lazyListState,
-        contentPadding = PaddingValues(8.dp),
-        horizontalArrangement = Arrangement.spacedBy(8.dp)
-    ) {
-        items(items, key = { it.name }) { item ->
-            val isSelected: Boolean = item == chosenUnitGroup
-            UnittoFilterChip(
-                isSelected = isSelected,
-                selectAction = { selectAction(item) }
-            ) {
-                AnimatedVisibility(visible = isSelected) {
-                    Icon(
-                        modifier = Modifier.height(18.dp),
-                        imageVector = Icons.Default.Check,
-                        contentDescription = stringResource(R.string.checked_filter_description)
-                    )
-                }
-                Text(
-                    modifier = Modifier.padding(start = 8.dp),
-                    text = stringResource(item.res),
-                    style = MaterialTheme.typography.labelLarge,
-                    color = if (isSelected) MaterialTheme.colorScheme.onSecondaryContainer else MaterialTheme.colorScheme.onSurfaceVariant
-                )
-            }
-        }
-
-        /**
-         * Usually this chip is placed at the start, but since we scroll to currently selected
-         * chip, user may never find it. There is higher chance that user will notice this chip when
-         * scrolling right (to the last one).
-         */
-        item("settings") {
-            UnittoFilterChip(
-                isSelected = false,
-                selectAction = navigateToSettingsAction,
-                paddingValues = PaddingValues(horizontal = 8.dp)
-            ) {
-                Icon(
-                    modifier = Modifier.height(18.dp),
-                    imageVector = Icons.Default.Settings,
-                    contentDescription = stringResource(R.string.open_settings_description)
-                )
-            }
-        }
-    }
-}
-
-/**
- * Basic chip implementation
- *
- * @param isSelected Chip state.
- * @param selectAction Action to perform when clicking chip.
- * @param paddingValues Padding values applied to Row.
- * @param content Content of the list. Icon and/or label.
- */
-@Composable
-private fun UnittoFilterChip(
-    isSelected: Boolean,
-    selectAction: () -> Unit,
-    paddingValues: PaddingValues = PaddingValues(start = 8.dp, end = 16.dp),
-    content: @Composable RowScope.() -> Unit
-) {
-    val chipShape = RoundedCornerShape(8.dp)
-    Row(
-        modifier = Modifier
-            .height(32.dp)
-            .clip(chipShape)
-            .background(
-                if (isSelected) MaterialTheme.colorScheme.primaryContainer else Color.Transparent
-            )
-            // Remove border when selected
-            .border(
-                1.dp,
-                if (isSelected) Color.Transparent else MaterialTheme.colorScheme.outline,
-                chipShape
-            )
-            .clickable { selectAction() }
-            .padding(paddingValues),
-        verticalAlignment = Alignment.CenterVertically
-    ) {
-        content()
-    }
-}
diff --git a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/navigation/UnitsListNavigation.kt b/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/navigation/UnitsListNavigation.kt
deleted file mode 100644
index 40667037..00000000
--- a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/navigation/UnitsListNavigation.kt
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Unitto is a unit converter for Android
- * Copyright (c) 2023 Elshan Agaev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.sadellie.unitto.feature.unitslist.navigation
-
-import androidx.navigation.NavController
-import androidx.navigation.NavGraphBuilder
-import androidx.navigation.compose.composable
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.units.AllUnitsRepository
-import com.sadellie.unitto.feature.unitslist.LeftSideScreen
-import com.sadellie.unitto.feature.unitslist.RightSideScreen
-import com.sadellie.unitto.feature.unitslist.UnitsListViewModel
-
-private const val LEFT_SIDE_ROUTE = "LEFT_SIDE_ROUTE"
-private const val RIGHT_SIDE_ROUTE = "RIGHT_SIDE_ROUTE"
-private const val UNIT_FROM_ARG = "UNIT_FROM_ARG"
-private const val UNIT_TO_ARG = "UNIT_TO_ARG"
-private const val INPUT_ARG = "INPUT_ARG"
-
-fun NavController.navigateToLeftSide(unitFromId: String) {
-    navigate("$LEFT_SIDE_ROUTE/$unitFromId")
-}
-
-fun NavController.navigateToRightSide(unitFromId: String, unitToId: String, input: String?) {
-    navigate("$RIGHT_SIDE_ROUTE/$unitFromId/$unitToId/$input")
-}
-
-fun NavGraphBuilder.leftScreen(
-    viewModel: UnitsListViewModel,
-    navigateUp: () -> Unit,
-    navigateToUnitGroups: () -> Unit,
-    onSelect: (AbstractUnit) -> Unit
-) {
-    composable(
-        route = "$LEFT_SIDE_ROUTE/{$UNIT_FROM_ARG}"
-    ) {
-        LeftSideScreen(
-            viewModel = viewModel,
-            currentUnitId = it.arguments?.getString(UNIT_FROM_ARG),
-            navigateUp = navigateUp,
-            navigateToSettingsAction = navigateToUnitGroups,
-            selectAction = onSelect
-        )
-    }
-}
-
-fun NavGraphBuilder.rightScreen(
-    viewModel: UnitsListViewModel,
-    navigateUp: () -> Unit,
-    navigateToUnitGroups: () -> Unit,
-    onSelect: (AbstractUnit) -> Unit
-
-) {
-    composable(
-        route = "$RIGHT_SIDE_ROUTE/{$UNIT_FROM_ARG}/{$UNIT_TO_ARG}/{$INPUT_ARG}"
-    ) {
-        val unitFromId = it.arguments?.getString(UNIT_FROM_ARG) ?: return@composable
-        val unitToId = it.arguments?.getString(UNIT_TO_ARG) ?: return@composable
-        val input = it.arguments?.getString(INPUT_ARG)
-        viewModel.setSelectedChip(unitFromId, true)
-
-        RightSideScreen(
-            viewModel = viewModel,
-            currentUnit = unitToId,
-            navigateUp = navigateUp,
-            navigateToSettingsAction = navigateToUnitGroups,
-            selectAction = onSelect,
-            inputValue = input,
-            unitFrom = AllUnitsRepository().getById(unitFromId)
-        )
-    }
-}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 058f3f00..66b2a479 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,73 +1,77 @@
 [versions]
-appCode = "24"
-appName = "Mikado Yellow"
-kotlin = "1.9.0"
-androidxCore = "1.10.1"
-androidGradlePlugin = "8.0.2"
-orgJetbrainsKotlinxCoroutinesTest = "1.7.2"
-androidxCompose = "1.6.0-alpha02"
+appCode = "26"
+appName = "Nadeshiko Pink"
+
+androidGradlePlugin = "8.1.1"
+androidxAppCompatAppCompat = "1.6.1"
+androidxCompose = "1.6.0-alpha06"
 androidxComposeCompiler = "1.5.0"
-androidxComposeUi = "1.6.0-alpha02"
-androidxComposeMaterial3 = "1.2.0-alpha04"
-androidxNavigation = "2.6.0"
-androidxLifecycleRuntimeCompose = "2.6.1"
-androidxHilt = "1.0.0"
-comGoogleDagger = "2.47"
-androidxComposeMaterialIconsExtended = "1.6.0-alpha02"
-androidxDatastore = "1.0.0"
-comGoogleAccompanist = "0.30.1"
-androidxRoom = "2.6.0-alpha02"
-comSquareupMoshi = "1.15.0"
-comSquareupRetrofit2 = "2.9.0"
-comGithubSadellieThemmo = "1.0.0"
-orgBurnoutcrewComposereorderable = "0.9.6"
-junit = "4.13.2"
+androidxComposeMaterial3 = "1.2.0-alpha08"
+androidxCoreCoreKts = "1.12.0"
+androidxDatastoreDatastorePreferences = "1.0.0"
+androidxHiltHiltNavigationCompose = "1.0.0"
+androidxLifecycleLifecycleRuntimeCompose = "2.6.2"
+androidxNavigationNavigationCompose = "2.7.3"
+androidxRoom = "2.6.0-rc01"
 androidxTest = "1.5.0"
-androidxTestExt = "1.1.5"
-androidDesugarJdkLibs = "2.0.3"
+androidxTestExtJunitKtx = "1.1.5"
 androidxTestRunner = "1.5.2"
-androidxTestRules = "1.5.0"
-orgRobolectric = "4.10.3"
+comAndroidToolsDesugarJdkLibs = "2.0.3"
+comGithubSadellieThemmo = "1.1.2"
+comGoogleAccompanistAccompanistSystemuicontroller = "0.30.1"
+comGoogleDagger = "2.47"
+comSquareupMoshiMoshiKotlin = "1.15.0"
+comSquareupRetrofit2ConverterMoshi = "2.9.0"
+junitJunit = "4.13.2"
+kotlin = "1.9.0"
+ksp = "1.9.0-1.0.13"
+orgBurnoutcrewComposereorderableReorderable = "0.9.6"
+orgJetbrainsKotlinxKotlinxCoroutinesTest = "1.7.2"
+orgRobolectricRobolectric = "4.10.3"
 
 [libraries]
-androidx-core = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" }
-androidx-test = { group = "androidx.test", name = "core", version.ref = "androidxTest" }
-androidx-test-ext = { group = "androidx.test.ext", name = "junit-ktx", version.ref = "androidxTestExt" }
-junit = { group = "junit", name = "junit", version.ref = "junit" }
-androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "androidxTestRunner" }
-androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "androidxTestRules" }
-org-robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "orgRobolectric" }
-org-jetbrains-kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "orgJetbrainsKotlinxCoroutinesTest" }
-androidx-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "androidxComposeUi" }
-androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "androidxComposeUi" }
-androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "androidxComposeUi" }
+androidx-appcompat-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppCompatAppCompat" }
+androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "androidxComposeMaterial3" }
+androidx-compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "androidxCompose" }
+androidx-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "androidxCompose" }
 androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4", version.ref = "androidxCompose" }
 androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest", version.ref = "androidxCompose" }
-androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "androidxComposeMaterial3" }
-androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "androidxLifecycleRuntimeCompose" }
-androidx-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxNavigation" }
-androidx-hilt = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "androidxHilt" }
-com-google-dagger-processor = { group = "com.google.dagger", name = "dagger-android-processor", version.ref = "comGoogleDagger" }
-com-google-dagger-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "comGoogleDagger" }
-com-google-dagger-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "comGoogleDagger" }
-androidx-compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "androidxComposeMaterialIconsExtended" }
-androidx-datastore = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "androidxDatastore" }
-com-google-accompanist-systemuicontroller = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "comGoogleAccompanist" }
+androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "androidxCompose" }
+androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "androidxCompose" }
+androidx-core-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCoreCoreKts" }
+androidx-datastore-datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "androidxDatastoreDatastorePreferences" }
+androidx-hilt-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "androidxHiltHiltNavigationCompose" }
+androidx-lifecycle-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "androidxLifecycleLifecycleRuntimeCompose" }
+androidx-navigation-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxNavigationNavigationCompose" }
 androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "androidxRoom" }
 androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "androidxRoom" }
 androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "androidxRoom" }
-com-squareup-moshi = { group = "com.squareup.moshi", name = "moshi-kotlin", version.ref = "comSquareupMoshi" }
-com-squareup-retrofit2 = { group = "com.squareup.retrofit2", name = "converter-moshi", version.ref = "comSquareupRetrofit2" }
+androidx-test-core = { group = "androidx.test", name = "core", version.ref = "androidxTest" }
+androidx-test-ext-junit-ktx = { group = "androidx.test.ext", name = "junit-ktx", version.ref = "androidxTestExtJunitKtx" }
+androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "androidxTestRunner" }
+androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "androidxTest" }
+com-android-tools-desugar-jdk-libs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "comAndroidToolsDesugarJdkLibs" }
 com-github-sadellie-themmo = { group = "com.github.sadellie", name = "themmo", version.ref = "comGithubSadellieThemmo" }
-org-burnoutcrew-composereorderable = { group = "org.burnoutcrew.composereorderable", name = "reorderable", version.ref = "orgBurnoutcrewComposereorderable" }
-android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" }
+com-google-accompanist-accompanist-systemuicontroller = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "comGoogleAccompanistAccompanistSystemuicontroller" }
+com-google-dagger-android-hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "comGoogleDagger" }
+com-google-dagger-dagger-android-processor = { group = "com.google.dagger", name = "dagger-android-processor", version.ref = "comGoogleDagger" }
+com-google-dagger-hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "comGoogleDagger" }
+com-squareup-moshi-moshi-kotlin = { group = "com.squareup.moshi", name = "moshi-kotlin", version.ref = "comSquareupMoshiMoshiKotlin" }
+com-squareup-retrofit2-converter-moshi = { group = "com.squareup.retrofit2", name = "converter-moshi", version.ref = "comSquareupRetrofit2ConverterMoshi" }
+junit-junit = { group = "junit", name = "junit", version.ref = "junitJunit" }
+org-burnoutcrew-composereorderable-reorderable = { group = "org.burnoutcrew.composereorderable", name = "reorderable", version.ref = "orgBurnoutcrewComposereorderableReorderable" }
+org-jetbrains-kotlinx-kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "orgJetbrainsKotlinxKotlinxCoroutinesTest" }
+org-robolectric-robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "orgRobolectricRobolectric" }
 
 # classpath
 android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
 kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
 com-google-dagger = { group = "com.google.dagger", name = "hilt-android-gradle-plugin", version.ref = "comGoogleDagger" }
+ksp-gradlePlugin = { group = "com.google.devtools.ksp", name = "com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }
 
 [plugins]
 android-gradlePlugin = { id = "com.android.application", version.ref = "androidGradlePlugin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "comGoogleDagger" }
+ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
+room = { id = "androidx.room", version.ref = "androidxRoom" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6c8fc19d..788901b4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Feb 02 22:43:30 AZT 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle.kts b/settings.gradle.kts
index fda17c24..5496d546 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -22,7 +22,6 @@ include(":data:units")
 include(":core:base")
 include(":core:ui")
 include(":feature:converter")
-include(":feature:unitslist")
 include(":feature:calculator")
 include(":feature:datecalculator")
 include(":feature:timezone")