diff --git a/Readme.md b/README.md
similarity index 99%
rename from Readme.md
rename to README.md
index e455ec3..769831e 100644
--- a/Readme.md
+++ b/README.md
@@ -301,6 +301,4 @@
 
 ## **Features for Sprint 5 v1.1.0**
 * Fungsi AI (Upload File) (ok)
-* Fitur Sematkan Category, otomatis paling atas (ok)
-
-## **Unit Testing is Coming**
\ No newline at end of file
+* Fitur Sematkan Category, otomatis paling atas (ok)
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index adb03e4..6e763f7 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -101,9 +101,6 @@ dependencies {
     // PDF Parser
     implementation("com.tom-roush:pdfbox-android:2.0.27.0")
 
-    // FIREBASE SUDAH DIHAPUS - baris ini yang menyebabkan error
-    // implementation(libs.firebase.firestore.ktx)
-
     // Testing
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
diff --git a/app/src/main/java/com/example/notesai/data/model/ChatMessage.kt b/app/src/main/java/com/example/notesai/data/model/ChatMessage.kt
index 2c19659..b6fa999 100644
--- a/app/src/main/java/com/example/notesai/data/model/ChatMessage.kt
+++ b/app/src/main/java/com/example/notesai/data/model/ChatMessage.kt
@@ -1,8 +1,9 @@
-// File: data/model/ChatMessage.kt
 package com.example.notesai.data.model
 
+import kotlinx.serialization.Serializable
 import java.util.UUID
 
+@Serializable
 data class ChatMessage(
     val id: String = UUID.randomUUID().toString(),
     val message: String,
diff --git a/app/src/main/java/com/example/notesai/data/model/SerializableModels.kt b/app/src/main/java/com/example/notesai/data/model/SerializableModels.kt
index 36c7df2..976ffa4 100644
--- a/app/src/main/java/com/example/notesai/data/model/SerializableModels.kt
+++ b/app/src/main/java/com/example/notesai/data/model/SerializableModels.kt
@@ -11,7 +11,7 @@ data class SerializableCategory(
     val gradientEnd: Long,
     val timestamp: Long,
     val isDeleted: Boolean = false,
-    val isPinned: Boolean = false // NEW: Tambahkan ini
+    val isPinned: Boolean = false
 )
 
 @SuppressLint("UnsafeOptInUsageError")
diff --git a/app/src/main/java/com/example/notesai/util/AppColors.kt b/app/src/main/java/com/example/notesai/util/AppColors.kt
deleted file mode 100644
index 11aeceb..0000000
--- a/app/src/main/java/com/example/notesai/util/AppColors.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-import com.example.notesai.util.AppColors
-
-annotation class AppColors