diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 088727d6..fd17a4bc 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -16,6 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+@file:Suppress("UnstableApiUsage")
+
 plugins {
     // Basic stuff
     id("com.android.application")
@@ -74,19 +76,19 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
         isCoreLibraryDesugaringEnabled = true
     }
 
-    packagingOptions {
+    packaging {
         resources {
             excludes.add("/META-INF/{AL2.0,LGPL2.1}")
         }
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_11.toString()
         freeCompilerArgs = freeCompilerArgs + listOf(
             "-opt-in=androidx.lifecycle.compose.ExperimentalLifecycleComposeApi"
         )
@@ -97,6 +99,12 @@ android {
     }
 }
 
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11.toString()
+    }
+}
+
 dependencies {
     implementation(libs.androidx.core)
     coreLibraryDesugaring(libs.android.desugarJdkLibs)
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
index 05926ed7..b3014624 100644
--- a/build-logic/convention/build.gradle.kts
+++ b/build-logic/convention/build.gradle.kts
@@ -27,6 +27,12 @@ java {
     targetCompatibility = JavaVersion.VERSION_11
 }
 
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11.toString()
+    }
+}
+
 dependencies {
     compileOnly(libs.android.gradlePlugin)
     compileOnly(libs.kotlin.gradlePlugin)
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 74dfe304..a97e347d 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,6 +23,7 @@ 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<*, *, *, *>,
 ) {
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 1bf9d2cc..0a63a567 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
@@ -25,8 +25,11 @@ import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.api.plugins.ExtensionAware
 import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.getByType
+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<*, *, *, *>,
 ) {
@@ -45,8 +48,8 @@ internal fun Project.configureKotlinAndroid(
         }
 
         compileOptions {
-            sourceCompatibility = JavaVersion.VERSION_1_8
-            targetCompatibility = JavaVersion.VERSION_1_8
+            sourceCompatibility = JavaVersion.VERSION_11
+            targetCompatibility = JavaVersion.VERSION_11
             isCoreLibraryDesugaringEnabled = true
         }
 
@@ -59,7 +62,7 @@ internal fun Project.configureKotlinAndroid(
             resValues = false
         }
 
-        packagingOptions {
+        packaging {
             resources {
                 excludes.add("/META-INF/{AL2.0,LGPL2.1}")
             }
@@ -73,7 +76,14 @@ internal fun Project.configureKotlinAndroid(
                 "-opt-in=androidx.compose.ui.unit.ExperimentalUnitApi",
                 "-opt-in=androidx.lifecycle.compose.ExperimentalLifecycleComposeApi"
             )
-            jvmTarget = JavaVersion.VERSION_1_8.toString()
+            jvmTarget = JavaVersion.VERSION_11.toString()
+        }
+    }
+
+    tasks.withType<KotlinCompile>().configureEach {
+        kotlinOptions {
+            // Set JVM target to 11
+            jvmTarget = JavaVersion.VERSION_11.toString()
         }
     }
 
diff --git a/build-logic/gradle/wrapper/gradle-wrapper.jar b/build-logic/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index e708b1c0..00000000
Binary files a/build-logic/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/build-logic/gradle/wrapper/gradle-wrapper.properties b/build-logic/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 5ff2e605..00000000
--- a/build-logic/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
-distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
diff --git a/core/base/build.gradle.kts b/core/base/build.gradle.kts
index 1ee78dca..e3c29da2 100644
--- a/core/base/build.gradle.kts
+++ b/core/base/build.gradle.kts
@@ -16,6 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+@file:Suppress("UnstableApiUsage")
+
 plugins {
     id("unitto.library")
 }
diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
index e7cbbc37..681bdca9 100644
--- a/core/ui/build.gradle.kts
+++ b/core/ui/build.gradle.kts
@@ -16,6 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+@file:Suppress("UnstableApiUsage")
+
 plugins {
     id("unitto.library")
     id("unitto.library.compose")
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/Formatter.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/Formatter.kt
index 4311461b..4fd166fb 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/Formatter.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/Formatter.kt
@@ -19,6 +19,7 @@
 package com.sadellie.unitto.core.ui
 
 import android.content.Context
+import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.core.base.Separator
 import com.sadellie.unitto.core.base.Token
 import java.math.BigDecimal
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 2d9ce43e..7d1d1202 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
@@ -24,7 +24,7 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import com.sadellie.unitto.core.ui.R
+import com.sadellie.unitto.core.base.R
 
 /**
  * Button that is used in Top bars
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 38aea268..aa480982 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
@@ -24,7 +24,7 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
-import com.sadellie.unitto.core.ui.R
+import com.sadellie.unitto.core.base.R
 
 /**
  * Button that is used in Top bars
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoDrawerSheet.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoDrawerSheet.kt
index 30892e49..99f09e4c 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoDrawerSheet.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoDrawerSheet.kt
@@ -31,8 +31,8 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.core.base.TopLevelDestinations
-import com.sadellie.unitto.core.ui.R
 import com.sadellie.unitto.core.ui.model.DrawerItems
 
 @Composable
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 6dcf5ae6..25e8d1d2 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
@@ -46,7 +46,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.sadellie.unitto.core.ui.R
+import com.sadellie.unitto.core.base.R
 
 /**
  * Represents one item in list on Settings screen.
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 5b90a70e..5740782f 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
@@ -25,7 +25,7 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.em
 import androidx.compose.ui.unit.sp
-import com.sadellie.unitto.core.ui.R
+import com.sadellie.unitto.core.base.R
 
 private val Montserrat = FontFamily(
     Font(R.font.montserrat_light, weight = FontWeight.Light),
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 2bb22212..9d90d44c 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
@@ -19,6 +19,7 @@
 package com.sadellie.unitto.data.model
 
 import androidx.annotation.StringRes
+import com.sadellie.unitto.core.base.R
 
 val ALL_UNIT_GROUPS: List<UnitGroup> by lazy {
     UnitGroup.values().toList()
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 208b265b..eb79cde7 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
@@ -18,11 +18,11 @@
 
 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 com.sadellie.unitto.data.units.R
 import java.math.BigDecimal
 
 internal val accelerationCollection: List<AbstractUnit> by lazy {
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 232ae30a..269f60e8 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
@@ -18,11 +18,11 @@
 
 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 com.sadellie.unitto.data.units.R
 import java.math.BigDecimal
 
 internal val angleCollection: List<AbstractUnit> by lazy {
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 08576248..f224ca18 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
@@ -18,11 +18,11 @@
 
 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 com.sadellie.unitto.data.units.R
 import java.math.BigDecimal
 
 internal val areaCollection: List<AbstractUnit> by lazy {
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
index 9a540386..c865a7c8 100644
--- 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
@@ -18,11 +18,11 @@
 
 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 com.sadellie.unitto.data.units.R
 import java.math.BigDecimal
 
 internal val electrostaticCapacitance: List<AbstractUnit> by lazy {
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 cf755987..9b9cf6a0 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
@@ -18,11 +18,11 @@
 
 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 com.sadellie.unitto.data.units.R
 import java.math.BigDecimal
 
 internal val currencyCollection: List<AbstractUnit> by lazy {
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 4182148c..15b01d3a 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
@@ -18,11 +18,11 @@
 
 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 com.sadellie.unitto.data.units.R
 import java.math.BigDecimal
 
 internal val dataCollection: List<AbstractUnit> by lazy {
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 7dfcc19a..2cbf39c9 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
@@ -18,11 +18,11 @@
 
 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 com.sadellie.unitto.data.units.R
 import java.math.BigDecimal
 
 internal val dataTransferCollection: List<AbstractUnit> by lazy {
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 646aed2b..939db2db 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
@@ -18,11 +18,11 @@
 
 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 com.sadellie.unitto.data.units.R
 import java.math.BigDecimal
 
 internal val energyCollection: List<AbstractUnit> by lazy {
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 e7e3951a..962819b2 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
@@ -18,11 +18,11 @@
 
 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.units.MyUnitIDS
-import com.sadellie.unitto.data.units.R
 import java.math.BigDecimal
 
 val flowRateCollection: List<AbstractUnit> by lazy {
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 2c509193..a4a3a758 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
@@ -18,11 +18,11 @@
 
 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 com.sadellie.unitto.data.units.R
 import java.math.BigDecimal
 
 internal val fluxCollection: List<AbstractUnit> by lazy {
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 ae7f94c9..7f9d41db 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
@@ -18,11 +18,11 @@
 
 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 com.sadellie.unitto.data.units.R
 import java.math.BigDecimal
 
 val forceCollection: List<AbstractUnit> by lazy {
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 d57b4991..6710164f 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
@@ -18,11 +18,11 @@
 
 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 com.sadellie.unitto.data.units.R
 import java.math.BigDecimal
 
 internal val lengthCollection: List<AbstractUnit> by lazy {
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 d7b88328..38f9aa54 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
@@ -18,11 +18,11 @@
 
 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 com.sadellie.unitto.data.units.R
 import java.math.BigDecimal
 
 val luminanceCollection: List<AbstractUnit> by lazy {
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 4f10d33c..731a24bb 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
@@ -18,11 +18,11 @@
 
 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 com.sadellie.unitto.data.units.R
 import java.math.BigDecimal
 
 internal val massCollection: List<AbstractUnit> by lazy {
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 05050356..da6bcfbf 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
@@ -18,11 +18,11 @@
 
 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.units.MyUnitIDS
-import com.sadellie.unitto.data.units.R
 
 internal val numberBaseCollection: List<AbstractUnit> by lazy {
     listOf(
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 a6c5ac0c..abc23823 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
@@ -18,11 +18,11 @@
 
 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 com.sadellie.unitto.data.units.R
 import java.math.BigDecimal
 
 internal val powerCollection: List<AbstractUnit> by lazy {
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 04d4f044..eb7d2854 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
@@ -18,11 +18,11 @@
 
 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 com.sadellie.unitto.data.units.R
 import java.math.BigDecimal
 
 val prefixCollection: List<AbstractUnit> by lazy {
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 9d1a7da3..9c3c1e89 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
@@ -18,11 +18,11 @@
 
 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 com.sadellie.unitto.data.units.R
 import java.math.BigDecimal
 
 internal val pressureCollection: List<AbstractUnit> by lazy {
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 8cc7a5ab..5bef34cc 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
@@ -18,11 +18,11 @@
 
 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 com.sadellie.unitto.data.units.R
 import java.math.BigDecimal
 
 internal val speedCollection: List<AbstractUnit> by lazy {
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 e84d446b..faa8895b 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
@@ -19,12 +19,12 @@
 package com.sadellie.unitto.data.units.collections
 
 import com.sadellie.unitto.core.base.MAX_PRECISION
-import com.sadellie.unitto.data.model.AbstractUnit
-import com.sadellie.unitto.data.model.UnitGroup
+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.units.MyUnitIDS
-import com.sadellie.unitto.data.units.R
 import java.math.BigDecimal
 import java.math.RoundingMode
 
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 964a147b..29f8de12 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
@@ -18,11 +18,11 @@
 
 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 com.sadellie.unitto.data.units.R
 import java.math.BigDecimal
 
 internal val timeCollection: List<AbstractUnit> by lazy {
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 867391f1..b1752807 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
@@ -18,11 +18,11 @@
 
 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 com.sadellie.unitto.data.units.R
 import java.math.BigDecimal
 
 val torqueCollection: List<AbstractUnit> by lazy {
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 8e11d58a..51cac9e4 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
@@ -18,11 +18,11 @@
 
 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 com.sadellie.unitto.data.units.R
 import java.math.BigDecimal
 
 internal val volumeCollection: List<AbstractUnit> by lazy {
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 7edc7036..623e4bbb 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
@@ -62,6 +62,7 @@ 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.base.Separator
 import com.sadellie.unitto.core.ui.Formatter
 import com.sadellie.unitto.core.ui.common.MenuButton
@@ -73,7 +74,7 @@ import com.sadellie.unitto.feature.calculator.components.DragDownView
 import com.sadellie.unitto.feature.calculator.components.HistoryList
 import kotlinx.coroutines.launch
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Locale
 import kotlin.math.abs
 import kotlin.math.roundToInt
 
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 071cf31e..8ad0f27d 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
@@ -54,14 +54,14 @@ 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 com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.core.ui.Formatter
 import com.sadellie.unitto.core.ui.common.textfield.UnittoTextToolbar
 import com.sadellie.unitto.core.ui.common.textfield.copyWithoutGrouping
 import com.sadellie.unitto.core.ui.theme.NumbersTextStyleDisplayMedium
 import com.sadellie.unitto.data.model.HistoryItem
-import com.sadellie.unitto.feature.calculator.R
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Locale
 
 @Composable
 internal fun HistoryList(
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 6ec8c0be..fde2ff2a 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
@@ -35,7 +35,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.sadellie.unitto.core.ui.R
+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
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
index e344d063..41c71072 100644
--- 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
@@ -27,7 +27,7 @@ import androidx.compose.animation.expandVertically
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.shrinkVertically
-import androidx.compose.animation.with
+import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
@@ -50,7 +50,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import com.sadellie.unitto.core.ui.R
+import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.core.ui.common.textfield.InputTextField
 import com.sadellie.unitto.core.ui.theme.NumbersTextStyleDisplayLarge
 
@@ -105,9 +105,9 @@ internal fun MyTextField(
                     targetState = textToShow,
                     transitionSpec = {
                         // Enter animation
-                        (expandHorizontally(clip = false, expandFrom = Alignment.Start) + fadeIn()
+                        ((expandHorizontally(clip = false, expandFrom = Alignment.Start) + fadeIn()
                                 // Exit animation
-                                with fadeOut())
+                                ).togetherWith(fadeOut()))
                             .using(SizeTransform(clip = false))
                     }
                 ) {
@@ -138,9 +138,9 @@ internal fun MyTextField(
                         targetState = secondaryText,
                         transitionSpec = {
                             // Enter animation
-                            (expandHorizontally(clip = false, expandFrom = Alignment.Start) + fadeIn()
+                            ((expandHorizontally(clip = false, expandFrom = Alignment.Start) + fadeIn()
                                     // Exit animation
-                                    with fadeOut())
+                                    ).togetherWith(fadeOut()))
                                 .using(SizeTransform(clip = false))
                         }
                     ) {
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
index 39f1af65..c56e8898 100644
--- 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
@@ -29,7 +29,7 @@ import androidx.compose.animation.expandVertically
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.shrinkVertically
-import androidx.compose.animation.with
+import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -51,8 +51,8 @@ import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
+import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.core.ui.Formatter
-import com.sadellie.unitto.core.ui.R
 import com.sadellie.unitto.core.ui.common.ColumnWithConstraints
 import com.sadellie.unitto.core.ui.common.textfield.InputTextField
 import com.sadellie.unitto.data.model.AbstractUnit
@@ -129,9 +129,9 @@ internal fun TopScreenPart(
             targetState = stringResource(unitFrom?.shortName ?: R.string.loading_label),
             transitionSpec = {
                 // Enter animation
-                (expandHorizontally(clip = false, expandFrom = Alignment.Start) + fadeIn()
+                ((expandHorizontally(clip = false, expandFrom = Alignment.Start) + fadeIn()
                         // Exit animation
-                        with fadeOut())
+                        ).togetherWith(fadeOut()))
                     .using(SizeTransform(clip = false))
             }
         ) { value ->
@@ -164,9 +164,9 @@ internal fun TopScreenPart(
             targetState = stringResource(unitTo?.shortName ?: R.string.loading_label),
             transitionSpec = {
                 // Enter animation
-                (expandHorizontally(clip = false, expandFrom = Alignment.Start) + fadeIn()
+                ((expandHorizontally(clip = false, expandFrom = Alignment.Start) + fadeIn()
                         // Exit animation
-                        with fadeOut())
+                        ).togetherWith(fadeOut()))
                     .using(SizeTransform(clip = false))
             }
         ) { value ->
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 52cf5912..799eacfb 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
@@ -18,6 +18,7 @@
 
 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.core.FastOutSlowInEasing
@@ -27,7 +28,7 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
-import androidx.compose.animation.with
+import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.interaction.collectIsPressedAsState
 import androidx.compose.foundation.layout.PaddingValues
@@ -43,7 +44,7 @@ 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.ui.R
+import com.sadellie.unitto.core.base.R
 
 /**
  * Button to select a unit
@@ -52,6 +53,7 @@ import com.sadellie.unitto.core.ui.R
  * @param onClick Function to call when button is clicked (navigate to a unit selection screen)
  * @param label Text on button
  */
+@SuppressLint("UnusedContentLambdaTargetStateParameter")
 @Composable
 internal fun UnitSelectionButton(
     modifier: Modifier = Modifier,
@@ -80,11 +82,11 @@ internal fun UnitSelectionButton(
             targetState = label ?: 0,
             transitionSpec = {
                 if (targetState > initialState) {
-                    slideInVertically { height -> height } + fadeIn() with
-                            slideOutVertically { height -> -height } + fadeOut()
+                    (slideInVertically { height -> height } + fadeIn()).togetherWith(
+                        slideOutVertically { height -> -height } + fadeOut())
                 } else {
-                    slideInVertically { height -> -height } + fadeIn() with
-                            slideOutVertically { height -> height } + fadeOut()
+                    (slideInVertically { height -> -height } + fadeIn()).togetherWith(
+                        slideOutVertically { height -> height } + fadeOut())
                 }.using(
                     SizeTransform(clip = false)
                 )
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
index 0c1b0286..a8d17e30 100644
--- 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
@@ -27,6 +27,7 @@ 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
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/AboutScreen.kt
index 7e9fd9e3..00ad327e 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/AboutScreen.kt
@@ -45,7 +45,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.sadellie.unitto.core.base.BuildConfig
-import com.sadellie.unitto.core.ui.R
+import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.core.ui.common.NavigateUpButton
 import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar
 import com.sadellie.unitto.core.ui.openLink
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 ece6aa4b..122588e6 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
@@ -47,9 +47,9 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.sadellie.unitto.core.base.BuildConfig
 import com.sadellie.unitto.core.base.OUTPUT_FORMAT
 import com.sadellie.unitto.core.base.PRECISIONS
+import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.core.base.SEPARATORS
 import com.sadellie.unitto.core.base.TOP_LEVEL_DESTINATIONS
-import com.sadellie.unitto.core.ui.R
 import com.sadellie.unitto.core.ui.common.Header
 import com.sadellie.unitto.core.ui.common.MenuButton
 import com.sadellie.unitto.core.ui.common.UnittoListItem
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/ThemesScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/ThemesScreen.kt
index 720b4393..72a49460 100644
--- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/ThemesScreen.kt
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/ThemesScreen.kt
@@ -49,7 +49,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.sadellie.unitto.core.ui.R
+import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.core.ui.common.Header
 import com.sadellie.unitto.core.ui.common.NavigateUpButton
 import com.sadellie.unitto.core.ui.common.SegmentedButton
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/ThirdPartyLicensesScreen.kt
index bb00bc3c..2bba1fe2 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/ThirdPartyLicensesScreen.kt
@@ -36,7 +36,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.sadellie.unitto.core.ui.R
+import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.core.ui.common.NavigateUpButton
 import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar
 import com.sadellie.unitto.core.ui.openLink
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/UnitGroupsScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/UnitGroupsScreen.kt
index ed93cd2e..39e6e148 100644
--- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/UnitGroupsScreen.kt
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/UnitGroupsScreen.kt
@@ -47,10 +47,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.core.ui.common.Header
-import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar
-import com.sadellie.unitto.core.ui.R
 import com.sadellie.unitto.core.ui.common.NavigateUpButton
+import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar
 import org.burnoutcrew.reorderable.ReorderableItem
 import org.burnoutcrew.reorderable.detectReorder
 import org.burnoutcrew.reorderable.detectReorderAfterLongPress
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/components/AlertDialogWithList.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/components/AlertDialogWithList.kt
index 179d669f..6eda5080 100644
--- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/components/AlertDialogWithList.kt
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/components/AlertDialogWithList.kt
@@ -38,7 +38,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.sadellie.unitto.feature.settings.R
+import com.sadellie.unitto.core.base.R
 
 /**
  * Alert dialog that has a list of options in it
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
index 19d47686..3ed76063 100644
--- 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
@@ -45,6 +45,7 @@ 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.data.model.AbstractUnit
 import com.sadellie.unitto.feature.unitslist.components.ChipsRow
 import com.sadellie.unitto.feature.unitslist.components.SearchBar
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
index 21f94644..1f3ae6a5 100644
--- 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
@@ -32,6 +32,7 @@ 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.Formatter
 import com.sadellie.unitto.data.model.AbstractUnit
 import com.sadellie.unitto.data.model.NumberBaseUnit
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
index 4a7e362b..2261fbb0 100644
--- 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
@@ -46,9 +46,9 @@ 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
-import com.sadellie.unitto.feature.unitslist.R
 
 /**
  * Row of chips with [UnitGroup]s. Temporary solution
diff --git a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/SearchBar.kt b/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/SearchBar.kt
index 7cee6021..6e78872c 100644
--- a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/SearchBar.kt
+++ b/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/SearchBar.kt
@@ -18,6 +18,7 @@
 
 package com.sadellie.unitto.feature.unitslist.components
 
+import android.annotation.SuppressLint
 import androidx.activity.compose.BackHandler
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.AnimatedVisibility
@@ -27,7 +28,7 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.scaleIn
 import androidx.compose.animation.scaleOut
-import androidx.compose.animation.with
+import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.text.BasicTextField
@@ -61,8 +62,8 @@ 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 com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.core.ui.common.NavigateUpButton
-import com.sadellie.unitto.feature.unitslist.R
 
 /**
  * Search bar on the Second screen. Controls what will be shown in the list above this component
@@ -214,6 +215,7 @@ private fun SearchButton(
     }
 }
 
+@SuppressLint("UnusedContentLambdaTargetStateParameter")
 @Composable
 private fun FavoritesButton(
     favoritesOnly: Boolean,
@@ -223,7 +225,7 @@ private fun FavoritesButton(
         AnimatedContent(
             targetState = favoritesOnly,
             transitionSpec = {
-                (scaleIn() with scaleOut()).using(SizeTransform(clip = false))
+                (scaleIn() togetherWith scaleOut()).using(SizeTransform(clip = false))
             }
         ) {
             Icon(
diff --git a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/SearchPlaceholder.kt b/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/SearchPlaceholder.kt
index 0f8abbba..c0c72c38 100644
--- a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/SearchPlaceholder.kt
+++ b/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/SearchPlaceholder.kt
@@ -35,7 +35,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import com.sadellie.unitto.feature.unitslist.R
+import com.sadellie.unitto.core.base.R
 
 /**
  * Placeholder that can be seen when there are no units found
diff --git a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/UnitListItem.kt b/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/UnitListItem.kt
index ba5207f4..29fbb3d7 100644
--- a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/UnitListItem.kt
+++ b/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/UnitListItem.kt
@@ -18,11 +18,12 @@
 
 package com.sadellie.unitto.feature.unitslist.components
 
+import android.annotation.SuppressLint
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.SizeTransform
 import androidx.compose.animation.scaleIn
 import androidx.compose.animation.scaleOut
-import androidx.compose.animation.with
+import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -53,8 +54,8 @@ import androidx.compose.ui.graphics.Color
 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
-import com.sadellie.unitto.feature.unitslist.R
 
 /**
  * Represents one list item. Once clicked will navigate up.
@@ -65,6 +66,7 @@ import com.sadellie.unitto.feature.unitslist.R
  * @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(
     modifier: Modifier,
@@ -124,7 +126,7 @@ private fun BasicUnitListItem(
                     ),
                 targetState = isFavorite,
                 transitionSpec = {
-                    (scaleIn() with scaleOut()).using(SizeTransform(clip = false))
+                    (scaleIn() togetherWith scaleOut()).using(SizeTransform(clip = false))
                 }
             ) {
                 Icon(
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f5ec2f09..e01bca8f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,19 +1,19 @@
 [versions]
 appCode = "20"
 appName = "Kobicha"
-kotlin = "1.8.10"
+kotlin = "1.8.21"
 androidxCore = "1.10.0"
-androidGradlePlugin = "7.4.2"
+androidGradlePlugin = "8.0.1"
 orgJetbrainsKotlinxCoroutinesTest = "1.6.4"
 androidxCompose = "1.5.0-alpha02"
-androidxComposeCompiler = "1.4.4"
-androidxComposeUi = "1.5.0-alpha02"
-androidxComposeMaterial3 = "1.1.0-beta02"
+androidxComposeCompiler = "1.4.7"
+androidxComposeUi = "1.5.0-alpha04"
+androidxComposeMaterial3 = "1.2.0-alpha01"
 androidxNavigation = "2.5.3"
 androidxLifecycleRuntimeCompose = "2.6.1"
 androidxHilt = "1.0.0"
 comGoogleDagger = "2.45"
-androidxComposeMaterialIconsExtended = "1.5.0-alpha02"
+androidxComposeMaterialIconsExtended = "1.5.0-alpha04"
 androidxDatastore = "1.0.0"
 comGoogleAccompanist = "0.30.1"
 androidxRoom = "2.5.1"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f16f7433..6c8fc19d 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-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME