diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ab24b77e8..a1901cc50 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -141,6 +141,9 @@ detekt {
 }
 
 dependencies {
+    // Material Design 3
+    implementation("com.google.android.material:material:1.11.0")
+
     implementation(libs.fossify.commons)
     implementation(libs.eventbus)
     implementation(libs.indicator.fast.scroll)
@@ -154,4 +157,4 @@ dependencies {
     implementation(libs.bundles.room)
     ksp(libs.androidx.room.compiler)
     detektPlugins(libs.compose.detekt)
-}
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2fa856ddb..f1d945b14 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,7 +36,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_launcher_name"
         android:roundIcon="@mipmap/ic_launcher"
-        android:theme="@style/AppTheme">
+        android:theme="@style/Theme.Messages">
 
         <activity
             android:name=".activities.SplashActivity"
@@ -530,4 +530,4 @@
             </intent-filter>
         </activity-alias>
     </application>
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_in_right.xml b/app/src/main/res/anim/slide_in_right.xml
new file mode 100644
index 000000000..79683d35b
--- /dev/null
+++ b/app/src/main/res/anim/slide_in_right.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="300"
+        android:fromXDelta="100%"
+        android:toXDelta="0%"
+        android:interpolator="@android:anim/accelerate_decelerate_interpolator" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_out_left.xml b/app/src/main/res/anim/slide_out_left.xml
new file mode 100644
index 000000000..0d9e0c6f9
--- /dev/null
+++ b/app/src/main/res/anim/slide_out_left.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="300"
+        android:fromXDelta="0%"
+        android:toXDelta="-100%"
+        android:interpolator="@android:anim/accelerate_decelerate_interpolator" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index f70ffdd20..c22702b7b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,148 +1,100 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main_coordinator"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
+    tools:context=".activities.MainActivity">
 
-    <org.fossify.commons.views.MySearchMenu
-        android:id="@+id/main_menu"
+    <!-- AppBar dengan MaterialToolbar -->
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-    <RelativeLayout
-        android:id="@+id/main_nested_scrollview"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorSurfaceContainer"
+        app:title="@string/app_name"
+        app:titleTextColor="?attr/colorOnSurface"
+        app:menu="@menu/main_menu"
+        app:layout_scrollFlags="scroll|enterAlways"
+        style="@style/Widget.Messages.Toolbar" />
+
+    <!-- FrameLayout untuk konten utama -->
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fillViewport="true"
-        android:scrollbars="none"
+        android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <androidx.coordinatorlayout.widget.CoordinatorLayout
-            android:id="@+id/main_coordinator_wrapper"
+        <!-- Progress Bar -->
+        <com.google.android.material.progressindicator.LinearProgressIndicator
+            android:id="@+id/conversations_progress_bar"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <RelativeLayout
-                android:id="@+id/main_holder"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <com.google.android.material.progressindicator.LinearProgressIndicator
-                    android:id="@+id/conversations_progress_bar"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentTop="true"
-                    android:indeterminate="true"
-                    android:visibility="gone"
-                    app:hideAnimationBehavior="outward"
-                    app:showAnimationBehavior="inward"
-                    app:showDelay="250"
-                    tools:visibility="visible" />
-
-                <org.fossify.commons.views.MyTextView
-                    android:id="@+id/no_conversations_placeholder"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="@dimen/bigger_margin"
-                    android:alpha="0.8"
-                    android:gravity="center"
-                    android:paddingLeft="@dimen/activity_margin"
-                    android:paddingRight="@dimen/activity_margin"
-                    android:text="@string/no_conversations_found"
-                    android:textSize="@dimen/bigger_text_size"
-                    android:textStyle="italic"
-                    android:visibility="gone" />
-
-                <org.fossify.commons.views.MyTextView
-                    android:id="@+id/no_conversations_placeholder_2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/no_conversations_placeholder"
-                    android:layout_centerHorizontal="true"
-                    android:background="@drawable/ripple_all_corners"
-                    android:gravity="center"
-                    android:padding="@dimen/activity_margin"
-                    android:text="@string/start_conversation"
-                    android:textSize="@dimen/bigger_text_size"
-                    android:visibility="gone" />
-
-                <com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
-                    android:id="@+id/conversations_fastscroller"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <org.fossify.commons.views.MyRecyclerView
-                        android:id="@+id/conversations_list"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:clipToPadding="false"
-                        android:layoutAnimation="@anim/layout_animation"
-                        android:overScrollMode="ifContentScrolls"
-                        android:scrollbars="none"
-                        app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager" />
-
-                </com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller>
-            </RelativeLayout>
-        </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-        <RelativeLayout
-            android:id="@+id/search_holder"
+            android:layout_height="wrap_content"
+            android:indeterminate="true"
+            android:visibility="gone"
+            app:hideAnimationBehavior="outward"
+            app:showAnimationBehavior="inward"
+            app:showDelay="250"
+            tools:visibility="visible" />
+
+        <!-- Placeholder: Tidak ada percakapan -->
+        <LinearLayout
+            android:id="@+id/no_conversations_placeholder"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:alpha="0"
-            android:visibility="gone">
-
-            <org.fossify.commons.views.MyTextView
-                android:id="@+id/search_placeholder"
-                android:layout_width="match_parent"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:visibility="gone"
+            android:padding="24dp">
+
+            <ImageView
+                android:layout_width="120dp"
+                android:layout_height="120dp"
+                android:src="@drawable/ic_message_outline"
+                android:tint="?attr/colorOnSurfaceVariant"
+                android:contentDescription="@string/no_conversations" />
+
+            <TextView
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="@dimen/activity_margin"
-                android:alpha="0.8"
-                android:gravity="center"
-                android:paddingStart="@dimen/activity_margin"
-                android:paddingEnd="@dimen/activity_margin"
-                android:text="@string/no_items_found"
-                android:textSize="@dimen/bigger_text_size"
-                android:textStyle="italic" />
-
-            <org.fossify.commons.views.MyTextView
-                android:id="@+id/search_placeholder_2"
-                android:layout_width="match_parent"
+                android:layout_marginTop="16dp"
+                android:text="@string/no_conversations"
+                android:textColor="?attr/colorOnSurfaceVariant"
+                android:textSize="18sp" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btn_start_conversation"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/search_placeholder"
-                android:layout_centerHorizontal="true"
-                android:alpha="0.8"
-                android:gravity="center"
-                android:paddingStart="@dimen/activity_margin"
-                android:paddingTop="@dimen/medium_margin"
-                android:paddingEnd="@dimen/activity_margin"
-                android:paddingBottom="@dimen/medium_margin"
-                android:text="@string/type_2_characters"
-                android:textSize="@dimen/bigger_text_size"
-                android:textStyle="italic" />
-
-            <org.fossify.commons.views.MyRecyclerView
-                android:id="@+id/search_results_list"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clipToPadding="false"
-                android:scrollbars="vertical"
-                app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager" />
-
-        </RelativeLayout>
-    </RelativeLayout>
-
-    <org.fossify.commons.views.MyFloatingActionButton
+                android:layout_marginTop="16dp"
+                android:text="@string/start_conversation"
+                style="@style/Widget.Messages.Button.Outlined" />
+        </LinearLayout>
+
+        <!-- RecyclerView untuk Daftar Percakapan -->
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/conversations_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:padding="8dp"
+            android:clipToPadding="false"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"
+            style="@style/Widget.Messages.RecyclerView"
+            tools:listitem="@layout/item_conversation" />
+    </FrameLayout>
+
+    <!-- FloatingActionButton untuk Buat Pesan Baru -->
+    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
         android:id="@+id/conversations_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/activity_margin"
-        android:src="@drawable/ic_plus_vector"
-        app:applyWindowInsets="true" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+        android:layout_margin="16dp"
+        android:text="@string/new_message"
+        android:contentDescription="@string/new_message"
+        app:icon="@drawable/ic_add"
+        app:iconTint="?attr/colorOnPrimaryContainer"
+        style="@style/Widget.Messages.FloatingActionButton" />
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_thread.xml b/app/src/main/res/layout/activity_thread.xml
index f9e9ad266..450b1a9be 100644
--- a/app/src/main/res/layout/activity_thread.xml
+++ b/app/src/main/res/layout/activity_thread.xml
@@ -1,170 +1,107 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/thread_coordinator"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <org.fossify.commons.views.MyAppBarLayout
-        android:id="@+id/thread_appbar"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="?attr/colorSurface"
+    tools:context=".activities.ThreadActivity">
+
+    <!-- AppBar -->
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/thread_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/thread_toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="@color/color_primary"
-            app:menu="@menu/menu_thread"
-            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
-
-    </org.fossify.commons.views.MyAppBarLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/thread_holder"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorSurfaceContainer"
+        app:title="John Doe"
+        app:titleTextColor="?attr/colorOnSurface"
+        app:navigationIcon="@drawable/ic_arrow_back"
+        app:navigationIconTint="?attr/colorOnSurface"
+        app:menu="@menu/menu_thread"
+        style="@style/Widget.Messages.Toolbar" />
+
+    <!-- RecyclerView untuk Daftar Pesan -->
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/thread_messages_list"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true"
-        android:scrollbars="none"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <include
-            layout="@layout/divider"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <RelativeLayout
-            android:id="@+id/thread_add_contacts"
-            android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:padding="16dp"
+        android:clipToPadding="false"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:stackFromEnd="true"
+        style="@style/Widget.Messages.RecyclerView"
+        tools:listitem="@layout/item_message" />
+
+    <!-- Input Pesan (Bottom Bar) -->
+    <LinearLayout
+        android:id="@+id/message_holder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="16dp"
+        android:background="?attr/colorSurfaceContainer"
+        android:gravity="center_vertical">
+
+        <!-- Tombol Lampirkan File -->
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btn_attach"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:contentDescription="@string/attach"
+            app:icon="@drawable/ic_attach_file"
+            app:iconTint="?attr/colorOnSurfaceVariant"
+            style="@style/Widget.Messages.Button.Outlined" />
+
+        <!-- Input Pesan -->
+        <com.google.android.material.textfield.TextInputLayout
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:visibility="gone"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:visibility="visible">
-
-            <LinearLayout
-                android:id="@+id/selected_contacts"
+            android:layout_weight="1"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:hint="@string/type_a_message"
+            app:boxBackgroundMode="outline"
+            app:boxBackgroundColor="?attr/colorSurface"
+            app:boxStrokeColor="?attr/colorOutline"
+            app:hintTextColor="?attr/colorOnSurfaceVariant"
+            style="@style/Widget.Messages.TextInputLayout">
+
+            <com.google.android.material.textfield.OutlinedTextInputEditText
+                android:id="@+id/et_message"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/activity_margin"
-                android:orientation="vertical" />
-
-            <ImageView
-                android:id="@+id/confirm_manage_contacts"
-                android:layout_width="@dimen/normal_icon_size"
-                android:layout_height="@dimen/normal_icon_size"
-                android:layout_alignParentEnd="true"
-                android:layout_marginStart="@dimen/medium_margin"
-                android:layout_marginTop="@dimen/normal_margin"
-                android:layout_marginEnd="@dimen/medium_margin"
-                android:background="?selectableItemBackgroundBorderless"
-                android:padding="@dimen/small_margin"
-                android:src="@drawable/ic_check_vector" />
-
-            <View
-                android:id="@+id/message_divider_one"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/divider_height"
-                android:layout_below="@+id/selected_contacts"
-                android:background="@color/divider_grey"
-                android:importantForAccessibility="no" />
-
-            <org.fossify.commons.views.MyAutoCompleteTextView
-                android:id="@+id/add_contact_or_number"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/normal_icon_size"
-                android:layout_below="@+id/message_divider_one"
-                android:layout_marginStart="@dimen/activity_margin"
-                android:layout_marginEnd="@dimen/activity_margin"
-                android:layout_toStartOf="@+id/confirm_inserted_number"
-                android:background="@android:color/transparent"
-                android:completionThreshold="2"
-                android:gravity="center_vertical"
-                android:hint="@string/add_contact_or_number"
-                android:inputType="textCapWords"
-                android:textSize="@dimen/big_text_size" />
-
-            <ImageView
-                android:id="@+id/confirm_inserted_number"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_alignTop="@+id/add_contact_or_number"
-                android:layout_alignBottom="@+id/add_contact_or_number"
-                android:layout_alignParentEnd="true"
-                android:layout_marginStart="@dimen/medium_margin"
-                android:layout_marginEnd="@dimen/medium_margin"
-                android:background="?selectableItemBackgroundBorderless"
-                android:contentDescription="@string/confirm_selection"
-                android:paddingStart="@dimen/medium_margin"
-                android:paddingEnd="@dimen/medium_margin"
-                android:src="@drawable/ic_check_vector"
-                android:visibility="gone" />
-
-            <View
-                android:id="@+id/message_divider_two"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/divider_height"
-                android:layout_below="@+id/add_contact_or_number"
-                android:background="@color/divider_grey"
-                android:importantForAccessibility="no" />
-
-        </RelativeLayout>
-
-        <com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
-            android:id="@+id/thread_messages_fastscroller"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintBottom_toTopOf="@id/short_code_holder"
-            app:layout_constraintTop_toBottomOf="@id/thread_add_contacts"
-            app:supportSwipeToRefresh="true">
-
-            <org.fossify.commons.views.MyRecyclerView
-                android:id="@+id/thread_messages_list"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clipToPadding="false"
-                android:overScrollMode="ifContentScrolls"
-                android:paddingTop="@dimen/big_margin"
-                android:paddingBottom="@dimen/medium_margin"
-                android:scrollbars="none"
-                app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager"
-                app:stackFromEnd="true"
-                tools:itemCount="3"
-                tools:listitem="@layout/item_message" />
-
-        </com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller>
-
-        <org.fossify.commons.views.MyFloatingActionButton
-            android:id="@+id/scroll_to_bottom_fab"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/activity_margin"
-            android:src="@drawable/ic_arrow_down_vector"
-            android:visibility="invisible"
-            app:fabSize="mini"
-            app:layout_constraintBottom_toBottomOf="@id/thread_messages_fastscroller"
-            app:layout_constraintEnd_toEndOf="@id/thread_messages_fastscroller"
-            tools:ignore="ContentDescription" />
-
-        <include
-            android:id="@+id/short_code_holder"
-            layout="@layout/layout_invalid_short_code_info"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            app:layout_constraintBottom_toTopOf="@id/message_holder"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/thread_messages_fastscroller"
-            tools:visibility="visible" />
-
-        <include
-            android:id="@+id/message_holder"
-            layout="@layout/layout_thread_send_message_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+                android:inputType="textMultiLine|textCapSentences"
+                android:maxLines="5"
+                android:minLines="1"
+                android:textColor="?attr/colorOnSurface"
+                android:imeOptions="actionSend"
+                android:importantForAutofill="no" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <!-- Tombol Kirim -->
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btn_send"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:contentDescription="@string/send"
+            app:icon="@drawable/ic_send"
+            app:iconTint="?attr/colorOnPrimary"
+            style="@style/Widget.Messages.Button" />
+    </LinearLayout>
+
+    <!-- FloatingActionButton untuk Scroll ke Bawah -->
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/scroll_to_bottom_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        android:src="@drawable/ic_arrow_down_vector"
+        android:visibility="invisible"
+        app:fabSize="mini"
+        app:backgroundTint="?attr/colorPrimaryContainer"
+        app:tint="?attr/colorOnPrimaryContainer" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_conversation.xml b/app/src/main/res/layout/item_conversation.xml
index 385e2d9b2..41e3cce88 100644
--- a/app/src/main/res/layout/item_conversation.xml
+++ b/app/src/main/res/layout/item_conversation.xml
@@ -1,115 +1,125 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/conversation_frame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="@dimen/tiny_margin"
-    android:clickable="true"
-    android:focusable="true"
-    android:minHeight="@dimen/two_line_list_item_min_height"
-    android:paddingStart="@dimen/activity_margin"
-    android:paddingTop="@dimen/medium_margin"
-    android:paddingEnd="@dimen/activity_margin"
-    android:paddingBottom="@dimen/medium_margin">
+    android:layout_marginBottom="8dp"
+    app:cardBackgroundColor="?attr/colorSurfaceContainer"
+    app:cardElevation="4dp"
+    app:cardCornerRadius="12dp"
+    app:rippleColor="?attr/colorPrimaryContainer"
+    style="@style/Widget.Messages.Card">
 
-    <ImageView
-        android:id="@+id/conversation_image"
-        android:layout_width="@dimen/list_icon_size_medium"
-        android:layout_height="@dimen/list_icon_size_medium"
-        app:layout_constraintBottom_toBottomOf="@id/conversation_body_short"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/conversation_address"
-        tools:src="@mipmap/ic_launcher" />
-
-    <org.fossify.commons.views.MyTextView
-        android:id="@+id/conversation_address"
-        android:layout_width="0dp"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/activity_margin"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textAlignment="viewStart"
-        android:textDirection="locale"
-        android:textSize="@dimen/list_primary_text_size"
-        app:layout_constraintBottom_toTopOf="@id/conversation_body_short"
-        app:layout_constraintEnd_toStartOf="@id/conversation_date"
-        app:layout_constraintStart_toEndOf="@id/conversation_image"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="John" />
+        android:orientation="vertical"
+        android:padding="16dp">
 
-    <org.fossify.commons.views.MyTextView
-        android:id="@+id/draft_indicator"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/small_margin"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:text="@string/draft"
-        android:textAlignment="viewStart"
-        android:textColor="@color/color_primary"
-        android:textDirection="locale"
-        android:textSize="@dimen/list_secondary_text_size"
-        android:textStyle="italic"
-        app:layout_constraintBottom_toBottomOf="@id/conversation_body_short"
-        app:layout_constraintEnd_toStartOf="@id/conversation_body_short"
-        app:layout_constraintStart_toStartOf="@id/conversation_address"
-        app:layout_constraintTop_toTopOf="@id/conversation_body_short" />
+        <!-- Header: Nama Kontak + Waktu -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_vertical">
 
-    <org.fossify.commons.views.MyTextView
-        android:id="@+id/conversation_body_short"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/activity_margin"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textAlignment="viewStart"
-        android:textDirection="locale"
-        android:textSize="@dimen/normal_text_size"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/pin_indicator"
-        app:layout_constraintStart_toEndOf="@id/draft_indicator"
-        app:layout_constraintTop_toBottomOf="@id/conversation_address"
-        tools:text="Hey buddy!" />
+            <!-- Avatar Kontak -->
+            <com.google.android.material.imageview.ShapeableImageView
+                android:id="@+id/conversation_image"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:scaleType="centerCrop"
+                app:shapeAppearanceOverlay="@style/CircularImageView"
+                app:srcCompat="@mipmap/ic_launcher"
+                tools:src="@mipmap/ic_launcher" />
 
-    <org.fossify.commons.views.MyTextView
-        android:id="@+id/conversation_date"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:alpha="0.7"
-        android:textAlignment="viewStart"
-        android:textDirection="locale"
-        android:textSize="@dimen/list_tertiary_text_size"
-        app:layout_constraintBottom_toBottomOf="@id/conversation_address"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/conversation_address"
-        tools:text="13:30" />
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_marginStart="12dp"
+                android:orientation="vertical">
+
+                <!-- Nama Kontak -->
+                <TextView
+                    android:id="@+id/conversation_address"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="John Doe"
+                    android:textColor="?attr/colorOnSurface"
+                    android:textSize="18sp"
+                    android:textStyle="bold"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    tools:text="John Doe" />
+
+                <!-- Pratinjau Pesan -->
+                <TextView
+                    android:id="@+id/conversation_body_short"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:text="Hey buddy!"
+                    android:textColor="?attr/colorOnSurfaceVariant"
+                    android:textSize="14sp"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    tools:text="Hey buddy!" />
+            </LinearLayout>
+
+            <!-- Waktu Pesan -->
+            <TextView
+                android:id="@+id/conversation_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="13:30"
+                android:textColor="?attr/colorOnSurfaceVariant"
+                android:textSize="12sp"
+                tools:text="13:30" />
+        </LinearLayout>
+
+        <!-- Indikator Draft -->
+        <TextView
+            android:id="@+id/draft_indicator"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:text="@string/draft"
+            android:textColor="?attr/colorPrimary"
+            android:textSize="12sp"
+            android:textStyle="italic"
+            android:visibility="gone"
+            tools:visibility="visible" />
+
+        <!-- Indikator Pin -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:orientation="horizontal"
+            android:gravity="end">
 
-    <ImageView
-        android:id="@+id/pin_indicator"
-        android:layout_width="@dimen/small_icon_size"
-        android:layout_height="@dimen/small_icon_size"
-        android:alpha="0.7"
-        android:padding="@dimen/tiny_margin"
-        android:src="@drawable/ic_pin_filled_vector"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@id/conversation_body_short"
-        app:layout_constraintEnd_toStartOf="@id/unread_count_badge"
-        app:layout_constraintTop_toTopOf="@id/conversation_body_short"
-        tools:visibility="visible" />
+            <ImageView
+                android:id="@+id/pin_indicator"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:src="@drawable/ic_pin_filled_vector"
+                android:tint="?attr/colorOnSurfaceVariant"
+                android:visibility="gone"
+                tools:visibility="visible" />
 
-    <org.fossify.commons.views.MyTextView
-        android:id="@+id/unread_count_badge"
-        android:layout_width="@dimen/small_icon_size"
-        android:layout_height="@dimen/small_icon_size"
-        android:background="@drawable/circle_background"
-        android:gravity="center"
-        android:textSize="@dimen/list_tertiary_text_size"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@id/conversation_body_short"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/conversation_body_short"
-        tools:text="42"
-        tools:visibility="visible" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+            <!-- Badge Unread -->
+            <com.google.android.material.badge.BadgeView
+                android:id="@+id/unread_count_badge"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:visibility="gone"
+                app:badgeNumber="42"
+                app:badgeTextColor="?attr/colorOnPrimary"
+                app:badgeBackgroundColor="?attr/colorPrimary"
+                tools:visibility="visible" />
+        </LinearLayout>
+    </LinearLayout>
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index a57c387f5..99cbd1050 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -1,69 +1,142 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/thread_message_holder"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/small_margin"
-    android:foreground="@drawable/selector"
-    android:paddingHorizontal="@dimen/activity_margin">
+    android:orientation="vertical"
+    android:padding="4dp">
 
-    <RelativeLayout
-        android:id="@+id/thread_message_wrapper"
-        android:layout_width="0dp"
+    <!-- Pesan yang Diterima (Kiri) -->
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/cv_received_message"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintWidth_percent="0.8">
-
-        <ImageView
-            android:id="@+id/thread_message_sender_photo"
-            android:layout_width="@dimen/list_icon_size_medium"
-            android:layout_height="@dimen/list_icon_size_medium"
-            android:layout_alignBottom="@+id/thread_message_body"
-            android:layout_alignParentStart="true"
-            android:layout_marginEnd="@dimen/medium_margin"
-            android:src="@drawable/ic_person_vector"
-            android:visibility="gone"
-            tools:ignore="ContentDescription"
-            tools:visibility="visible" />
+        android:layout_gravity="start"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="64dp"
+        android:layout_marginBottom="4dp"
+        app:cardBackgroundColor="?attr/colorSurfaceVariant"
+        app:cardElevation="2dp"
+        app:cardCornerRadius="16dp"
+        style="@style/Widget.Messages.Card">
 
         <LinearLayout
-            android:id="@+id/thread_message_attachments_holder"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_toEndOf="@id/thread_message_sender_photo"
-            android:divider="@drawable/linear_layout_vertical_divider"
             android:orientation="vertical"
-            android:showDividers="middle" />
+            android:padding="12dp">
 
-        <ImageView
-            android:id="@+id/thread_message_play_outline"
-            android:layout_width="@dimen/play_outline_size"
-            android:layout_height="@dimen/play_outline_size"
-            android:layout_alignEnd="@+id/thread_message_attachments_holder"
-            android:layout_alignBottom="@+id/thread_message_attachments_holder"
-            android:layout_marginEnd="@dimen/medium_margin"
-            android:layout_marginBottom="@dimen/activity_margin"
-            android:src="@drawable/ic_play_outline_vector"
-            android:visibility="gone"
-            tools:ignore="ContentDescription" />
+            <!-- Teks Pesan -->
+            <TextView
+                android:id="@+id/thread_message_body"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Hello, how are you?"
+                android:textColor="?attr/colorOnSurfaceVariant"
+                android:textSize="14sp"
+                android:autoLink="email|web"
+                tools:text="Hello, how are you?" />
 
-        <org.fossify.commons.views.MyTextView
-            android:id="@+id/thread_message_body"
+            <!-- Waktu Pesan -->
+            <TextView
+                android:id="@+id/thread_message_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:text="10:30 AM"
+                android:textColor="?attr/colorOnSurfaceVariant"
+                android:textSize="10sp"
+                tools:text="10:30 AM" />
+        </LinearLayout>
+    </com.google.android.material.card.MaterialCardView>
+
+    <!-- Pesan yang Dikirim (Kanan) -->
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/cv_sent_message"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:layout_marginStart="64dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="4dp"
+        app:cardBackgroundColor="?attr/colorPrimaryContainer"
+        app:cardElevation="2dp"
+        app:cardCornerRadius="16dp"
+        style="@style/Widget.Messages.Card">
+
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/thread_message_attachments_holder"
-            android:layout_marginVertical="@dimen/tiny_margin"
-            android:layout_toEndOf="@id/thread_message_sender_photo"
-            android:autoLink="email|web"
-            android:background="@drawable/item_received_background"
-            android:drawablePadding="8dp"
-            android:padding="@dimen/normal_margin"
-            android:textSize="@dimen/normal_text_size"
-            tools:drawableEndCompat="@drawable/scheduled_message_icon"
-            tools:text="Message content" />
-    </RelativeLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
+            android:orientation="vertical"
+            android:padding="12dp">
+
+            <!-- Teks Pesan -->
+            <TextView
+                android:id="@+id/thread_message_body_sent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="I'm fine, thanks!"
+                android:textColor="?attr/colorOnPrimaryContainer"
+                android:textSize="14sp"
+                android:autoLink="email|web"
+                tools:text="I'm fine, thanks!" />
+
+            <!-- Status Pesan (Terkirim/Terbaca) -->
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginTop="4dp"
+                android:gravity="end">
+
+                <!-- Indikator Terkirim -->
+                <ImageView
+                    android:id="@+id/iv_sent_status"
+                    android:layout_width="12dp"
+                    android:layout_height="12dp"
+                    android:src="@drawable/ic_check"
+                    android:tint="?attr/colorOnPrimaryContainer"
+                    android:visibility="visible" />
+
+                <!-- Indikator Terbaca -->
+                <ImageView
+                    android:id="@+id/iv_read_status"
+                    android:layout_width="12dp"
+                    android:layout_height="12dp"
+                    android:layout_marginStart="2dp"
+                    android:src="@drawable/ic_check_all"
+                    android:tint="?attr/colorOnPrimaryContainer"
+                    android:visibility="gone" />
+
+                <!-- Waktu Pesan -->
+                <TextView
+                    android:id="@+id/thread_message_time_sent"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="4dp"
+                    android:text="10:31 AM"
+                    android:textColor="?attr/colorOnPrimaryContainer"
+                    android:textSize="10sp"
+                    tools:text="10:31 AM" />
+            </LinearLayout>
+        </LinearLayout>
+    </com.google.android.material.card.MaterialCardView>
+
+    <!-- Pesan Sistem (Tengah) -->
+    <TextView
+        android:id="@+id/tv_system_message"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_margin="8dp"
+        android:background="?attr/colorSurfaceContainer"
+        android:paddingHorizontal="12dp"
+        android:paddingVertical="6dp"
+        android:text="Message deleted"
+        android:textColor="?attr/colorOnSurfaceVariant"
+        android:textSize="12sp"
+        android:visibility="gone"
+        app:cornerRadius="16dp"
+        tools:text="Message deleted" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d781ec5f1..7b459b720 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,4 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Material Design 3 - Seed Color (Primary) -->
+    <color name="md_ref_pal_primary">#6750A4</color>
+    <color name="md_ref_pal_primary_container">#EADDFF</color>
+    <color name="md_ref_pal_on_primary">#FFFFFF</color>
+    <color name="md_ref_pal_on_primary_container">#21005D</color>
 
-</resources>
+    <!-- Secondary Colors -->
+    <color name="md_ref_pal_secondary">#625B71</color>
+    <color name="md_ref_pal_secondary_container">#E8DEF8</color>
+    <color name="md_ref_pal_on_secondary">#FFFFFF</color>
+    <color name="md_ref_pal_on_secondary_container">#1E192B</color>
+
+    <!-- Tertiary Colors -->
+    <color name="md_ref_pal_tertiary">#7D5260</color>
+    <color name="md_ref_pal_tertiary_container">#FFD8E4</color>
+    <color name="md_ref_pal_on_tertiary">#FFFFFF</color>
+    <color name="md_ref_pal_on_tertiary_container">#31111D</color>
+
+    <!-- Error Colors -->
+    <color name="md_ref_pal_error">#B3261E</color>
+    <color name="md_ref_pal_error_container">#F9DEDC</color>
+    <color name="md_ref_pal_on_error">#FFFFFF</color>
+    <color name="md_ref_pal_on_error_container">#410E0B</color>
+
+    <!-- Surface & Background Colors -->
+    <color name="md_ref_pal_surface">#FFFBFE</color>
+    <color name="md_ref_pal_surface_container">#F3EDF7</color>
+    <color name="md_ref_pal_surface_variant">#E7E0EC</color>
+    <color name="md_ref_pal_on_surface">#1C1B1F</color>
+    <color name="md_ref_pal_on_surface_variant">#49454F</color>
+
+    <!-- Outline & Shadow -->
+    <color name="md_ref_pal_outline">#79747E</color>
+    <color name="md_ref_pal_shadow">#000000</color>
+    <color name="md_ref_pal_scrim">#000000</color>
+
+    <!-- Inverse Colors (Dark Mode) -->
+    <color name="md_ref_pal_inverse_surface">#313033</color>
+    <color name="md_ref_pal_inverse_on_surface">#F4EFF4</color>
+    <color name="md_ref_pal_inverse_primary">#D0BCFF</color>
+
+    <!-- Custom Colors (Untuk kompatibilitas) -->
+    <color name="colorPrimary">@color/md_ref_pal_primary</color>
+    <color name="colorPrimaryContainer">@color/md_ref_pal_primary_container</color>
+    <color name="colorOnPrimary">@color/md_ref_pal_on_primary</color>
+    <color name="colorOnPrimaryContainer">@color/md_ref_pal_on_primary_container</color>
+    <color name="colorSurface">@color/md_ref_pal_surface</color>
+    <color name="colorSurfaceContainer">@color/md_ref_pal_surface_container</color>
+    <color name="colorOnSurface">@color/md_ref_pal_on_surface</color>
+    <color name="colorOnSurfaceVariant">@color/md_ref_pal_on_surface_variant</color>
+    <color name="colorError">@color/md_ref_pal_error</color>
+    <color name="colorOutline">@color/md_ref_pal_outline</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 07213302a..f56eb585a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="app_name">Messages</string>
     <string name="app_launcher_name">Messages</string>
+    <string name="new_message">New Message</string>
     <string name="type_a_message">Type a message…</string>
+    <string name="send">Send</string>
+    <string name="attach">Attach</string>
+    <string name="no_conversations">No conversations yet</string>
+    <string name="search_hint">Search messages...</string>
+    <string name="delete">Delete</string>
+    <string name="reply">Reply</string>
+    <string name="forward">Forward</string>
+    <string name="copy">Copy</string>
+    <string name="select_all">Select All</string>
+    <string name="deselect_all">Deselect All</string>
+    <string name="mark_as_read">Mark as Read</string>
+    <string name="mark_as_unread">Mark as Unread</string>
+    <string name="archive">Archive</string>
+    <string name="unarchive">Unarchive</string>
+    <string name="block">Block</string>
+    <string name="unblock">Unblock</string>
+    <string name="settings">Settings</string>
+    <string name="about">About</string>
+    <string name="help">Help</string>
+    <string name="feedback">Feedback</string>
+    <string name="rate_us">Rate Us</string>
+    <string name="share">Share</string>
+    <string name="exit">Exit</string>
+    <string name="confirm_delete">Are you sure you want to delete this?</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
+    <string name="message_deleted">Message deleted</string>
+    <string name="message_sent">Message sent</string>
+    <string name="message_delivered">Delivered</string>
+    <string name="message_read">Read</string>
+    <string name="error_no_permission">Permission denied</string>
+    <string name="error_no_network">No internet connection</string>
     <string name="message_not_sent_short">Message not sent</string>
     <string name="message_not_sent_touch_retry">Not sent. Touch to retry.</string>
     <string name="message_sending_error">Your message to \'%s\' has not been sent</string>
@@ -9,7 +43,6 @@
     <string name="attachment">Attachment</string>
     <string name="no_conversations_found">No stored conversations have been found</string>
     <string name="start_conversation">Start a conversation</string>
-    <string name="reply">Reply</string>
     <string name="show_character_counter">Show a character counter at writing messages</string>
     <string name="loading_messages">Loading messages…</string>
     <string name="no_reply_support">Sender doesn\'t support replies</string>
@@ -19,24 +52,18 @@
     <string name="unpin_conversation">Unpin</string>
     <string name="forward_message">Forward</string>
     <string name="compress_error">Unable to compress image to selected size</string>
-    <!-- Attachments -->
-    <string name="duplicate_item_warning">Duplicate item was not included</string>
-    <!-- vCard -->
     <plurals name="and_other_contacts">
         <item quantity="one">and %d other</item>
         <item quantity="other">and %d others</item>
     </plurals>
-    <!-- New conversation -->
     <string name="new_conversation">New conversation</string>
     <string name="add_contact_or_number">Add Contact or Number…</string>
     <string name="suggestions">Suggestions</string>
-    <!-- Group conversation -->
     <string name="members">Members</string>
     <string name="conversation_name">Conversation name</string>
     <string name="conversation_details">Conversation details</string>
     <string name="rename_conversation">Rename conversation</string>
     <string name="rename_conversation_warning">Only you can see this conversation name</string>
-    <!-- Schedule send -->
     <string name="scheduled_message">Scheduled message</string>
     <string name="schedule_message">Schedule message</string>
     <string name="schedule_send">Schedule send</string>
@@ -45,50 +72,38 @@
     <string name="schedule_send_warning">Keep the phone on and make sure there is nothing killing the app while in background.</string>
     <string name="update_message">Update message</string>
     <string name="send_now">Send now</string>
-    <!-- Message details -->
     <string name="message_details">Message details</string>
     <string name="message_details_sender">Sender</string>
     <string name="message_details_receiver">Receiver</string>
     <string name="message_details_sent_at">Sent at</string>
     <string name="message_details_received_at">Received at</string>
-    <!-- Notifications -->
     <string name="channel_received_sms">Received SMS</string>
-    <string name="new_message">New message</string>
-    <string name="mark_as_read">Mark as Read</string>
-    <string name="mark_as_unread">Mark as Unread</string>
     <string name="me">Me</string>
     <string name="enable_custom_notifications">Enable custom notifications</string>
-    <!-- Archive -->
     <string name="unarchive">Unarchive</string>
     <string name="empty_archive">Delete all archived conversations</string>
     <string name="archived_conversations">Archive</string>
     <string name="show_archived_conversations">Show archived conversations</string>
-    <string name="archive">Archive</string>
     <string name="no_archived_conversations">No archived conversations have been found</string>
     <string name="archive_emptied_successfully">The archive has been emptied successfully</string>
     <string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
     <string name="keep_conversations_archived">Keep conversations archived</string>
-    <!-- Recycle bin -->
     <string name="restore">Restore</string>
     <string name="restore_all_messages">Restore all messages</string>
     <string name="empty_recycle_bin_messages_confirmation">Are you sure you want to empty the Recycle Bin? The messages will be permanently lost.</string>
     <string name="skip_the_recycle_bin_messages">Skip the Recycle Bin, delete messages directly</string>
-    <!-- Confirmation dialog -->
     <string name="delete_whole_conversation_confirmation">Are you sure you want to delete all messages of this conversation?</string>
     <string name="archive_confirmation">Are you sure you want to archive %s?</string>
     <string name="restore_whole_conversation_confirmation">Are you sure you want to restore all messages of this conversation?</string>
     <string name="restore_confirmation">Are you sure you want to restore %s?</string>
-    <!-- Are you sure you want to delete 5 conversations? -->
     <plurals name="delete_conversations">
         <item quantity="one">%d conversation</item>
         <item quantity="other">%d conversations</item>
     </plurals>
-    <!-- Are you sure you want to delete 5 messages? -->
     <plurals name="delete_messages">
         <item quantity="one">%d message</item>
         <item quantity="other">%d messages</item>
     </plurals>
-    <!-- Settings -->
     <string name="keyword">Keyword</string>
     <string name="blocked_keywords">Blocked keywords</string>
     <string name="manage_blocked_keywords">Manage blocked keywords</string>
@@ -105,7 +120,6 @@
     <string name="outgoing_messages">Outgoing messages</string>
     <string name="group_message_mms">Send group messages as MMS</string>
     <string name="send_long_message_mms">Send long messages as MMS</string>
-    <!-- Export / Import -->
     <string name="messages">Messages</string>
     <string name="keywords">Keywords</string>
     <string name="export_messages">Export messages</string>
@@ -117,7 +131,6 @@
     <string name="no_option_selected">You have to select at least one item</string>
     <string name="export_blocked_keywords">Export blocked keywords</string>
     <string name="import_blocked_keywords">Import blocked keywords</string>
-    <!-- Errors -->
     <string name="empty_destination_address">Can\'t send message to an empty number</string>
     <string name="unable_to_save_message">Unable to save message to the telephony database</string>
     <string name="error_service_is_unavailable">Couldn\'t send message, service unavailable</string>
@@ -129,7 +142,7 @@
     <string name="attachment_sized_exceeds_max_limit">Attachment size exceeds max MMS limit</string>
     <string name="sim_card_not_available">SIM card not available</string>
     <string name="couldnt_download_mms">Couldn\'t download MMS</string>
-    <!-- FAQ -->
+    <string name="duplicate_item_warning">Duplicate item was not included</string>
     <string name="faq_1_title">Why does the app require access to the internet?</string>
     <string name="faq_1_text">Sadly it is needed for sending MMS attachments. Not being able to send MMS would be a really huge disadvantage compared to other apps, so we decided to go this way.
     However, as usually, there are no ads, tracking or analytics whatsoever, the internet is used only for sending MMS.</string>
@@ -139,8 +152,4 @@
     <string name="faq_3_text">Yes, you can schedule messages to be sent in the future by long pressing the Send button and picking the desired date and time.</string>
     <string name="faq_4_title">Why do my group message replies appear as individual texts to recipients?</string>
     <string name="faq_4_text">You need to enable \"Send group messages as MMS\" in the app settings. This will ensure that group messages are sent as proper MMS, allowing all participants to see each other\'s replies.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6767789e0..a9d62fe40 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,9 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- App Theme -->
+    <style name="AppTheme" parent="Theme.Messages" />
 
-    <style name="AppTheme" parent="AppTheme.Base" />
-
+    <!-- Style untuk ShapeableImageView (Avatar) -->
     <style name="roundedImageView" parent="">
         <item name="cornerFamily">rounded</item>
-        <item name="cornerSize">@dimen/normal_margin</item>
+        <item name="cornerSize">50%</item>
+    </style>
+
+    <!-- Style untuk CircularImageView -->
+    <style name="CircularImageView" parent="">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">50%</item>
+    </style>
+
+    <!-- Style untuk MaterialButton -->
+    <style name="Widget.Messages.Button" parent="Widget.Material3.Button">
+        <item name="android:textColor">@color/md_ref_pal_onPrimary</item>
+        <item name="backgroundTint">@color/md_ref_pal_primary</item>
+        <item name="rippleColor">@color/md_ref_pal_on_primary</item>
+        <item name="cornerRadius">8dp</item>
+        <item name="android:paddingHorizontal">16dp</item>
+        <item name="android:paddingVertical">8dp</item>
+    </style>
+
+    <!-- Style untuk MaterialButton.Outlined -->
+    <style name="Widget.Messages.Button.Outlined" parent="Widget.Material3.Button.OutlinedButton">
+        <item name="android:textColor">@color/md_ref_pal_primary</item>
+        <item name="strokeColor">@color/md_ref_pal_outline</item>
+        <item name="rippleColor">@color/md_ref_pal_primary_container</item>
+        <item name="cornerRadius">8dp</item>
+    </style>
+
+    <!-- Style untuk MaterialCardView -->
+    <style name="Widget.Messages.Card" parent="Widget.Material3.CardView">
+        <item name="cardBackgroundColor">@color/md_ref_pal_surface_container</item>
+        <item name="cardElevation">4dp</item>
+        <item name="cardCornerRadius">12dp</item>
+    </style>
+
+    <!-- Style untuk TextInputLayout -->
+    <style name="Widget.Messages.TextInputLayout" parent="Widget.Material3.TextInputLayout.OutlinedBox">
+        <item name="boxBackgroundColor">@color/md_ref_pal_surface_container</item>
+        <item name="boxStrokeColor">@color/md_ref_pal_outline</item>
+        <item name="hintTextColor">@color/md_ref_pal_on_surface_variant</item>
+        <item name="android:textColor">@color/md_ref_pal_on_surface</item>
+        <item name="cornerRadius">8dp</item>
+    </style>
+
+    <!-- Style untuk FloatingActionButton -->
+    <style name="Widget.Messages.FloatingActionButton" parent="Widget.Material3.ExtendedFloatingActionButton">
+        <item name="backgroundTint">@color/md_ref_pal_primary_container</item>
+        <item name="iconTint">@color/md_ref_pal_on_primary_container</item>
+        <item name="rippleColor">@color/md_ref_pal_on_primary_container</item>
+        <item name="cornerRadius">16dp</item>
+    </style>
+
+    <!-- Style untuk MaterialToolbar -->
+    <style name="Widget.Messages.Toolbar" parent="Widget.Material3.Toolbar">
+        <item name="android:background">@color/md_ref_pal_surface_container</item>
+        <item name="titleTextColor">@color/md_ref_pal_on_surface</item>
+        <item name="navigationIconTint">@color/md_ref_pal_on_surface</item>
+    </style>
+
+    <!-- Style untuk RecyclerView -->
+    <style name="Widget.Messages.RecyclerView" parent="Widget.AppCompat.RecyclerView">
+        <item name="android:padding">8dp</item>
+        <item name="android:clipToPadding">false</item>
     </style>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
new file mode 100644
index 000000000..55bebfc44
--- /dev/null
+++ b/app/src/main/res/values/themes.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base Theme (Material 3 + Dynamic Colors) -->
+    <style name="Theme.Messages" parent="Theme.Material3.DayNight.DynamicColors.DarkActionBar">
+        <!-- Primary Colors -->
+        <item name="colorPrimary">@color/md_ref_pal_primary</item>
+        <item name="colorPrimaryContainer">@color/md_ref_pal_primary_container</item>
+        <item name="colorOnPrimary">@color/md_ref_pal_on_primary</item>
+        <item name="colorOnPrimaryContainer">@color/md_ref_pal_on_primary_container</item>
+
+        <!-- Secondary Colors -->
+        <item name="colorSecondary">@color/md_ref_pal_secondary</item>
+        <item name="colorSecondaryContainer">@color/md_ref_pal_secondary_container</item>
+        <item name="colorOnSecondary">@color/md_ref_pal_on_secondary</item>
+        <item name="colorOnSecondaryContainer">@color/md_ref_pal_on_secondary_container</item>
+
+        <!-- Tertiary Colors -->
+        <item name="colorTertiary">@color/md_ref_pal_tertiary</item>
+        <item name="colorTertiaryContainer">@color/md_ref_pal_tertiary_container</item>
+        <item name="colorOnTertiary">@color/md_ref_pal_on_tertiary</item>
+        <item name="colorOnTertiaryContainer">@color/md_ref_pal_on_tertiary_container</item>
+
+        <!-- Error Colors -->
+        <item name="colorError">@color/md_ref_pal_error</item>
+        <item name="colorErrorContainer">@color/md_ref_pal_error_container</item>
+        <item name="colorOnError">@color/md_ref_pal_on_error</item>
+        <item name="colorOnErrorContainer">@color/md_ref_pal_on_error_container</item>
+
+        <!-- Surface & Background -->
+        <item name="colorSurface">@color/md_ref_pal_surface</item>
+        <item name="colorSurfaceContainer">@color/md_ref_pal_surface_container</item>
+        <item name="colorOnSurface">@color/md_ref_pal_on_surface</item>
+        <item name="colorSurfaceVariant">@color/md_ref_pal_surface_variant</item>
+        <item name="colorOnSurfaceVariant">@color/md_ref_pal_on_surface_variant</item>
+
+        <!-- Other Colors -->
+        <item name="colorOutline">@color/md_ref_pal_outline</item>
+        <item name="colorShadow">@color/md_ref_pal_shadow</item>
+        <item name="colorScrim">@color/md_ref_pal_scrim</item>
+
+        <!-- Typography -->
+        <item name="android:fontFamily">@font/roboto</item>
+        <item name="android:textColor">@color/md_ref_pal_on_surface</item>
+
+        <!-- Window & Status Bar -->
+        <item name="android:windowBackground">@color/md_ref_pal_surface</item>
+        <item name="android:colorBackground">@color/md_ref_pal_surface</item>
+        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorSurfaceContainer</item>
+        <item name="android:navigationBarColor" tools:targetApi="l">?attr/colorSurfaceContainer</item>
+
+        <!-- Animasi Transisi -->
+        <item name="android:windowAnimationStyle">@style/WindowAnimation</item>
+    </style>
+
+    <!-- Animasi untuk Transisi Aktivitas -->
+    <style name="WindowAnimation">
+        <item name="android:windowEnterAnimation">@anim/slide_in_right</item>
+        <item name="android:windowExitAnimation">@anim/slide_out_left</item>
+    </style>
+</resources>
\ No newline at end of file