diff --git a/.editorconfig b/.editorconfig
index 098208df..4dfb2c02 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,12 +8,24 @@ insert_final_newline=true
 [*.{kt,kts}]
 ij_kotlin_imports_layout=*
 ij_continuation_indent_size=4
+ij_kotlin_allow_trailing_comma_on_call_site=true
+ij_kotlin_allow_trailing_comma=true
 ktlint_standard_filename=disabled
 ktlint_standard_package-name=disabled
 ktlint_standard_property-naming=disabled
 ktlint_standard_function-naming=disabled
-ktlint_standard_no-empty-file=disabled
-filename=disabled
-ktlint_experimental=enabled
+ktlint_experimental=disabled
+ktlint_code_style=ktlint_official
+ktlint_standard_argument-list-wrapping=disabled
+ktlint_standard_multiline-expression-wrapping=disabled
+ktlint_standard_string-template-indent=disabled
+ktlint_standard_no-consecutive-comments=disabled
+ktlint_standard_value-parameter-comment=disabled
+ktlint_standard_value-argument-comment=disabled
+max_line_length=120
+[*.kts]
+max_line_length=512
+ktlint_standard_chain-wrapping=disabled
+ktlint_standard_value-argument-comment=disabled
 [*.xml]
-indent_size=4
+indent_size=4
\ No newline at end of file
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 02766462..b73d097f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
 
       - name: Cache gradle, wrapper and buildSrc
         uses: actions/cache@v4
diff --git a/.github/workflows/gradle-versions-checker.yml b/.github/workflows/gradle-versions-checker.yml
index fc9697c0..bf0cc850 100644
--- a/.github/workflows/gradle-versions-checker.yml
+++ b/.github/workflows/gradle-versions-checker.yml
@@ -20,7 +20,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
 
       - name: Cache gradle, wrapper and buildSrc
         uses: actions/cache@v4
diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml
index 3f1d95d7..ebb2b982 100644
--- a/.github/workflows/qodana.yml
+++ b/.github/workflows/qodana.yml
@@ -19,7 +19,7 @@ jobs:
       #   uses: actions/setup-java@v3
       #   with:
       #     distribution: 'zulu'
-      #     java-version: '11'
+      #     java-version: '21'
 
       # - uses: JetBrains/qodana-action@v2023.2.6
       #   with:
diff --git a/.github/workflows/review-suggest.yml b/.github/workflows/review-suggest.yml
index 8eb0f7ab..6ea8c762 100644
--- a/.github/workflows/review-suggest.yml
+++ b/.github/workflows/review-suggest.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
       - name: Cache gradle, wrapper and buildSrc
         uses: actions/cache@v4
         with:
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index b828b857..44a4237a 100644
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
 
       - name: Cache gradle, wrapper and buildSrc
         uses: actions/cache@v4
diff --git a/.idea/.name b/.idea/.name
index fbd80218..8bb73b85 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-MVI Coroutines Flow
\ No newline at end of file
+MVI-Coroutines-Flow
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 44e86047..f0abae06 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,17 +2,28 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <bytecodeTargetLevel target="11">
-      <module name="MVI_Coroutines_Flow.app" target="17" />
-      <module name="MVI_Coroutines_Flow.buildSrc" target="17" />
-      <module name="MVI_Coroutines_Flow.buildSrc.main" target="17" />
-      <module name="MVI_Coroutines_Flow.buildSrc.test" target="17" />
-      <module name="MVI_Coroutines_Flow.core-ui" target="17" />
-      <module name="MVI_Coroutines_Flow.data" target="17" />
-      <module name="MVI_Coroutines_Flow.feature-add" target="17" />
-      <module name="MVI_Coroutines_Flow.feature-main" target="17" />
-      <module name="MVI_Coroutines_Flow.feature-search" target="17" />
-      <module name="MVI_Coroutines_Flow.mvi-base" target="17" />
-      <module name="MVI_Coroutines_Flow.mvi-testing" target="17" />
+      <module name="MVI-Coroutines-Flow.app" target="21" />
+      <module name="MVI-Coroutines-Flow.buildSrc" target="21" />
+      <module name="MVI-Coroutines-Flow.buildSrc.main" target="21" />
+      <module name="MVI-Coroutines-Flow.buildSrc.test" target="21" />
+      <module name="MVI-Coroutines-Flow.core-ui" target="21" />
+      <module name="MVI-Coroutines-Flow.data" target="21" />
+      <module name="MVI-Coroutines-Flow.feature-add" target="21" />
+      <module name="MVI-Coroutines-Flow.feature-main" target="21" />
+      <module name="MVI-Coroutines-Flow.feature-search" target="21" />
+      <module name="MVI-Coroutines-Flow.mvi-base" target="21" />
+      <module name="MVI-Coroutines-Flow.mvi-testing" target="21" />
+      <module name="MVI_Coroutines_Flow.app" target="21" />
+      <module name="MVI_Coroutines_Flow.buildSrc" target="21" />
+      <module name="MVI_Coroutines_Flow.buildSrc.main" target="21" />
+      <module name="MVI_Coroutines_Flow.buildSrc.test" target="21" />
+      <module name="MVI_Coroutines_Flow.core-ui" target="21" />
+      <module name="MVI_Coroutines_Flow.data" target="21" />
+      <module name="MVI_Coroutines_Flow.feature-add" target="21" />
+      <module name="MVI_Coroutines_Flow.feature-main" target="21" />
+      <module name="MVI_Coroutines_Flow.feature-search" target="21" />
+      <module name="MVI_Coroutines_Flow.mvi-base" target="21" />
+      <module name="MVI_Coroutines_Flow.mvi-testing" target="21" />
       <module name="MVICoroutinesFlow.buildSrc" target="13" />
       <module name="MVICoroutinesFlow.buildSrc.main" target="13" />
       <module name="MVICoroutinesFlow.buildSrc.test" target="13" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index c613c422..712e58fe 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -15,6 +15,7 @@
             </builds>
           </compositeBuild>
         </compositeConfiguration>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
diff --git a/.idea/icon.png b/.idea/icon.png
new file mode 100644
index 00000000..52cba1be
Binary files /dev/null and b/.idea/icon.png differ
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index d4b7accb..98dd9bb5 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="Kotlin2JsCompilerArguments">
+    <option name="moduleKind" value="plain" />
+  </component>
+  <component name="Kotlin2JvmCompilerArguments">
+    <option name="jvmTarget" value="1.8" />
+  </component>
   <component name="KotlinJpsPluginSettings">
     <option name="version" value="2.0.20" />
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3be503ca..26bac8c8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
@@ -22,7 +21,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/other.xml b/.idea/other.xml
deleted file mode 100644
index 1b1a2c59..00000000
--- a/.idea/other.xml
+++ /dev/null
@@ -1,296 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="direct_access_persist.xml">
-    <option name="deviceSelectionList">
-      <list>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="27" />
-          <option name="brand" value="DOCOMO" />
-          <option name="codename" value="F01L" />
-          <option name="id" value="F01L" />
-          <option name="manufacturer" value="FUJITSU" />
-          <option name="name" value="F-01L" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1280" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="28" />
-          <option name="brand" value="DOCOMO" />
-          <option name="codename" value="SH-01L" />
-          <option name="id" value="SH-01L" />
-          <option name="manufacturer" value="SHARP" />
-          <option name="name" value="AQUOS sense2 SH-01L" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2160" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="a51" />
-          <option name="id" value="a51" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy A51" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="akita" />
-          <option name="id" value="akita" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="b0q" />
-          <option name="id" value="b0q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S22 Ultra" />
-          <option name="screenDensity" value="600" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3088" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="32" />
-          <option name="brand" value="google" />
-          <option name="codename" value="bluejay" />
-          <option name="id" value="bluejay" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 6a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="caiman" />
-          <option name="id" value="caiman" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9 Pro" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="960" />
-          <option name="screenY" value="2142" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="comet" />
-          <option name="id" value="comet" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9 Pro Fold" />
-          <option name="screenDensity" value="390" />
-          <option name="screenX" value="2076" />
-          <option name="screenY" value="2152" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="29" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="crownqlteue" />
-          <option name="id" value="crownqlteue" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Note9" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2220" />
-          <option name="screenY" value="1080" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="dm3q" />
-          <option name="id" value="dm3q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S23 Ultra" />
-          <option name="screenDensity" value="600" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3088" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix" />
-          <option name="id" value="felix" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix_camera" />
-          <option name="id" value="felix_camera" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold (Camera-enabled)" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="gts8uwifi" />
-          <option name="id" value="gts8uwifi" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Tab S8 Ultra" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="1848" />
-          <option name="screenY" value="2960" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="husky" />
-          <option name="id" value="husky" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8 Pro" />
-          <option name="screenDensity" value="390" />
-          <option name="screenX" value="1008" />
-          <option name="screenY" value="2244" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="motorola" />
-          <option name="codename" value="java" />
-          <option name="id" value="java" />
-          <option name="manufacturer" value="Motorola" />
-          <option name="name" value="G20" />
-          <option name="screenDensity" value="280" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1600" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="komodo" />
-          <option name="id" value="komodo" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9 Pro XL" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="1008" />
-          <option name="screenY" value="2244" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="lynx" />
-          <option name="id" value="lynx" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 7a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="google" />
-          <option name="codename" value="oriole" />
-          <option name="id" value="oriole" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 6" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="panther" />
-          <option name="id" value="panther" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 7" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="q5q" />
-          <option name="id" value="q5q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Z Fold5" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1812" />
-          <option name="screenY" value="2176" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="google" />
-          <option name="codename" value="r11" />
-          <option name="id" value="r11" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Watch" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="384" />
-          <option name="screenY" value="384" />
-          <option name="type" value="WEAR_OS" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="google" />
-          <option name="codename" value="redfin" />
-          <option name="id" value="redfin" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 5" />
-          <option name="screenDensity" value="440" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2340" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="shiba" />
-          <option name="id" value="shiba" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="tangorpro" />
-          <option name="id" value="tangorpro" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Tablet" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="1600" />
-          <option name="screenY" value="2560" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="tokay" />
-          <option name="id" value="tokay" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 9" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2424" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="29" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="x1q" />
-          <option name="id" value="x1q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S20" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3200" />
-        </PersistentDeviceSelectionData>
-      </list>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 00000000..931b96c3
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 7ddfc9ed..4bf808cb 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,6 +3,8 @@
   <component name="CommitMessageInspectionProfile">
     <profile version="1.0">
       <inspection_tool class="CommitFormat" enabled="true" level="WARNING" enabled_by_default="true" />
+      <inspection_tool class="CommitFormat" enabled="true" level="WARNING" enabled_by_default="true" />
+      <inspection_tool class="CommitNamingConvention" enabled="true" level="WARNING" enabled_by_default="true" />
       <inspection_tool class="CommitNamingConvention" enabled="true" level="WARNING" enabled_by_default="true" />
     </profile>
   </component>
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 2100bd6b..454106bd 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
-  androidApplication
-  kotlinAndroid
-  id("org.jetbrains.kotlinx.kover")
+  alias(libs.plugins.android.app)
+  alias(libs.plugins.kotlin.android)
+  alias(libs.plugins.kotlinx.kover)
 }
 
 android {
@@ -28,17 +28,12 @@ android {
         "proguard-rules.pro",
       )
     }
-
-//    getByName("debug") {
-//      isTestCoverageEnabled = true
-//    }
   }
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = javaTargetVersion
+    targetCompatibility = javaTargetVersion
   }
-  kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
 
   buildFeatures {
     viewBinding = true
@@ -61,49 +56,43 @@ dependencies {
     ),
   )
 
-  implementation(domain)
-  implementation(data)
-  implementation(core)
-  implementation(coreUi)
-  implementation(featureMain)
-  implementation(featureAdd)
-  implementation(featureSearch)
-
-  implementation(deps.coroutines.android)
-  implementation(deps.koin.android)
-  implementation(deps.androidx.material)
-  implementation(deps.androidx.startup)
-
-  debugImplementation(deps.squareup.leakCanary)
-  implementation(deps.timber)
-  implementation(deps.viewBindingDelegate)
-
-  testImplementation(deps.test.junit)
-  androidTestImplementation(deps.test.androidx.junit)
-  androidTestImplementation(deps.test.androidx.core)
-  androidTestImplementation(
-    deps
-      .test
-      .androidx
-      .espresso
-      .core,
-  )
-
-  addUnitTest()
-  testImplementation(testUtils)
-  testImplementation(deps.koin.testJunit4)
-  testImplementation(deps.koin.test)
+  implementation(projects.domain)
+  implementation(projects.data)
+  implementation(projects.core)
+  implementation(projects.coreUi)
+  implementation(projects.featureMain)
+  implementation(projects.featureAdd)
+  implementation(projects.featureSearch)
+
+  implementation(libs.kotlinx.coroutines.android)
+  implementation(libs.koin.android)
+  implementation(libs.androidx.material)
+  implementation(libs.androidx.startup)
+
+  debugImplementation(libs.squareup.leakcanary)
+  implementation(libs.timber)
+  implementation(libs.viewBindingDelegate)
+
+  testImplementation(libs.junit)
+  androidTestImplementation(libs.androidx.test.junit.ktx)
+  androidTestImplementation(libs.androidx.test.core.ktx)
+  androidTestImplementation(libs.androidx.test.espresso.core)
+
+  addUnitTest(project = project)
+  testImplementation(projects.testUtils)
+  testImplementation(libs.koin.test.junit4)
+  testImplementation(libs.koin.test)
 }
 
 dependencies {
-  kover(project(":feature-main"))
-  kover(project(":feature-add"))
-  kover(project(":feature-search"))
-  kover(project(":domain"))
-  kover(project(":data"))
-  kover(project(":core"))
-  kover(project(":core-ui"))
-  kover(project(":mvi-base"))
+  kover(projects.featureMain)
+  kover(projects.featureAdd)
+  kover(projects.featureSearch)
+  kover(projects.domain)
+  kover(projects.data)
+  kover(projects.core)
+  kover(projects.coreUi)
+  kover(projects.mviBase)
 }
 
 kover {
diff --git a/build.gradle.kts b/build.gradle.kts
index 7285250b..58ac59ad 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,33 +2,33 @@ import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 import java.util.EnumSet
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 plugins {
-  id("org.jetbrains.kotlinx.kover") version "0.8.3" apply false
-  id("com.diffplug.spotless") version "6.25.0" apply false
-}
-
-buildscript {
-  repositories {
-    google()
-    mavenCentral()
-    gradlePluginPortal()
-    maven(url = "https://oss.sonatype.org/content/repositories/snapshots")
-  }
-  dependencies {
-    classpath("com.android.tools.build:gradle:8.7.0")
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
-    classpath("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
-    classpath("dev.drewhamilton.poko:poko-gradle-plugin:0.17.1")
-    classpath("com.github.ben-manes:gradle-versions-plugin:0.51.0")
-  }
+  alias(libs.plugins.kotlin.multiplatform) apply false
+  alias(libs.plugins.kotlin.android) apply false
+  alias(libs.plugins.kotlin.jvm) apply false
+  alias(libs.plugins.kotlin.kapt) apply false
+  alias(libs.plugins.kotlin.serialization) apply false
+  alias(libs.plugins.kotlin.cocoapods) apply false
+  alias(libs.plugins.kotlin.compose) apply false
+  alias(libs.plugins.kotlin.parcelize) apply false
+  alias(libs.plugins.jetbrains.compose) apply false
+  alias(libs.plugins.android.app) apply false
+  alias(libs.plugins.android.library) apply false
+  alias(libs.plugins.ben.manes.versions) apply false
+  alias(libs.plugins.gradle.spotless) apply false
+  alias(libs.plugins.detekt) apply false
+  alias(libs.plugins.kotlinx.kover)
+  alias(libs.plugins.poko) apply false
+  alias(libs.plugins.ksp) apply false
 }
 
 subprojects {
-  apply(plugin = "com.github.ben-manes.versions")
+  apply(plugin = rootProject.libs.plugins.ben.manes.versions.get().pluginId)
 
   fun isNonStable(version: String): Boolean {
     val stableKeyword =
@@ -77,21 +77,32 @@ subprojects {
 }
 
 allprojects {
-  extensions.findByType<kotlinx.kover.gradle.plugin.dsl.KoverProjectExtension>()?.run {
-    useJacoco("0.8.11")
+  afterEvaluate {
+    extensions.findByType<org.jetbrains.kotlin.gradle.dsl.KotlinTopLevelExtension>()?.run {
+      jvmToolchain {
+        languageVersion = JavaLanguageVersion.of(rootProject.libs.versions.java.toolchain.get().toInt())
+        vendor = JvmVendorSpec.AZUL
+      }
+    }
   }
 
   tasks.withType<KotlinCompile> {
-    kotlinOptions {
-      val version = JavaVersion.VERSION_11.toString()
-      jvmTarget = version
+    compilerOptions {
+      jvmTarget = JvmTarget.fromTarget(javaTargetVersion.toString())
     }
   }
 
+  val ktlintVersion = rootProject.libs.versions.ktlint.get()
   apply<com.diffplug.gradle.spotless.SpotlessPlugin>()
   configure<com.diffplug.gradle.spotless.SpotlessExtension> {
     kotlin {
       target("**/*.kt")
+      targetExclude(
+        // Compose Multiplatform Res class
+        "**/Res.kt",
+        // Kotlin generated files
+        "**/build/**/*.kt",
+      )
 
       ktlint(ktlintVersion)
 
@@ -102,6 +113,7 @@ allprojects {
 
     format("xml") {
       target("**/res/**/*.xml")
+      targetExclude("**/build/**/*.xml")
 
       trimTrailingWhitespace()
       indentWithSpaces()
@@ -110,6 +122,7 @@ allprojects {
 
     kotlinGradle {
       target("**/*.gradle.kts", "*.gradle.kts")
+      targetExclude("**/build/**/*.kts")
 
       ktlint(ktlintVersion)
 
diff --git a/buildSrc/gradle/wrapper/gradle-wrapper.jar b/buildSrc/gradle/wrapper/gradle-wrapper.jar
index e6441136..a4b76b95 100644
Binary files a/buildSrc/gradle/wrapper/gradle-wrapper.jar and b/buildSrc/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
new file mode 100644
index 00000000..215a5d58
--- /dev/null
+++ b/buildSrc/settings.gradle.kts
@@ -0,0 +1,7 @@
+dependencyResolutionManagement {
+  versionCatalogs {
+    create("libs") {
+      from(files("../gradle/libs.versions.toml"))
+    }
+  }
+}
diff --git a/buildSrc/src/main/kotlin/appConfig.kt b/buildSrc/src/main/kotlin/appConfig.kt
new file mode 100644
index 00000000..33bd6d23
--- /dev/null
+++ b/buildSrc/src/main/kotlin/appConfig.kt
@@ -0,0 +1,15 @@
+@Suppress("ConstPropertyName", "ClassName")
+object appConfig {
+  const val applicationId = "com.hoc.flowmvi"
+
+  const val compileSdkVersion = 34
+  const val buildToolsVersion = "34.0.0"
+  const val minSdkVersion = 21
+  const val targetSdkVersion = 34
+
+  private const val MAJOR = 2
+  private const val MINOR = 2
+  private const val PATCH = 0
+  const val versionCode = MAJOR * 10000 + MINOR * 100 + PATCH
+  const val versionName = "$MAJOR.$MINOR.$PATCH"
+}
diff --git a/buildSrc/src/main/kotlin/deps.kt b/buildSrc/src/main/kotlin/deps.kt
index 50300ea2..838c7235 100644
--- a/buildSrc/src/main/kotlin/deps.kt
+++ b/buildSrc/src/main/kotlin/deps.kt
@@ -1,130 +1,22 @@
-@file:Suppress("unused", "ClassName", "SpellCheckingInspection")
-
+import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.api.artifacts.dsl.DependencyHandler
-import org.gradle.kotlin.dsl.project
-import org.gradle.plugin.use.PluginDependenciesSpec
-import org.gradle.plugin.use.PluginDependencySpec
-
-const val ktlintVersion = "1.0.0"
-const val kotlinVersion = "2.0.20"
-
-object appConfig {
-  const val applicationId = "com.hoc.flowmvi"
-
-  const val compileSdkVersion = 34
-  const val buildToolsVersion = "34.0.0"
-  const val minSdkVersion = 21
-  const val targetSdkVersion = 34
-
-  private const val MAJOR = 2
-  private const val MINOR = 2
-  private const val PATCH = 0
-  const val versionCode = MAJOR * 10000 + MINOR * 100 + PATCH
-  const val versionName = "$MAJOR.$MINOR.$PATCH"
-}
-
-object deps {
-  object androidx {
-    const val appCompat = "androidx.appcompat:appcompat:1.7.0"
-    const val coreKtx = "androidx.core:core-ktx:1.13.1"
-    const val constraintLayout = "androidx.constraintlayout:constraintlayout:2.1.4"
-    const val recyclerView = "androidx.recyclerview:recyclerview:1.3.2"
-    const val swipeRefreshLayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01"
-    const val material = "com.google.android.material:material:1.12.0"
-    const val startup = "androidx.startup:startup-runtime:1.2.0"
-  }
-
-  object lifecycle {
-    private const val version = "2.8.6"
-
-    const val viewModelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version" // viewModelScope
-    const val runtimeKtx = "androidx.lifecycle:lifecycle-runtime-ktx:$version" // lifecycleScope
-    const val commonJava8 = "androidx.lifecycle:lifecycle-common-java8:$version"
-  }
-
-  object squareup {
-    const val retrofit = "com.squareup.retrofit2:retrofit:2.11.0"
-    const val converterMoshi = "com.squareup.retrofit2:converter-moshi:2.11.0"
-    const val loggingInterceptor = "com.squareup.okhttp3:logging-interceptor:4.12.0"
-    const val moshiKotlin = "com.squareup.moshi:moshi-kotlin:1.15.1"
-    const val leakCanary = "com.squareup.leakcanary:leakcanary-android:2.14"
-  }
-
-  object coroutines {
-    private const val version = "1.9.0"
-
-    const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
-    const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
-    const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"
-  }
-
-  object koin {
-    private const val version = "4.0.0"
-
-    const val core = "io.insert-koin:koin-core:$version"
-    const val android = "io.insert-koin:koin-android:$version"
-    const val testJunit4 = "io.insert-koin:koin-test-junit4:$version"
-    const val test = "io.insert-koin:koin-test:$version"
-  }
 
-  const val coil = "io.coil-kt:coil:2.7.0"
-  const val viewBindingDelegate = "com.github.hoc081098:ViewBindingDelegate:1.4.0"
-  const val flowExt = "io.github.hoc081098:FlowExt:1.0.0"
-  const val timber = "com.jakewharton.timber:timber:5.0.1"
+val Project.javaTargetVersion: JavaVersion
+  get() = JavaVersion.toVersion(libsVersionCatalog.version("java.target").toString().toInt())
 
-  object arrow {
-    private const val version = "1.2.4"
-    const val core = "io.arrow-kt:arrow-core:$version"
-  }
-
-  object test {
-    const val junit = "junit:junit:4.13.2"
-
-    object androidx {
-      const val core = "androidx.test:core-ktx:1.6.1"
-      const val junit = "androidx.test.ext:junit-ktx:1.2.1"
-
-      object espresso {
-        const val core = "androidx.test.espresso:espresso-core:3.6.1"
-      }
-    }
-
-    const val mockk = "io.mockk:mockk:1.13.12"
-    const val kotlinJUnit = "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
-  }
-}
-
-private typealias PDsS = PluginDependenciesSpec
-private typealias PDS = PluginDependencySpec
-
-inline val PDsS.androidApplication: PDS get() = id("com.android.application")
-inline val PDsS.androidLib: PDS get() = id("com.android.library")
-inline val PDsS.kotlinAndroid: PDS get() = id("kotlin-android")
-inline val PDsS.kotlin: PDS get() = id("kotlin")
-inline val PDsS.kotlinKapt: PDS get() = id("kotlin-kapt")
-inline val PDsS.kotlinParcelize: PDS get() = id("kotlin-parcelize")
-inline val PDsS.pokoPlugin: PDS get() = id("dev.drewhamilton.poko")
-
-inline val DependencyHandler.domain get() = project(":domain")
-inline val DependencyHandler.core get() = project(":core")
-inline val DependencyHandler.coreUi get() = project(":core-ui")
-inline val DependencyHandler.data get() = project(":data")
-inline val DependencyHandler.featureMain get() = project(":feature-main")
-inline val DependencyHandler.featureAdd get() = project(":feature-add")
-inline val DependencyHandler.featureSearch get() = project(":feature-search")
-inline val DependencyHandler.mviBase get() = project(":mvi-base")
-inline val DependencyHandler.mviTesting get() = project(":mvi-testing")
-inline val DependencyHandler.testUtils get() = project(":test-utils")
+val Project.isCiBuild: Boolean
+  get() = providers.environmentVariable("CI").orNull == "true"
 
-fun DependencyHandler.addUnitTest(testImplementation: Boolean = true) {
+fun DependencyHandler.addUnitTest(
+  project: Project,
+  testImplementation: Boolean = true,
+) {
   val configName = if (testImplementation) "testImplementation" else "implementation"
+  val libs = project.libsVersionCatalog
 
-  add(configName, deps.test.junit)
-  add(configName, deps.test.mockk)
-  add(configName, deps.test.kotlinJUnit)
-  add(configName, deps.coroutines.test)
+  add(configName, libs["junit"])
+  add(configName, libs["mockk"])
+  add(configName, libs["kotlin.test.junit"])
+  add(configName, libs["kotlinx.coroutines.test"])
 }
-
-val Project.isCiBuild: Boolean
-  get() = providers.environmentVariable("CI").orNull == "true"
diff --git a/buildSrc/src/main/kotlin/libsVersionCatalog.kt b/buildSrc/src/main/kotlin/libsVersionCatalog.kt
new file mode 100644
index 00000000..51322916
--- /dev/null
+++ b/buildSrc/src/main/kotlin/libsVersionCatalog.kt
@@ -0,0 +1,28 @@
+import org.gradle.api.Project
+import org.gradle.api.artifacts.MinimalExternalModuleDependency
+import org.gradle.api.artifacts.VersionCatalog
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.api.artifacts.VersionConstraint
+import org.gradle.kotlin.dsl.getByType
+import org.gradle.plugin.use.PluginDependency
+
+/**
+ * Get libs version catalog.
+ */
+internal val Project.libsVersionCatalog: VersionCatalog
+  get() = extensions.getByType<VersionCatalogsExtension>().named("libs")
+
+/**
+ * Get a library from the version catalog.
+ */
+internal operator fun VersionCatalog.get(alias: String): MinimalExternalModuleDependency = findLibrary(alias).get().get()
+
+/**
+ * Get a version from the version catalog.
+ */
+internal fun VersionCatalog.version(alias: String): VersionConstraint = findVersion(alias).get()
+
+/**
+ * Get a plugin from the version catalog.
+ */
+internal fun VersionCatalog.plugin(alias: String): PluginDependency = findPlugin(alias).get().get()
diff --git a/core-ui/build.gradle.kts b/core-ui/build.gradle.kts
index 8329d652..c3b93bcc 100644
--- a/core-ui/build.gradle.kts
+++ b/core-ui/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
-  androidLib
-  kotlinAndroid
-  id("org.jetbrains.kotlinx.kover")
+  alias(libs.plugins.android.library)
+  alias(libs.plugins.kotlin.android)
+  alias(libs.plugins.kotlinx.kover)
 }
 
 android {
@@ -27,10 +27,9 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = javaTargetVersion
+    targetCompatibility = javaTargetVersion
   }
-  kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
 
   testOptions {
     unitTests.isIncludeAndroidResources = true
@@ -43,19 +42,19 @@ android {
 }
 
 dependencies {
-  implementation(deps.coroutines.core)
-  implementation(deps.coroutines.android)
+  implementation(libs.kotlinx.coroutines.core)
+  implementation(libs.kotlinx.coroutines.android)
 
-  implementation(deps.androidx.coreKtx)
-  implementation(deps.androidx.swipeRefreshLayout)
-  implementation(deps.androidx.recyclerView)
-  implementation(deps.androidx.material)
+  implementation(libs.androidx.core.ktx)
+  implementation(libs.androidx.swiperefreshlayout)
+  implementation(libs.androidx.recyclerview)
+  implementation(libs.androidx.material)
 
-  implementation(deps.lifecycle.commonJava8)
-  implementation(deps.lifecycle.runtimeKtx)
+  implementation(libs.androidx.lifecycle.common.java8)
+  implementation(libs.androidx.lifecycle.runtime.ktx)
 
-  implementation(deps.timber)
-  implementation(deps.flowExt)
+  implementation(libs.timber)
+  implementation(libs.flowExt)
 
-  addUnitTest()
+  addUnitTest(project = project)
 }
diff --git a/core-ui/src/androidTest/java/com/hoc/flowmvi/core_ui/ExampleInstrumentedTest.kt b/core-ui/src/androidTest/java/com/hoc/flowmvi/core_ui/ExampleInstrumentedTest.kt
deleted file mode 100644
index bd932593..00000000
--- a/core-ui/src/androidTest/java/com/hoc/flowmvi/core_ui/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1 +0,0 @@
-package com.hoc.flowmvi.core_ui
diff --git a/core-ui/src/test/java/com/hoc/flowmvi/core_ui/ExampleUnitTest.kt b/core-ui/src/test/java/com/hoc/flowmvi/core_ui/ExampleUnitTest.kt
deleted file mode 100644
index bd932593..00000000
--- a/core-ui/src/test/java/com/hoc/flowmvi/core_ui/ExampleUnitTest.kt
+++ /dev/null
@@ -1 +0,0 @@
-package com.hoc.flowmvi.core_ui
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 2b85a8b5..d5182b2b 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -1,15 +1,15 @@
 plugins {
-  kotlin
-  id("org.jetbrains.kotlinx.kover")
+  alias(libs.plugins.kotlin.jvm)
+  alias(libs.plugins.kotlinx.kover)
 }
 
 java {
-  sourceCompatibility = JavaVersion.VERSION_11
-  targetCompatibility = JavaVersion.VERSION_11
+  sourceCompatibility = javaTargetVersion
+  targetCompatibility = javaTargetVersion
 }
 
 dependencies {
-  api(deps.coroutines.core)
-  api(deps.arrow.core)
-  addUnitTest()
+  api(libs.kotlinx.coroutines.core)
+  api(libs.arrow.core)
+  addUnitTest(project = project)
 }
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
index dd6ba394..fea71cf5 100644
--- a/data/build.gradle.kts
+++ b/data/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
-  androidLib
-  kotlinAndroid
-  kotlinKapt
-  id("org.jetbrains.kotlinx.kover")
+  alias(libs.plugins.android.library)
+  alias(libs.plugins.kotlin.android)
+  alias(libs.plugins.kotlin.kapt)
+  alias(libs.plugins.kotlinx.kover)
 }
 
 android {
@@ -28,10 +28,9 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = javaTargetVersion
+    targetCompatibility = javaTargetVersion
   }
-  kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
 
   testOptions {
     unitTests.isIncludeAndroidResources = true
@@ -44,24 +43,24 @@ android {
 }
 
 dependencies {
-  implementation(core)
-  implementation(domain)
+  implementation(projects.core)
+  implementation(projects.domain)
 
-  implementation(deps.coroutines.core)
-  implementation(deps.flowExt)
+  implementation(libs.kotlinx.coroutines.core)
+  implementation(libs.flowExt)
 
-  implementation(deps.squareup.retrofit)
-  implementation(deps.squareup.moshiKotlin)
-  implementation(deps.squareup.converterMoshi)
-  implementation(deps.squareup.loggingInterceptor)
+  implementation(libs.squareup.retrofit)
+  implementation(libs.squareup.moshi.kotlin)
+  implementation(libs.squareup.retrofit.converter.moshi)
+  implementation(libs.squareup.logging.interceptor)
 
-  implementation(deps.koin.core)
-  implementation(deps.arrow.core)
+  implementation(libs.koin.core)
+  implementation(libs.arrow.core)
 
-  implementation(deps.timber)
+  implementation(libs.timber)
 
-  addUnitTest()
-  testImplementation(testUtils)
-  testImplementation(deps.koin.testJunit4)
-  testImplementation(deps.koin.test)
+  addUnitTest(project = project)
+  testImplementation(projects.testUtils)
+  testImplementation(libs.koin.test.junit4)
+  testImplementation(libs.koin.test)
 }
diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts
index 6c023635..7f91def3 100644
--- a/domain/build.gradle.kts
+++ b/domain/build.gradle.kts
@@ -1,20 +1,20 @@
 plugins {
-  kotlin
-  id("org.jetbrains.kotlinx.kover")
+  alias(libs.plugins.kotlin.jvm)
+  alias(libs.plugins.kotlinx.kover)
 }
 
 java {
-  sourceCompatibility = JavaVersion.VERSION_11
-  targetCompatibility = JavaVersion.VERSION_11
+  sourceCompatibility = javaTargetVersion
+  targetCompatibility = javaTargetVersion
 }
 
 dependencies {
-  implementation(deps.coroutines.core)
-  implementation(deps.koin.core)
-  implementation(deps.arrow.core)
+  implementation(libs.kotlinx.coroutines.core)
+  implementation(libs.koin.core)
+  implementation(libs.arrow.core)
 
-  implementation(core)
+  implementation(projects.core)
 
-  addUnitTest()
-  testImplementation(testUtils)
+  addUnitTest(project = project)
+  testImplementation(projects.testUtils)
 }
diff --git a/feature-add/build.gradle.kts b/feature-add/build.gradle.kts
index 98319da3..b57d83bd 100644
--- a/feature-add/build.gradle.kts
+++ b/feature-add/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
-  androidLib
-  kotlinAndroid
-  kotlinParcelize
-  id("org.jetbrains.kotlinx.kover")
+  alias(libs.plugins.android.library)
+  alias(libs.plugins.kotlin.android)
+  alias(libs.plugins.kotlin.parcelize)
+  alias(libs.plugins.kotlinx.kover)
 }
 
 android {
@@ -28,10 +28,10 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = javaTargetVersion
+    targetCompatibility = javaTargetVersion
   }
-  kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
+
   buildFeatures { viewBinding = true }
 
   testOptions {
@@ -41,28 +41,28 @@ android {
 }
 
 dependencies {
-  implementation(domain)
-  implementation(core)
-  implementation(coreUi)
-  implementation(mviBase)
+  implementation(projects.domain)
+  implementation(projects.core)
+  implementation(projects.coreUi)
+  implementation(projects.mviBase)
 
-  implementation(deps.androidx.appCompat)
-  implementation(deps.androidx.coreKtx)
+  implementation(libs.androidx.appcompat)
+  implementation(libs.androidx.core.ktx)
 
-  implementation(deps.lifecycle.viewModelKtx)
-  implementation(deps.lifecycle.runtimeKtx)
+  implementation(libs.androidx.lifecycle.viewmodel.ktx)
+  implementation(libs.androidx.lifecycle.runtime.ktx)
 
-  implementation(deps.androidx.constraintLayout)
-  implementation(deps.androidx.material)
+  implementation(libs.androidx.constraintlayout)
+  implementation(libs.androidx.material)
 
-  implementation(deps.coroutines.core)
-  implementation(deps.koin.android)
-  implementation(deps.arrow.core)
+  implementation(libs.kotlinx.coroutines.core)
+  implementation(libs.koin.android)
+  implementation(libs.arrow.core)
 
-  implementation(deps.viewBindingDelegate)
-  implementation(deps.flowExt)
-  implementation(deps.timber)
+  implementation(libs.viewBindingDelegate)
+  implementation(libs.flowExt)
+  implementation(libs.timber)
 
-  addUnitTest()
-  testImplementation(mviTesting)
+  addUnitTest(project = project)
+  testImplementation(projects.mviTesting)
 }
diff --git a/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddModule.kt b/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddModule.kt
index 63969f9c..5fb4e218 100644
--- a/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddModule.kt
+++ b/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddModule.kt
@@ -2,10 +2,10 @@ package com.hoc.flowmvi.ui.add
 
 import com.hoc.flowmvi.core_ui.navigator.IntentProviders
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import org.koin.androidx.viewmodel.dsl.viewModelOf
 import org.koin.core.module.dsl.bind
 import org.koin.core.module.dsl.factoryOf
 import org.koin.core.module.dsl.singleOf
+import org.koin.core.module.dsl.viewModelOf
 import org.koin.dsl.module
 
 @JvmField
diff --git a/feature-main/build.gradle.kts b/feature-main/build.gradle.kts
index dcb17606..5fec7350 100644
--- a/feature-main/build.gradle.kts
+++ b/feature-main/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
-  androidLib
-  kotlinAndroid
-  id("org.jetbrains.kotlinx.kover")
+  alias(libs.plugins.android.library)
+  alias(libs.plugins.kotlin.android)
+  alias(libs.plugins.kotlinx.kover)
 }
 
 android {
@@ -24,17 +24,12 @@ android {
         "proguard-rules.pro",
       )
     }
-
-//    getByName("debug") {
-//      isTestCoverageEnabled = true
-//    }
   }
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = javaTargetVersion
+    targetCompatibility = javaTargetVersion
   }
-  kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
 
   buildFeatures { viewBinding = true }
 
@@ -47,30 +42,30 @@ android {
 }
 
 dependencies {
-  implementation(domain)
-  implementation(core)
-  implementation(coreUi)
-  implementation(mviBase)
+  implementation(projects.domain)
+  implementation(projects.core)
+  implementation(projects.coreUi)
+  implementation(projects.mviBase)
 
-  implementation(deps.androidx.appCompat)
-  implementation(deps.androidx.coreKtx)
+  implementation(libs.androidx.appcompat)
+  implementation(libs.androidx.core.ktx)
 
-  implementation(deps.lifecycle.viewModelKtx)
-  implementation(deps.lifecycle.runtimeKtx)
+  implementation(libs.androidx.lifecycle.viewmodel.ktx)
+  implementation(libs.androidx.lifecycle.runtime.ktx)
 
-  implementation(deps.androidx.recyclerView)
-  implementation(deps.androidx.constraintLayout)
-  implementation(deps.androidx.swipeRefreshLayout)
-  implementation(deps.androidx.material)
+  implementation(libs.androidx.recyclerview)
+  implementation(libs.androidx.constraintlayout)
+  implementation(libs.androidx.swiperefreshlayout)
+  implementation(libs.androidx.material)
 
-  implementation(deps.coroutines.core)
-  implementation(deps.koin.android)
-  implementation(deps.coil)
-  implementation(deps.viewBindingDelegate)
-  implementation(deps.flowExt)
-  implementation(deps.arrow.core)
-  implementation(deps.timber)
+  implementation(libs.kotlinx.coroutines.core)
+  implementation(libs.koin.android)
+  implementation(libs.coil)
+  implementation(libs.viewBindingDelegate)
+  implementation(libs.flowExt)
+  implementation(libs.arrow.core)
+  implementation(libs.timber)
 
-  addUnitTest()
-  testImplementation(mviTesting)
+  addUnitTest(project = project)
+  testImplementation(projects.mviTesting)
 }
diff --git a/feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainModule.kt b/feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainModule.kt
index 75440f84..159d5174 100644
--- a/feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainModule.kt
+++ b/feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainModule.kt
@@ -2,7 +2,7 @@ package com.hoc.flowmvi.ui.main
 
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.FlowPreview
-import org.koin.androidx.viewmodel.dsl.viewModelOf
+import org.koin.core.module.dsl.viewModelOf
 import org.koin.dsl.module
 
 @JvmField
diff --git a/feature-search/build.gradle.kts b/feature-search/build.gradle.kts
index 725f323d..3b41f5ff 100644
--- a/feature-search/build.gradle.kts
+++ b/feature-search/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
-  androidLib
-  kotlinAndroid
-  pokoPlugin
-  id("org.jetbrains.kotlinx.kover")
+  alias(libs.plugins.android.library)
+  alias(libs.plugins.kotlin.android)
+  alias(libs.plugins.poko)
+  alias(libs.plugins.kotlinx.kover)
 }
 
 android {
@@ -28,10 +28,10 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = javaTargetVersion
+    targetCompatibility = javaTargetVersion
   }
-  kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
+
   buildFeatures { viewBinding = true }
 
   testOptions {
@@ -41,30 +41,30 @@ android {
 }
 
 dependencies {
-  implementation(domain)
-  implementation(core)
-  implementation(coreUi)
-  implementation(mviBase)
+  implementation(projects.domain)
+  implementation(projects.core)
+  implementation(projects.coreUi)
+  implementation(projects.mviBase)
 
-  implementation(deps.androidx.appCompat)
-  implementation(deps.androidx.coreKtx)
+  implementation(libs.androidx.appcompat)
+  implementation(libs.androidx.core.ktx)
 
-  implementation(deps.lifecycle.viewModelKtx)
-  implementation(deps.lifecycle.runtimeKtx)
+  implementation(libs.androidx.lifecycle.viewmodel.ktx)
+  implementation(libs.androidx.lifecycle.runtime.ktx)
 
-  implementation(deps.androidx.recyclerView)
-  implementation(deps.androidx.constraintLayout)
-  implementation(deps.androidx.swipeRefreshLayout)
-  implementation(deps.androidx.material)
+  implementation(libs.androidx.recyclerview)
+  implementation(libs.androidx.constraintlayout)
+  implementation(libs.androidx.swiperefreshlayout)
+  implementation(libs.androidx.material)
 
-  implementation(deps.coroutines.core)
-  implementation(deps.koin.android)
-  implementation(deps.coil)
-  implementation(deps.viewBindingDelegate)
-  implementation(deps.flowExt)
-  implementation(deps.arrow.core)
-  implementation(deps.timber)
+  implementation(libs.kotlinx.coroutines.core)
+  implementation(libs.koin.android)
+  implementation(libs.coil)
+  implementation(libs.viewBindingDelegate)
+  implementation(libs.flowExt)
+  implementation(libs.arrow.core)
+  implementation(libs.timber)
 
-  addUnitTest()
-  testImplementation(mviTesting)
+  addUnitTest(project = project)
+  testImplementation(projects.mviTesting)
 }
diff --git a/feature-search/src/androidTest/java/com/hoc/flowmvi/ui/search/ExampleInstrumentedTest.kt b/feature-search/src/androidTest/java/com/hoc/flowmvi/ui/search/ExampleInstrumentedTest.kt
deleted file mode 100644
index 77fa3853..00000000
--- a/feature-search/src/androidTest/java/com/hoc/flowmvi/ui/search/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1 +0,0 @@
-package com.hoc.flowmvi.ui.search
diff --git a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchModule.kt b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchModule.kt
index 74465273..06b1c10d 100644
--- a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchModule.kt
+++ b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchModule.kt
@@ -4,10 +4,10 @@ import com.hoc.flowmvi.core_ui.navigator.IntentProviders
 import kotlin.time.ExperimentalTime
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.FlowPreview
-import org.koin.androidx.viewmodel.dsl.viewModelOf
 import org.koin.core.module.dsl.bind
 import org.koin.core.module.dsl.factoryOf
 import org.koin.core.module.dsl.singleOf
+import org.koin.core.module.dsl.viewModelOf
 import org.koin.dsl.module
 
 @JvmField
diff --git a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchVM.kt b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchVM.kt
index 802d8a40..2dc6076c 100644
--- a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchVM.kt
+++ b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchVM.kt
@@ -85,7 +85,9 @@ class SearchVM(
   }
 
   //region Processors
-  private fun Flow<ViewIntent.Retry>.toPartialStateChangeFlow(searchableQueryFlow: SharedFlow<String>): Flow<PartialStateChange> =
+  private fun Flow<ViewIntent.Retry>.toPartialStateChangeFlow(
+    searchableQueryFlow: SharedFlow<String>,
+  ): Flow<PartialStateChange> =
     flatMapFirst {
       viewState.value.let { vs ->
         if (vs.error !== null) {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 00000000..d13d26b3
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,124 @@
+[versions]
+android-compile = "34"
+android-gradle = "8.7.0"
+android-min = "21"
+android-target = "34"
+androidx-appcompat = "1.7.0"
+androidx-constraintlayout = "2.1.4"
+androidx-core-ktx = "1.13.1"
+androidx-lifecycle = "2.8.6"
+androidx-material = "1.12.0"
+androidx-recyclerview = "1.3.2"
+androidx-startup = "1.2.0"
+androidx-swiperefreshlayout = "1.1.0"
+arrow = "1.2.4"
+ben-manes-versions = "0.51.0"
+coil = "2.7.0"
+detekt = "1.23.7"
+androidx-test-espresso-core = "3.6.1"
+androidx-test-core = "1.6.1"
+androidx-test-junit = "1.2.1"
+flowExt = "1.0.0"
+jacoco = "0.8.11"
+java-target = "11"
+java-toolchain = "21"
+jetbrains-compose = "1.6.11"
+junit = "4.13.2"
+koin = "4.0.0"
+kotlin = "2.0.20"
+kotlinx-coroutines = "1.9.0"
+kotlinx-kover = "0.8.3"
+ktlint = "1.0.0"
+mockk = "1.13.12"
+poko = "0.17.1"
+squareup-leakcanary = "2.14"
+squareup-logging-interceptor = "4.12.0"
+squareup-moshi = "1.15.1"
+squareup-retrofit = "2.11.0"
+spotless = "6.25.0"
+timber = "5.0.1"
+viewBindingDelegate = "1.4.0"
+ksp = "2.0.20-1.0.25"
+
+[libraries]
+
+# AndroidX
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-appcompat" }
+androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout" }
+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core-ktx" }
+androidx-lifecycle-common-java8 = { group = "androidx.lifecycle", name = "lifecycle-common-java8", version.ref = "androidx-lifecycle" }
+androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }
+androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
+androidx-material = { group = "com.google.android.material", name = "material", version.ref = "androidx-material" }
+androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "androidx-recyclerview" }
+androidx-startup = { group = "androidx.startup", name = "startup-runtime", version.ref = "androidx-startup" }
+androidx-swiperefreshlayout = { group = "androidx.swiperefreshlayout", name = "swiperefreshlayout", version.ref = "androidx-swiperefreshlayout" }
+
+# Arrow
+arrow-core = { group = "io.arrow-kt", name = "arrow-core", version.ref = "arrow" }
+
+# Coil
+coil = { group = "io.coil-kt", name = "coil", version.ref = "coil" }
+
+# AndroidX Test
+androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidx-test-espresso-core" }
+androidx-test-core-ktx = { group = "androidx.test", name = "core-ktx", version.ref = "androidx-test-core" }
+androidx-test-junit-ktx = { group = "androidx.test.ext", name = "junit-ktx", version.ref = "androidx-test-junit" }
+
+# FlowExt
+flowExt = { group = "io.github.hoc081098", name = "FlowExt", version.ref = "flowExt" }
+
+# JUnit
+junit = { group = "junit", name = "junit", version.ref = "junit" }
+
+# Koin
+koin-android = { group = "io.insert-koin", name = "koin-android", version.ref = "koin" }
+koin-core = { group = "io.insert-koin", name = "koin-core", version.ref = "koin" }
+koin-test = { group = "io.insert-koin", name = "koin-test", version.ref = "koin" }
+koin-test-junit4 = { group = "io.insert-koin", name = "koin-test-junit4", version.ref = "koin" }
+
+# Kotlin
+kotlin-test-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" }
+
+# KotlinX Coroutines
+kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" }
+kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
+kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
+
+# Squareup
+squareup-leakcanary = { group = "com.squareup.leakcanary", name = "leakcanary-android", version.ref = "squareup-leakcanary" }
+squareup-logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "squareup-logging-interceptor" }
+squareup-moshi-kotlin = { group = "com.squareup.moshi", name = "moshi-kotlin", version.ref = "squareup-moshi" }
+squareup-retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "squareup-retrofit" }
+squareup-retrofit-converter-moshi = { group = "com.squareup.retrofit2", name = "converter-moshi", version.ref = "squareup-retrofit" }
+
+# Timber
+timber = { group = "com.jakewharton.timber", name = "timber", version.ref = "timber" }
+
+# View Binding Delegate
+viewBindingDelegate = { group = "com.github.hoc081098", name = "ViewBindingDelegate", version.ref = "viewBindingDelegate" }
+
+# MockK
+mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" }
+
+# Dependencies of the included build-logic or buildSrc
+gradlePlugin-kotlin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
+
+[plugins]
+android-app = { id = "com.android.application", version.ref = "android-gradle" }
+android-library = { id = "com.android.library", version.ref = "android-gradle" }
+ben-manes-versions = { id = "com.github.ben-manes.versions", version.ref = "ben-manes-versions" }
+detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
+gradle-spotless = { id = "com.diffplug.gradle.spotless", version.ref = "spotless" }
+jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "jetbrains-compose" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-cocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
+kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
+kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+kotlinx-kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kotlinx-kover" }
+ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
+poko = { id = "dev.drewhamilton.poko", version.ref = "poko" }
diff --git a/gradle/versions.toml b/gradle/versions.toml
deleted file mode 100644
index bc1a3b7b..00000000
--- a/gradle/versions.toml
+++ /dev/null
@@ -1,55 +0,0 @@
-[versions]
-ktlint = "1.0.0"
-kotlin = "2.0.20"
-androidx-lifecycle = "2.8.6"
-squareup-retrofit = "2.11.0"
-squareup-logging-interceptor = "4.12.0"
-squareup-moshi = "1.15.1"
-squareup-leak-canary = "2.14"
-kotlinx-coroutines = "1.9.0"
-koin = "4.0.0"
-coil = "2.7.0"
-view-binding-delegate = "1.4.0"
-flow-ext = "1.0.0"
-timber = "5.0.1"
-arrow = "1.2.4"
-junit = "4.13.2"
-androidx-test-core = "1.6.1"
-androidx-test-junit = "1.2.1"
-espresso-core = "3.6.1"
-mockk = "1.13.12"
-
-[libraries]
-androidx-app-compat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-app-compat" }
-androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core-ktx" }
-androidx-constraint-layout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraint-layout" }
-androidx-recycler-view = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "androidx-recycler-view" }
-androidx-swipe-refresh-layout = { group = "androidx.swiperefreshlayout", name = "swiperefreshlayout", version.ref = "androidx-swipe-refresh-layout" }
-androidx-material = { group = "com.google.android.material", name = "material", version.ref = "androidx-material" }
-androidx-startup = { group = "androidx.startup", name = "startup-runtime", version.ref = "androidx-startup" }
-androidx-view-model-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
-androidx-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }
-androidx-common-java8 = { group = "androidx.lifecycle", name = "lifecycle-common-java8", version.ref = "androidx-lifecycle" }
-retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "squareup-retrofit" }
-converter-moshi = { group = "com.squareup.retrofit2", name = "converter-moshi", version.ref = "squareup-retrofit" }
-logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "squareup-logging-interceptor" }
-moshi-kotlin = { group = "com.squareup.moshi", name = "moshi-kotlin", version.ref = "squareup-moshi" }
-leak-canary = { group = "com.squareup.leakcanary", name = "leakcanary-android", version.ref = "squareup-leak-canary" }
-kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
-kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" }
-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
-koin-core = { group = "io.insert-koin", name = "koin-core", version.ref = "koin" }
-koin-android = { group = "io.insert-koin", name = "koin-android", version.ref = "koin" }
-koin-test-junit4 = { group = "io.insert-koin", name = "koin-test-junit4", version.ref = "koin" }
-koin-test = { group = "io.insert-koin", name = "koin-test", version.ref = "koin" }
-coil = { group = "io.coil-kt", name = "coil", version.ref = "coil" }
-view-binding-delegate = { group = "com.github.hoc081098", name = "ViewBindingDelegate", version.ref = "view-binding-delegate" }
-flow-ext = { group = "io.github.hoc081098", name = "FlowExt", version.ref = "flow-ext" }
-timber = { group = "com.jakewharton.timber", name = "timber", version.ref = "timber" }
-arrow-core = { group = "io.arrow-kt", name = "arrow-core", version.ref = "arrow" }
-junit = { group = "junit", name = "junit", version.ref = "junit" }
-androidx-test-core = { group = "androidx.test", name = "core-ktx", version.ref = "androidx-test-core" }
-androidx-test-junit = { group = "androidx.test.ext", name = "junit-ktx", version.ref = "androidx-test-junit" }
-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" }
-mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" }
-kotlin-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" }
diff --git a/mvi/mvi-base/build.gradle.kts b/mvi/mvi-base/build.gradle.kts
index fd34b4ff..e9579f17 100644
--- a/mvi/mvi-base/build.gradle.kts
+++ b/mvi/mvi-base/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
-  androidLib
-  kotlinAndroid
-  id("org.jetbrains.kotlinx.kover")
+  alias(libs.plugins.android.library)
+  alias(libs.plugins.kotlin.android)
+  alias(libs.plugins.kotlinx.kover)
 }
 
 android {
@@ -26,10 +26,9 @@ android {
     }
   }
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = javaTargetVersion
+    targetCompatibility = javaTargetVersion
   }
-  kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
 
   buildFeatures {
     buildConfig = true
@@ -37,14 +36,14 @@ android {
 }
 
 dependencies {
-  implementation(deps.androidx.appCompat)
-  implementation(deps.lifecycle.viewModelKtx)
-  implementation(deps.lifecycle.runtimeKtx)
-  implementation(deps.coroutines.core)
+  implementation(libs.androidx.appcompat)
+  implementation(libs.androidx.lifecycle.viewmodel.ktx)
+  implementation(libs.androidx.lifecycle.runtime.ktx)
+  implementation(libs.kotlinx.coroutines.core)
 
-  implementation(coreUi)
-  implementation(core)
-  implementation(deps.timber)
+  implementation(projects.coreUi)
+  implementation(projects.core)
+  implementation(libs.timber)
 
-  addUnitTest()
+  addUnitTest(project = project)
 }
diff --git a/mvi/mvi-base/src/main/java/com/hoc/flowmvi/mvi_base/AbstractMviViewModel.kt b/mvi/mvi-base/src/main/java/com/hoc/flowmvi/mvi_base/AbstractMviViewModel.kt
index 149ecb62..48a78f38 100644
--- a/mvi/mvi-base/src/main/java/com/hoc/flowmvi/mvi_base/AbstractMviViewModel.kt
+++ b/mvi/mvi-base/src/main/java/com/hoc/flowmvi/mvi_base/AbstractMviViewModel.kt
@@ -106,7 +106,8 @@ abstract class AbstractMviViewModel<I : MviIntent, S : MviViewState, E : MviSing
    * start when the first subscriber arrives,
    * and stop when the last subscriber leaves.
    */
-  protected fun <T> Flow<T>.shareWhileSubscribed(): SharedFlow<T> = shareIn(viewModelScope, SharingStarted.WhileSubscribed())
+  protected fun <T> Flow<T>.shareWhileSubscribed(): SharedFlow<T> =
+    shareIn(viewModelScope, SharingStarted.WhileSubscribed())
 
   @Deprecated(
     message = "This Flow is already shared in viewModelScope, so you don't need to share it again.",
diff --git a/mvi/mvi-testing/build.gradle.kts b/mvi/mvi-testing/build.gradle.kts
index ea6a07f7..cb3bd859 100644
--- a/mvi/mvi-testing/build.gradle.kts
+++ b/mvi/mvi-testing/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-  androidLib
-  kotlinAndroid
+  alias(libs.plugins.android.library)
+  alias(libs.plugins.kotlin.android)
 }
 
 android {
@@ -17,11 +17,11 @@ android {
 
   buildTypes {
     debug {
-      (!isCiBuild).let {
+      (!isCiBuild).let { enabledLogTest ->
         buildConfigField(
-          type = it::class.java.simpleName,
+          type = enabledLogTest::class.java.simpleName,
           name = "ENABLE_LOG_TEST",
-          value = it.toString(),
+          value = enabledLogTest.toString(),
         )
       }
     }
@@ -41,10 +41,9 @@ android {
     }
   }
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = javaTargetVersion
+    targetCompatibility = javaTargetVersion
   }
-  kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
 
   buildFeatures {
     buildConfig = true
@@ -52,14 +51,14 @@ android {
 }
 
 dependencies {
-  implementation(deps.lifecycle.viewModelKtx)
-  implementation(deps.coroutines.core)
+  implementation(libs.androidx.lifecycle.viewmodel.ktx)
+  implementation(libs.kotlinx.coroutines.core)
 
-  implementation(mviBase)
-  api(testUtils)
-  implementation(deps.timber)
+  implementation(projects.mviBase)
+  api(projects.testUtils)
+  implementation(libs.timber)
 
-  implementation(deps.arrow.core)
+  implementation(libs.arrow.core)
 
-  addUnitTest(testImplementation = false)
+  addUnitTest(project = project, testImplementation = false)
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d5d68cd6..dc047c22 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,4 +1,4 @@
-rootProject.name = "MVI Coroutines Flow"
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 pluginManagement {
   repositories {
@@ -28,8 +28,9 @@ val copyToBuildSrc = { sourcePath: String ->
   )
   println("[DONE] copied $sourcePath")
 }
-arrayOf("gradle.properties", "gradle").forEach(copyToBuildSrc)
+arrayOf("gradle.properties", "gradle/wrapper").forEach(copyToBuildSrc)
 
+rootProject.name = "MVI-Coroutines-Flow"
 include(":app")
 include(":feature-main")
 include(":feature-add")
@@ -49,3 +50,7 @@ fun includeProject(
   include(name)
   project(name).projectDir = File(filePath)
 }
+
+plugins {
+  id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
+}
diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts
index 6f8799ba..531e2e5f 100644
--- a/test-utils/build.gradle.kts
+++ b/test-utils/build.gradle.kts
@@ -1,16 +1,16 @@
 plugins {
-  kotlin
+  alias(libs.plugins.kotlin.jvm)
 }
 
 java {
-  sourceCompatibility = JavaVersion.VERSION_11
-  targetCompatibility = JavaVersion.VERSION_11
+  sourceCompatibility = javaTargetVersion
+  targetCompatibility = javaTargetVersion
 }
 
 dependencies {
-  implementation(deps.coroutines.core)
-  implementation(core)
-  api(deps.arrow.core)
+  implementation(libs.kotlinx.coroutines.core)
+  implementation(projects.core)
+  api(libs.arrow.core)
 
-  addUnitTest(testImplementation = false)
+  addUnitTest(project = project, testImplementation = false)
 }