diff --git a/.editorconfig b/.editorconfig
index 129c9dcd..4bda7f7f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,11 +1,14 @@
 root = true
 
 [*]
-indent_size=2
-end_of_line=lf
-charset=utf-8
-trim_trailing_whitespace=true
-insert_final_newline=true
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
 
 [*.{kt,kts}]
-ij_kotlin_imports_layout=*
+ij_kotlin_imports_layout = *
+
+[*.xml]
+indent_size = 4
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index ac477352..d88f58a9 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -11,6 +11,8 @@
       <module name="MVI_Coroutines_Flow.mvi-base" target="13" />
       <module name="MVI_Coroutines_Flow.mvi-testing" target="13" />
       <module name="MVICoroutinesFlow.buildSrc" target="13" />
+      <module name="MVICoroutinesFlow.buildSrc.main" target="13" />
+      <module name="MVICoroutinesFlow.buildSrc.test" target="13" />
     </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index b9c4f02c..cb99164d 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -25,8 +25,7 @@
             <option value="$PROJECT_DIR$/test-utils" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 00000000..0b18bb59
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,8 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="ClangTidy" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="clangTidyChecks" value="-*,bugprone-argument-comment,bugprone-assert-side-effect,bugprone-bad-signal-to-kill-thread,bugprone-branch-clone,bugprone-copy-constructor-init,bugprone-dangling-handle,bugprone-dynamic-static-initializers,bugprone-fold-init-type,bugprone-forward-declaration-namespace,bugprone-forwarding-reference-overload,bugprone-inaccurate-erase,bugprone-incorrect-roundings,bugprone-integer-division,bugprone-lambda-function-name,bugprone-macro-parentheses,bugprone-macro-repeated-side-effects,bugprone-misplaced-operator-in-strlen-in-alloc,bugprone-misplaced-pointer-arithmetic-in-alloc,bugprone-misplaced-widening-cast,bugprone-move-forwarding-reference,bugprone-multiple-statement-macro,bugprone-no-escape,bugprone-not-null-terminated-result,bugprone-parent-virtual-call,bugprone-posix-return,bugprone-reserved-identifier,bugprone-sizeof-container,bugprone-sizeof-expression,bugprone-spuriously-wake-up-functions,bugprone-string-constructor,bugprone-string-integer-assignment,bugprone-string-literal-with-embedded-nul,bugprone-suspicious-enum-usage,bugprone-suspicious-include,bugprone-suspicious-memset-usage,bugprone-suspicious-missing-comma,bugprone-suspicious-semicolon,bugprone-suspicious-string-compare,bugprone-swapped-arguments,bugprone-terminating-continue,bugprone-throw-keyword-missing,bugprone-too-small-loop-variable,bugprone-undefined-memory-manipulation,bugprone-undelegated-constructor,bugprone-unhandled-self-assignment,bugprone-unused-raii,bugprone-unused-return-value,bugprone-use-after-move,bugprone-virtual-near-miss,cert-dcl21-cpp,cert-dcl58-cpp,cert-err34-c,cert-err52-cpp,cert-err58-cpp,cert-err60-cpp,cert-flp30-c,cert-msc50-cpp,cert-msc51-cpp,cert-str34-c,cppcoreguidelines-interfaces-global-init,cppcoreguidelines-narrowing-conversions,cppcoreguidelines-pro-type-member-init,cppcoreguidelines-pro-type-static-cast-downcast,cppcoreguidelines-slicing,google-default-arguments,google-explicit-constructor,google-runtime-operator,hicpp-exception-baseclass,hicpp-multiway-paths-covered,misc-misplaced-const,misc-new-delete-overloads,misc-no-recursion,misc-non-copyable-objects,misc-throw-by-value-catch-by-reference,misc-unconventional-assign-operator,misc-uniqueptr-reset-release,modernize-avoid-bind,modernize-concat-nested-namespaces,modernize-deprecated-headers,modernize-deprecated-ios-base-aliases,modernize-loop-convert,modernize-make-shared,modernize-make-unique,modernize-pass-by-value,modernize-raw-string-literal,modernize-redundant-void-arg,modernize-replace-auto-ptr,modernize-replace-disallow-copy-and-assign-macro,modernize-replace-random-shuffle,modernize-return-braced-init-list,modernize-shrink-to-fit,modernize-unary-static-assert,modernize-use-auto,modernize-use-bool-literals,modernize-use-emplace,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-nodiscard,modernize-use-noexcept,modernize-use-nullptr,modernize-use-override,modernize-use-transparent-functors,modernize-use-uncaught-exceptions,mpi-buffer-deref,mpi-type-mismatch,openmp-use-default-none,performance-faster-string-find,performance-for-range-copy,performance-implicit-conversion-in-loop,performance-inefficient-algorithm,performance-inefficient-string-concatenation,performance-inefficient-vector-operation,performance-move-const-arg,performance-move-constructor-init,performance-no-automatic-move,performance-noexcept-move-constructor,performance-trivially-destructible,performance-type-promotion-in-math-fn,performance-unnecessary-copy-initialization,performance-unnecessary-value-param,portability-simd-intrinsics,readability-avoid-const-params-in-decls,readability-const-return-type,readability-container-size-empty,readability-convert-member-functions-to-static,readability-delete-null-pointer,readability-deleted-default,readability-inconsistent-declaration-parameter-name,readability-make-member-function-const,readability-misleading-indentation,readability-misplaced-array-index,readability-non-const-parameter,readability-redundant-control-flow,readability-redundant-declaration,readability-redundant-function-ptr-dereference,readability-redundant-smartptr-get,readability-redundant-string-cstr,readability-redundant-string-init,readability-simplify-subscript-expr,readability-static-accessed-through-instance,readability-static-definition-in-anonymous-namespace,readability-string-compare,readability-uniqueptr-delete-release,readability-use-anyofallof,altera-id-dependent-backward-branch,altera-unroll-loops,bugprone-implicit-widening-of-multiplication-result,bugprone-unhandled-exception-at-new,cert-pos47-c,concurrency-thread-canceltype-asynchronous" />
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8f0a1f7f..67a156c7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -10,6 +10,15 @@
         <entry key="..\:/Admin/Documents/Android/MVICoroutinesFlow/feature-search/src/main/res/menu/menu_search.xml" value="0.1814814814814815" />
         <entry key="..\:/Admin/Documents/Android/MVICoroutinesFlow/feature-search/src/main/res/menu/search.xml" value="0.1550925925925926" />
         <entry key="..\:/Users/Admin/Desktop/Documents/MVICoroutinesFlow/core-ui/src/main/res/font/noto_sans.xml" value="0.1162037037037037" />
+        <entry key="..\:/Users/Admin/Desktop/Documents/MVICoroutinesFlow/feature-add/src/main/res/layout/activity_add.xml" value="0.12" />
+        <entry key="..\:/Users/Admin/Desktop/Documents/MVICoroutinesFlow/feature-main/src/main/res/drawable/ic_add_white_24dp.xml" value="0.1925" />
+        <entry key="..\:/Users/Admin/Desktop/Documents/MVICoroutinesFlow/feature-main/src/main/res/drawable/ic_baseline_person_24.xml" value="0.1925" />
+        <entry key="..\:/Users/Admin/Desktop/Documents/MVICoroutinesFlow/feature-main/src/main/res/layout/activity_main.xml" value="0.22" />
+        <entry key="..\:/Users/Admin/Desktop/Documents/MVICoroutinesFlow/feature-main/src/main/res/layout/item_recycler_user.xml" value="0.1814814814814815" />
+        <entry key="..\:/Users/Admin/Desktop/Documents/MVICoroutinesFlow/feature-search/src/main/res/drawable/ic_baseline_person_24.xml" value="0.1925" />
+        <entry key="..\:/Users/Admin/Desktop/Documents/MVICoroutinesFlow/feature-search/src/main/res/drawable/ic_baseline_search_24.xml" value="0.1925" />
+        <entry key="..\:/Users/Admin/Desktop/Documents/MVICoroutinesFlow/feature-search/src/main/res/layout/activity_search.xml" value="0.1814814814814815" />
+        <entry key="..\:/Users/Admin/Desktop/Documents/MVICoroutinesFlow/feature-search/src/main/res/layout/item_recycler_search_user.xml" value="0.1361111111111111" />
       </map>
     </option>
   </component>
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 0f04686a..0e998616 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -66,6 +66,7 @@ dependencies {
 
   implementation(deps.coroutines.android)
   implementation(deps.koin.android)
+  implementation(deps.androidx.material)
 
   debugImplementation(deps.squareup.leakCanary)
   implementation(deps.timber)
diff --git a/app/src/main/java/com/hoc/flowmvi/App.kt b/app/src/main/java/com/hoc/flowmvi/App.kt
index 2b5ad671..27bd8819 100644
--- a/app/src/main/java/com/hoc/flowmvi/App.kt
+++ b/app/src/main/java/com/hoc/flowmvi/App.kt
@@ -1,6 +1,7 @@
 package com.hoc.flowmvi
 
 import android.app.Application
+import com.google.android.material.color.DynamicColors
 import com.hoc.flowmvi.core.coreModule
 import com.hoc.flowmvi.data.dataModule
 import com.hoc.flowmvi.domain.domainModule
@@ -20,6 +21,7 @@ import kotlin.time.ExperimentalTime
 @ExperimentalCoroutinesApi
 @ExperimentalStdlibApi
 @ExperimentalTime
+@JvmField
 val allModules = listOf(
   coreModule,
   dataModule,
@@ -38,6 +40,8 @@ class App : Application() {
   override fun onCreate() {
     super.onCreate()
 
+    DynamicColors.applyToActivitiesIfAvailable(this)
+
     if (BuildConfig.DEBUG) {
       Timber.plant(Timber.DebugTree())
     } else {
diff --git a/buildSrc/src/main/kotlin/deps.kt b/buildSrc/src/main/kotlin/deps.kt
index ad167305..2fe34ddd 100644
--- a/buildSrc/src/main/kotlin/deps.kt
+++ b/buildSrc/src/main/kotlin/deps.kt
@@ -32,7 +32,7 @@ object deps {
     const val constraintLayout = "androidx.constraintlayout:constraintlayout:2.1.1"
     const val recyclerView = "androidx.recyclerview:recyclerview:1.2.1"
     const val swipeRefreshLayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01"
-    const val material = "com.google.android.material:material:1.4.0"
+    const val material = "com.google.android.material:material:1.6.0-alpha02"
   }
 
   object lifecycle {
diff --git a/core-ui/src/main/java/com/hoc/flowmvi/core_ui/ContextExtensions.kt b/core-ui/src/main/java/com/hoc/flowmvi/core_ui/ContextExtensions.kt
new file mode 100644
index 00000000..6f559a20
--- /dev/null
+++ b/core-ui/src/main/java/com/hoc/flowmvi/core_ui/ContextExtensions.kt
@@ -0,0 +1,12 @@
+package com.hoc.flowmvi.core_ui
+
+import android.content.Context
+import android.widget.Toast
+import androidx.annotation.Px
+
+@Suppress("NOTHING_TO_INLINE")
+inline fun Context.toast(text: CharSequence) = Toast.makeText(this, text, Toast.LENGTH_SHORT).show()
+
+@Px
+@Suppress("NOTHING_TO_INLINE")
+inline fun Context.dpToPx(dp: Float): Int = (dp * resources.displayMetrics.density).toInt()
diff --git a/core-ui/src/main/java/com/hoc/flowmvi/core_ui/FlowBinding.kt b/core-ui/src/main/java/com/hoc/flowmvi/core_ui/FlowBinding.kt
index 73d57c17..105f0069 100644
--- a/core-ui/src/main/java/com/hoc/flowmvi/core_ui/FlowBinding.kt
+++ b/core-ui/src/main/java/com/hoc/flowmvi/core_ui/FlowBinding.kt
@@ -1,10 +1,8 @@
 package com.hoc.flowmvi.core_ui
 
-import android.content.Context
 import android.os.Looper
 import android.view.View
 import android.widget.EditText
-import android.widget.Toast
 import androidx.annotation.CheckResult
 import androidx.appcompat.widget.SearchView
 import androidx.core.widget.doOnTextChanged
@@ -121,5 +119,3 @@ fun EditText.textChanges(): Flow<CharSequence?> {
     awaitClose { removeTextChangedListener(listener) }
   }.onStart { emit(text) }
 }
-
-fun Context.toast(text: CharSequence) = Toast.makeText(this, text, Toast.LENGTH_SHORT).show()
diff --git a/core-ui/src/main/java/com/hoc/flowmvi/core_ui/SwipeLeftToDeleteCallback.kt b/core-ui/src/main/java/com/hoc/flowmvi/core_ui/SwipeLeftToDeleteCallback.kt
index 71ae822e..39b5ad6b 100644
--- a/core-ui/src/main/java/com/hoc/flowmvi/core_ui/SwipeLeftToDeleteCallback.kt
+++ b/core-ui/src/main/java/com/hoc/flowmvi/core_ui/SwipeLeftToDeleteCallback.kt
@@ -2,22 +2,26 @@ package com.hoc.flowmvi.core_ui
 
 import android.content.Context
 import android.graphics.Canvas
-import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
-import androidx.core.content.ContextCompat
+import androidx.core.content.ContextCompat.getColor
+import androidx.core.content.ContextCompat.getDrawable
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
+import kotlin.LazyThreadSafetyMode.NONE
 
 class SwipeLeftToDeleteCallback(context: Context, private val onSwipedCallback: (Int) -> Unit) :
   ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT) {
-  private val background: ColorDrawable = ColorDrawable(Color.parseColor("#f44336"))
-  private val iconDelete =
-    ContextCompat.getDrawable(context, R.drawable.ic_baseline_delete_white_24)!!
+  private val background: ColorDrawable by lazy(NONE) {
+    ColorDrawable(getColor(context, R.color.swipe_to_delete_background_color))
+  }
+  private val iconDelete by lazy(NONE) {
+    getDrawable(context, R.drawable.ic_baseline_delete_white_24)!!
+  }
 
   override fun onMove(
     recyclerView: RecyclerView,
     viewHolder: RecyclerView.ViewHolder,
-    target: RecyclerView.ViewHolder
+    target: RecyclerView.ViewHolder,
   ) = false
 
   override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
@@ -34,7 +38,7 @@ class SwipeLeftToDeleteCallback(context: Context, private val onSwipedCallback:
     dX: Float,
     dY: Float,
     actionState: Int,
-    isCurrentlyActive: Boolean
+    isCurrentlyActive: Boolean,
   ) {
     super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive)
     val itemView = viewHolder.itemView
@@ -56,7 +60,10 @@ class SwipeLeftToDeleteCallback(context: Context, private val onSwipedCallback:
           itemView.bottom
         )
       }
-      else -> background.setBounds(0, 0, 0, 0)
+      else -> {
+        background.setBounds(0, 0, 0, 0)
+        iconDelete.setBounds(0, 0, 0, 0)
+      }
     }
     background.draw(c)
     iconDelete.draw(c)
diff --git a/core-ui/src/main/res/values-night/themes.xml b/core-ui/src/main/res/values-night/themes.xml
new file mode 100644
index 00000000..1f14d006
--- /dev/null
+++ b/core-ui/src/main/res/values-night/themes.xml
@@ -0,0 +1,31 @@
+<resources>
+
+    <style name="AppTheme" parent="Theme.Material3.DayNight">
+        <item name="colorPrimary">@color/md_theme_dark_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_dark_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/md_theme_dark_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_dark_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_dark_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/md_theme_dark_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_dark_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_dark_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_dark_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_dark_error</item>
+        <item name="colorErrorContainer">@color/md_theme_dark_errorContainer</item>
+        <item name="colorOnError">@color/md_theme_dark_onError</item>
+        <item name="colorOnErrorContainer">@color/md_theme_dark_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_dark_background</item>
+        <item name="colorOnBackground">@color/md_theme_dark_onBackground</item>
+        <item name="colorSurface">@color/md_theme_dark_surface</item>
+        <item name="colorOnSurface">@color/md_theme_dark_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_dark_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_dark_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_dark_outline</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_dark_primaryInverse</item>
+    </style>
+</resources>
diff --git a/core-ui/src/main/res/values/colors.xml b/core-ui/src/main/res/values/colors.xml
index 030098fe..fd84d864 100644
--- a/core-ui/src/main/res/values/colors.xml
+++ b/core-ui/src/main/res/values/colors.xml
@@ -1,6 +1,58 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#6200EE</color>
-    <color name="colorPrimaryDark">#3700B3</color>
-    <color name="colorAccent">#03DAC5</color>
+    <color name="md_theme_light_primary">#6750A4</color>
+    <color name="md_theme_light_onPrimary">#FFFFFF</color>
+    <color name="md_theme_light_primaryContainer">#EADDFF</color>
+    <color name="md_theme_light_onPrimaryContainer">#21005D</color>
+    <color name="md_theme_light_secondary">#625B71</color>
+    <color name="md_theme_light_onSecondary">#FFFFFF</color>
+    <color name="md_theme_light_secondaryContainer">#E8DEF8</color>
+    <color name="md_theme_light_onSecondaryContainer">#1D192B</color>
+    <color name="md_theme_light_tertiary">#7D5260</color>
+    <color name="md_theme_light_onTertiary">#FFFFFF</color>
+    <color name="md_theme_light_tertiaryContainer">#FFD8E4</color>
+    <color name="md_theme_light_onTertiaryContainer">#31111D</color>
+    <color name="md_theme_light_error">#B3261E</color>
+    <color name="md_theme_light_errorContainer">#F9DEDC</color>
+    <color name="md_theme_light_onError">#FFFFFF</color>
+    <color name="md_theme_light_onErrorContainer">#410E0B</color>
+    <color name="md_theme_light_background">#FFFBFE</color>
+    <color name="md_theme_light_onBackground">#1C1B1F</color>
+    <color name="md_theme_light_surface">#FFFBFE</color>
+    <color name="md_theme_light_onSurface">#1C1B1F</color>
+    <color name="md_theme_light_surfaceVariant">#E7E0EC</color>
+    <color name="md_theme_light_onSurfaceVariant">#49454F</color>
+    <color name="md_theme_light_outline">#9A989C</color>
+    <color name="md_theme_light_inverseOnSurface">#F4EFF4</color>
+    <color name="md_theme_light_inverseSurface">#313033</color>
+    <color name="md_theme_light_primaryInverse">#D0BCFF</color>
+
+    <color name="md_theme_dark_primary">#D0BCFF</color>
+    <color name="md_theme_dark_onPrimary">#381E72</color>
+    <color name="md_theme_dark_primaryContainer">#4F378B</color>
+    <color name="md_theme_dark_onPrimaryContainer">#EADDFF</color>
+    <color name="md_theme_dark_secondary">#CCC2DC</color>
+    <color name="md_theme_dark_onSecondary">#332D41</color>
+    <color name="md_theme_dark_secondaryContainer">#4A4458</color>
+    <color name="md_theme_dark_onSecondaryContainer">#E8DEF8</color>
+    <color name="md_theme_dark_tertiary">#EFB8C8</color>
+    <color name="md_theme_dark_onTertiary">#492532</color>
+    <color name="md_theme_dark_tertiaryContainer">#633B48</color>
+    <color name="md_theme_dark_onTertiaryContainer">#FFD8E4</color>
+    <color name="md_theme_dark_error">#F2B8B5</color>
+    <color name="md_theme_dark_errorContainer">#8C1D18</color>
+    <color name="md_theme_dark_onError">#601410</color>
+    <color name="md_theme_dark_onErrorContainer">#F9DEDC</color>
+    <color name="md_theme_dark_background">#1C1B1F</color>
+    <color name="md_theme_dark_onBackground">#E6E1E5</color>
+    <color name="md_theme_dark_surface">#1C1B1F</color>
+    <color name="md_theme_dark_onSurface">#E6E1E5</color>
+    <color name="md_theme_dark_surfaceVariant">#49454F</color>
+    <color name="md_theme_dark_onSurfaceVariant">#CAC4D0</color>
+    <color name="md_theme_dark_outline">#6D6775</color>
+    <color name="md_theme_dark_inverseOnSurface">#1C1B1F</color>
+    <color name="md_theme_dark_inverseSurface">#E6E1E5</color>
+    <color name="md_theme_dark_primaryInverse">#6750A4</color>
+    <color name="seed">#6750A4</color>
+    <color name="error">#B3261E</color>
+    <color name="swipe_to_delete_background_color">#f44336</color>
 </resources>
diff --git a/core-ui/src/main/res/values/styles.xml b/core-ui/src/main/res/values/styles.xml
index 1c56072b..2c5844dd 100644
--- a/core-ui/src/main/res/values/styles.xml
+++ b/core-ui/src/main/res/values/styles.xml
@@ -1,11 +1 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-</resources>
+<resources />
diff --git a/core-ui/src/main/res/values/themes.xml b/core-ui/src/main/res/values/themes.xml
new file mode 100644
index 00000000..01983e75
--- /dev/null
+++ b/core-ui/src/main/res/values/themes.xml
@@ -0,0 +1,30 @@
+<resources>
+  <style name="AppTheme" parent="Theme.Material3.DayNight">
+    <item name="colorPrimary">@color/md_theme_light_primary</item>
+    <item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
+    <item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
+    <item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>
+    <item name="colorSecondary">@color/md_theme_light_secondary</item>
+    <item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
+    <item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>
+    <item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>
+    <item name="colorTertiary">@color/md_theme_light_tertiary</item>
+    <item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>
+    <item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>
+    <item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item>
+    <item name="colorError">@color/md_theme_light_error</item>
+    <item name="colorErrorContainer">@color/md_theme_light_errorContainer</item>
+    <item name="colorOnError">@color/md_theme_light_onError</item>
+    <item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
+    <item name="android:colorBackground">@color/md_theme_light_background</item>
+    <item name="colorOnBackground">@color/md_theme_light_onBackground</item>
+    <item name="colorSurface">@color/md_theme_light_surface</item>
+    <item name="colorOnSurface">@color/md_theme_light_onSurface</item>
+    <item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>
+    <item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>
+    <item name="colorOutline">@color/md_theme_light_outline</item>
+    <item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
+    <item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
+    <item name="colorPrimaryInverse">@color/md_theme_light_primaryInverse</item>
+  </style>
+</resources>
diff --git a/feature-add/src/main/res/layout/activity_add.xml b/feature-add/src/main/res/layout/activity_add.xml
index 94ee3ac6..5a145e88 100644
--- a/feature-add/src/main/res/layout/activity_add.xml
+++ b/feature-add/src/main/res/layout/activity_add.xml
@@ -2,8 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@android:color/white">
+    android:layout_height="match_parent">
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
@@ -20,11 +19,11 @@
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@android:color/white">
+                android:layout_height="wrap_content">
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/emailEditText"
+                    style="?attr/textInputFilledStyle"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
@@ -55,6 +54,7 @@
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/firstNameEditText"
+                    style="?attr/textInputFilledStyle"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
@@ -85,6 +85,7 @@
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/lastNameEditText"
+                    style="?attr/textInputFilledStyle"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
@@ -119,7 +120,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
-                    android:backgroundTint="@color/colorPrimary"
                     android:elevation="12dp"
                     android:fontFamily="@font/noto_sans"
                     android:paddingStart="32dp"
@@ -127,7 +127,6 @@
                     android:paddingEnd="32dp"
                     android:paddingBottom="12dp"
                     android:text="Add"
-                    android:textColor="@android:color/white"
                     android:textSize="16sp"
                     app:cornerRadius="8dp"
                     app:layout_constraintBottom_toBottomOf="parent"
diff --git a/feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainActivity.kt b/feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainActivity.kt
index e4560a04..3231e46e 100644
--- a/feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainActivity.kt
+++ b/feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainActivity.kt
@@ -3,12 +3,13 @@ package com.hoc.flowmvi.ui.main
 import android.view.Menu
 import android.view.MenuItem
 import androidx.core.view.isVisible
-import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.divider.MaterialDividerItemDecoration
 import com.hoc.flowmvi.core_ui.SwipeLeftToDeleteCallback
 import com.hoc.flowmvi.core_ui.clicks
+import com.hoc.flowmvi.core_ui.dpToPx
 import com.hoc.flowmvi.core_ui.navigator.Navigator
 import com.hoc.flowmvi.core_ui.refreshes
 import com.hoc.flowmvi.core_ui.toast
@@ -62,7 +63,14 @@ class MainActivity :
       setHasFixedSize(true)
       layoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, false)
       adapter = userAdapter
-      addItemDecoration(DividerItemDecoration(context, RecyclerView.VERTICAL))
+      addItemDecoration(
+        MaterialDividerItemDecoration(context, RecyclerView.VERTICAL).apply {
+          dividerInsetStart = dpToPx(8f)
+          dividerInsetEnd = dpToPx(8f)
+          isLastItemDecorated = false
+          dividerThickness = dpToPx(0.8f)
+        }
+      )
 
       ItemTouchHelper(
         SwipeLeftToDeleteCallback(context) cb@{ position ->
diff --git a/feature-main/src/main/res/drawable/ic_add_white_24dp.xml b/feature-main/src/main/res/drawable/ic_add_white_24dp.xml
index e3979cd7..5257a22e 100644
--- a/feature-main/src/main/res/drawable/ic_add_white_24dp.xml
+++ b/feature-main/src/main/res/drawable/ic_add_white_24dp.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
 </vector>
diff --git a/feature-main/src/main/res/layout/activity_main.xml b/feature-main/src/main/res/layout/activity_main.xml
index 9772a99a..5cf781b9 100644
--- a/feature-main/src/main/res/layout/activity_main.xml
+++ b/feature-main/src/main/res/layout/activity_main.xml
@@ -4,10 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/white"
     tools:context=".MainActivity">
 
-
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipeRefreshLayout"
         android:layout_width="match_parent"
@@ -48,7 +46,6 @@
         android:paddingEnd="32dp"
         android:paddingBottom="16dp"
         android:text="Retry"
-        android:textColor="@android:color/white"
         android:textSize="16sp"
         app:cornerRadius="8dp"
         app:layout_constraintBottom_toTopOf="@+id/errorMessageTextView"
diff --git a/feature-main/src/main/res/layout/item_recycler_user.xml b/feature-main/src/main/res/layout/item_recycler_user.xml
index 94efaba3..68c3ff16 100644
--- a/feature-main/src/main/res/layout/item_recycler_user.xml
+++ b/feature-main/src/main/res/layout/item_recycler_user.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@android:color/white">
+    >
 
     <ImageView
         android:id="@+id/avatarImage"
diff --git a/feature-search/src/main/res/layout/activity_search.xml b/feature-search/src/main/res/layout/activity_search.xml
index 56359fed..1b23af7e 100644
--- a/feature-search/src/main/res/layout/activity_search.xml
+++ b/feature-search/src/main/res/layout/activity_search.xml
@@ -4,7 +4,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="@android:color/white">
+ >
 
   <TextView
     android:id="@+id/text_query"
@@ -55,7 +55,6 @@
     android:paddingEnd="32dp"
     android:paddingBottom="16dp"
     android:text="Retry"
-    android:textColor="@android:color/white"
     android:textSize="16sp"
     app:cornerRadius="8dp"
     app:layout_constraintBottom_toTopOf="@+id/errorMessageTextView"
diff --git a/feature-search/src/main/res/layout/item_recycler_search_user.xml b/feature-search/src/main/res/layout/item_recycler_search_user.xml
index 4431f021..41fa3a90 100644
--- a/feature-search/src/main/res/layout/item_recycler_search_user.xml
+++ b/feature-search/src/main/res/layout/item_recycler_search_user.xml
@@ -4,7 +4,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="@android:color/white"
+  android:background="?attr/colorSurface"
   tools:layout_width="150dp">
 
   <ImageView