diff --git a/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaAdapter.kt b/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaAdapter.kt
index b91bb55a..f9beeaf3 100644
--- a/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaAdapter.kt
@@ -1,11 +1,13 @@
 package ani.dantotsu.download.manga
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.BaseAdapter
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.cardview.widget.CardView
 import ani.dantotsu.R
@@ -32,10 +34,18 @@ class OfflineMangaAdapter(
         return position.toLong()
     }
 
+    @SuppressLint("SetTextI18n")
     override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View {
+
+        val style = context.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).getInt("offline_view", 0)
+
         var view = convertView
-        if (view == null) {
-            view = inflater.inflate(R.layout.item_media_compact, parent, false)
+
+        if (view == null && style == 0 ) {
+            view = inflater.inflate(R.layout.item_media_large, parent, false) // large view
+        }
+        else if (view == null && style == 1){
+            view = inflater.inflate(R.layout.item_media_compact, parent, false) // compact view
         }
 
         val item = getItem(position) as OfflineMangaModel
@@ -44,11 +54,31 @@ class OfflineMangaAdapter(
         val itemScore = view.findViewById<TextView>(R.id.itemCompactScore)
         val itemScoreBG = view.findViewById<View>(R.id.itemCompactScoreBG)
         val ongoing = view.findViewById<CardView>(R.id.itemCompactOngoing)
+        val totalchapter = view.findViewById<TextView>(R.id.itemCompactTotal)
+        val type = view.findViewById<TextView>(R.id.itemCompactRelation)
+        val typeView = view.findViewById<LinearLayout>(R.id.itemCompactType)
+
+        if (style == 0){
+            val bannerView = view.findViewById<ImageView>(R.id.itemCompactBanner) // for large view
+            val chapters = view.findViewById<TextView>(R.id.itemTotal)
+            chapters.text = " Chapters"
+            bannerView.setImageURI(item.banner)
+            totalchapter.text = item.totalchapter
+        }
+
+        else if (style == 1){
+            val readchapter = view.findViewById<TextView>(R.id.itemCompactUserProgress) // for compact view
+            readchapter.text = item.readchapter
+            totalchapter.text = " | "+item.totalchapter
+        }
+
         // Bind item data to the views
-        // For example:
+        type.text = item.type
+        typeView.visibility = View.VISIBLE
         imageView.setImageURI(item.image)
         titleTextView.text = item.title
         itemScore.text = item.score
+
         if (item.isOngoing) {
             ongoing.visibility = View.VISIBLE
         } else {
diff --git a/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaFragment.kt b/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaFragment.kt
index e81d2817..a3d330a4 100644
--- a/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaFragment.kt
+++ b/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaFragment.kt
@@ -2,6 +2,7 @@ package ani.dantotsu.download.manga
 
 import android.animation.ObjectAnimator
 import android.content.Context
+import android.app.Activity
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
@@ -16,17 +17,23 @@ import android.view.ViewGroup
 import android.view.animation.OvershootInterpolator
 import android.widget.AutoCompleteTextView
 import android.widget.GridView
+import android.widget.ImageView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.cardview.widget.CardView
+import androidx.core.app.ActivityCompat.recreate
 import androidx.fragment.app.Fragment
 import ani.dantotsu.R
+import ani.dantotsu.Refresh
+import ani.dantotsu.currActivity
 import ani.dantotsu.currContext
 import ani.dantotsu.download.Download
 import ani.dantotsu.download.DownloadsManager
+import ani.dantotsu.initActivity
 import ani.dantotsu.logger
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaDetailsActivity
 import ani.dantotsu.setSafeOnClickListener
+import ani.dantotsu.settings.SettingsActivity
 import ani.dantotsu.settings.SettingsDialogFragment
 import ani.dantotsu.snackString
 import ani.dantotsu.statusBarHeight
@@ -45,6 +52,7 @@ import kotlin.math.max
 import kotlin.math.min
 
 class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener {
+
     private val downloadManager = Injekt.get<DownloadsManager>()
     private var downloads: List<OfflineMangaModel> = listOf()
     private lateinit var gridView: GridView
@@ -91,15 +99,49 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener {
             override fun afterTextChanged(s: Editable?) {
             }
 
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int, ) {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
                 onSearchQuery(s.toString())
             }
         })
+        var style = context?.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE)
+            ?.getInt("offline_view", 0)
+        val layoutList = view.findViewById<ImageView>(R.id.downloadedList)
+        val layoutcompact = view.findViewById<ImageView>(R.id.downloadedGrid)
+        var selected = when (style) {
+            0 -> layoutList
+            1 -> layoutcompact
+            else -> layoutList
+        }
+        selected.alpha = 1f
 
-        gridView = view.findViewById(R.id.gridView)
+        fun selected(it: ImageView) {
+            selected.alpha = 0.33f
+            selected = it
+            selected.alpha = 1f
+        }
+
+        layoutList.setOnClickListener {
+            selected(it as ImageView)
+            style = 0
+            context?.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE)?.edit()
+                ?.putInt("offline_view", style!!)?.apply()
+            recreate(requireActivity())
+
+        }
+
+        layoutcompact.setOnClickListener {
+            selected(it as ImageView)
+            style = 1
+            context?.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE)?.edit()
+                ?.putInt("offline_view", style!!)?.apply()
+            recreate(requireActivity())
+        }
+
+        gridView = if(style == 0) view.findViewById(R.id.gridView) else view.findViewById(R.id.gridView1)
+        gridView.visibility = View.VISIBLE
         getDownloads()
         adapter = OfflineMangaAdapter(requireContext(), downloads, this)
         gridView.adapter = adapter
@@ -286,20 +328,25 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener {
             val cover = File(directory, "cover.jpg")
             val coverUri: Uri? = if (cover.exists()) {
                 Uri.fromFile(cover)
-            } else {
-                null
-            }
+            } else null
+            val banner = File(directory, "banner.jpg")
+            val bannerUri: Uri? = if (banner.exists()) {
+                Uri.fromFile(banner)
+            } else null
             val title = mediaModel.nameMAL ?: mediaModel.nameRomaji
             val score = ((if (mediaModel.userScore == 0) (mediaModel.meanScore
                 ?: 0) else mediaModel.userScore) / 10.0).toString()
-            val isOngoing = false
+            val isOngoing = mediaModel.status == currActivity()!!.getString(R.string.status_releasing)
             val isUserScored = mediaModel.userScore != 0
-            return OfflineMangaModel(title, score, isOngoing, isUserScored, coverUri)
+            val readchapter = (mediaModel.userProgress ?: "~").toString()
+            val totalchapter = "${mediaModel.manga?.totalChapters ?: "??"}"
+            val chapters = " Chapters"
+            return OfflineMangaModel(title, score, totalchapter, readchapter, type, chapters, isOngoing, isUserScored, coverUri , bannerUri )
         } catch (e: Exception) {
             logger("Error loading media.json: ${e.message}")
             logger(e.printStackTrace())
             FirebaseCrashlytics.getInstance().recordException(e)
-            return OfflineMangaModel("unknown", "0", false, false, null)
+            return OfflineMangaModel("unknown", "0", "??", "??","movie" ,"hmm", false, false, null , null)
         }
     }
 }
diff --git a/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaModel.kt b/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaModel.kt
index 568081ee..3cebc6f6 100644
--- a/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaModel.kt
+++ b/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaModel.kt
@@ -5,7 +5,12 @@ import android.net.Uri
 data class OfflineMangaModel(
     val title: String,
     val score: String,
+    val totalchapter: String,
+    val readchapter : String,
+    val type: String,
+    val chapters: String,
     val isOngoing: Boolean,
     val isUserScored: Boolean,
-    val image: Uri?
+    val image: Uri?,
+    val banner: Uri?
 )
\ No newline at end of file
diff --git a/app/src/main/java/ani/dantotsu/media/MediaAdaptor.kt b/app/src/main/java/ani/dantotsu/media/MediaAdaptor.kt
index fd04eb58..6483909f 100644
--- a/app/src/main/java/ani/dantotsu/media/MediaAdaptor.kt
+++ b/app/src/main/java/ani/dantotsu/media/MediaAdaptor.kt
@@ -136,7 +136,7 @@ class MediaAdaptor(
                 val media = mediaList?.get(position)
                 if (media != null) {
                     b.itemCompactImage.loadImage(media.cover)
-                    b.itemCompactBanner.loadImage(media.banner ?: media.cover, 400)
+                    b.itemCompactBanner.loadImage(media.banner ?: media.cover)
                     b.itemCompactOngoing.visibility =
                         if (media.status == currActivity()!!.getString(R.string.status_releasing)) View.VISIBLE else View.GONE
                     b.itemCompactTitle.text = media.userPreferredName
diff --git a/app/src/main/java/ani/dantotsu/settings/InstalledAnimeExtensionsFragment.kt b/app/src/main/java/ani/dantotsu/settings/InstalledAnimeExtensionsFragment.kt
index bdbcb7ca..49489825 100644
--- a/app/src/main/java/ani/dantotsu/settings/InstalledAnimeExtensionsFragment.kt
+++ b/app/src/main/java/ani/dantotsu/settings/InstalledAnimeExtensionsFragment.kt
@@ -1,5 +1,6 @@
 package ani.dantotsu.settings
 
+import android.annotation.SuppressLint
 import android.app.AlertDialog
 import android.app.NotificationManager
 import android.content.Context
@@ -49,6 +50,19 @@ class InstalledAnimeExtensionsFragment : Fragment(), SearchQueryHandler {
     private val animeExtensionManager: AnimeExtensionManager = Injekt.get()
     private val extensionsAdapter = AnimeExtensionsAdapter(
         { pkg ->
+            val name= pkg.name
+            val changeUIVisibility: (Boolean) -> Unit = { show ->
+                val activity = requireActivity() as ExtensionsActivity
+                val visibility = if (show) View.VISIBLE else View.GONE
+                activity.findViewById<ViewPager2>(R.id.viewPager).visibility = visibility
+                activity.findViewById<TabLayout>(R.id.tabLayout).visibility = visibility
+                activity.findViewById<TextInputLayout>(R.id.searchView).visibility = visibility
+                activity.findViewById<ImageView>(R.id.languageselect).visibility = visibility
+                activity.findViewById<TextView>(R.id.extensions).text = if (show) getString(R.string.extensions) else name
+                activity.findViewById<FrameLayout>(R.id.fragmentExtensionsContainer).visibility =
+                    if (show) View.GONE else View.VISIBLE
+            }
+            var itemSelected = false
             val allSettings = pkg.sources.filterIsInstance<ConfigurableAnimeSource>()
             if (allSettings.isNotEmpty()) {
                 var selectedSetting = allSettings[0]
@@ -58,65 +72,44 @@ class InstalledAnimeExtensionsFragment : Fragment(), SearchQueryHandler {
                     val dialog = AlertDialog.Builder(requireContext(), R.style.MyPopup)
                         .setTitle("Select a Source")
                         .setSingleChoiceItems(names, selectedIndex) { dialog, which ->
+                            itemSelected = true
                             selectedIndex = which
                             selectedSetting = allSettings[selectedIndex]
                             dialog.dismiss()
 
-                            // Move the fragment transaction here
-                            val eActivity = requireActivity() as ExtensionsActivity
-                            eActivity.runOnUiThread {
-                                val fragment =
-                                    AnimeSourcePreferencesFragment().getInstance(selectedSetting.id) {
-
-                                        eActivity.findViewById<ViewPager2>(R.id.viewPager).visibility =
-                                            View.VISIBLE
-                                        eActivity.findViewById<TabLayout>(R.id.tabLayout).visibility =
-                                            View.VISIBLE
-                                        eActivity.findViewById<TextInputLayout>(R.id.searchView).visibility =
-                                            View.VISIBLE
-                                        eActivity.findViewById<FrameLayout>(R.id.fragmentExtensionsContainer).visibility =
-                                            View.GONE
-                                    }
-                                parentFragmentManager.beginTransaction()
-                                    .setCustomAnimations(R.anim.slide_up, R.anim.slide_down)
-                                    .replace(R.id.fragmentExtensionsContainer, fragment)
-                                    .addToBackStack(null)
-                                    .commit()
+                            val fragment =
+                                AnimeSourcePreferencesFragment().getInstance(selectedSetting.id) {
+                                    changeUIVisibility(true)
+                                }
+                            parentFragmentManager.beginTransaction()
+                                .setCustomAnimations(R.anim.slide_up, R.anim.slide_down)
+                                .replace(R.id.fragmentExtensionsContainer, fragment)
+                                .addToBackStack(null)
+                                .commit()
+                        }
+                        .setOnDismissListener {
+                            if (!itemSelected) {
+                                changeUIVisibility(true)
                             }
                         }
                         .show()
                     dialog.window?.setDimAmount(0.8f)
                 } else {
                     // If there's only one setting, proceed with the fragment transaction
-                    val eActivity = requireActivity() as ExtensionsActivity
-                    eActivity.runOnUiThread {
-                        val fragment =
-                            AnimeSourcePreferencesFragment().getInstance(selectedSetting.id) {
+                    val fragment =
+                        AnimeSourcePreferencesFragment().getInstance(selectedSetting.id) {
+                            changeUIVisibility(true)
+                        }
+                    parentFragmentManager.beginTransaction()
+                        .setCustomAnimations(R.anim.slide_up, R.anim.slide_down)
+                        .replace(R.id.fragmentExtensionsContainer, fragment)
+                        .addToBackStack(null)
+                        .commit()
 
-                                eActivity.findViewById<ViewPager2>(R.id.viewPager).visibility =
-                                    View.VISIBLE
-                                eActivity.findViewById<TabLayout>(R.id.tabLayout).visibility =
-                                    View.VISIBLE
-                                eActivity.findViewById<TextInputLayout>(R.id.searchView).visibility =
-                                    View.VISIBLE
-                                eActivity.findViewById<FrameLayout>(R.id.fragmentExtensionsContainer).visibility =
-                                    View.GONE
-                            }
-                        parentFragmentManager.beginTransaction()
-                            .setCustomAnimations(R.anim.slide_up, R.anim.slide_down)
-                            .replace(R.id.fragmentExtensionsContainer, fragment)
-                            .addToBackStack(null)
-                            .commit()
-                    }
                 }
 
                 // Hide ViewPager2 and TabLayout
-                val activity = requireActivity() as ExtensionsActivity
-                activity.findViewById<ViewPager2>(R.id.viewPager).visibility = View.GONE
-                activity.findViewById<TabLayout>(R.id.tabLayout).visibility = View.GONE
-                activity.findViewById<TextInputLayout>(R.id.searchView).visibility = View.GONE
-                activity.findViewById<FrameLayout>(R.id.fragmentExtensionsContainer).visibility =
-                    View.VISIBLE
+                changeUIVisibility(false)
             } else {
                 Toast.makeText(requireContext(), "Source is not configurable", Toast.LENGTH_SHORT)
                     .show()
@@ -225,6 +218,7 @@ class InstalledAnimeExtensionsFragment : Fragment(), SearchQueryHandler {
             return ViewHolder(view)
         }
 
+        @SuppressLint("SetTextI18n")
         override fun onBindViewHolder(holder: ViewHolder, position: Int) {
             val extension = getItem(position) // Use getItem() from ListAdapter
             val nsfw = if (extension.isNsfw) "(18+)" else ""
diff --git a/app/src/main/java/ani/dantotsu/settings/InstalledMangaExtensionsFragment.kt b/app/src/main/java/ani/dantotsu/settings/InstalledMangaExtensionsFragment.kt
index ecef2e58..f31319d9 100644
--- a/app/src/main/java/ani/dantotsu/settings/InstalledMangaExtensionsFragment.kt
+++ b/app/src/main/java/ani/dantotsu/settings/InstalledMangaExtensionsFragment.kt
@@ -47,15 +47,19 @@ class InstalledMangaExtensionsFragment : Fragment(), SearchQueryHandler {
     val skipIcons = loadData("skip_extension_icons") ?: false
     private val mangaExtensionManager: MangaExtensionManager = Injekt.get()
     private val extensionsAdapter = MangaExtensionsAdapter({ pkg ->
+        val name= pkg.name
         val changeUIVisibility: (Boolean) -> Unit = { show ->
             val activity = requireActivity() as ExtensionsActivity
             val visibility = if (show) View.VISIBLE else View.GONE
             activity.findViewById<ViewPager2>(R.id.viewPager).visibility = visibility
             activity.findViewById<TabLayout>(R.id.tabLayout).visibility = visibility
             activity.findViewById<TextInputLayout>(R.id.searchView).visibility = visibility
+            activity.findViewById<ImageView>(R.id.languageselect).visibility = visibility
+            activity.findViewById<TextView>(R.id.extensions).text = if (show) getString(R.string.extensions) else name
             activity.findViewById<FrameLayout>(R.id.fragmentExtensionsContainer).visibility =
                 if (show) View.GONE else View.VISIBLE
         }
+        var itemSelected = false
         val allSettings = pkg.sources.filterIsInstance<ConfigurableSource>()
         if (allSettings.isNotEmpty()) {
             var selectedSetting = allSettings[0]
@@ -65,6 +69,7 @@ class InstalledMangaExtensionsFragment : Fragment(), SearchQueryHandler {
                 val dialog = AlertDialog.Builder(requireContext(), R.style.MyPopup)
                     .setTitle("Select a Source")
                     .setSingleChoiceItems(names, selectedIndex) { dialog, which ->
+                        itemSelected = true
                         selectedIndex = which
                         selectedSetting = allSettings[selectedIndex]
                         dialog.dismiss()
@@ -80,6 +85,11 @@ class InstalledMangaExtensionsFragment : Fragment(), SearchQueryHandler {
                             .addToBackStack(null)
                             .commit()
                     }
+                    .setOnDismissListener {
+                        if (!itemSelected) {
+                            changeUIVisibility(true)
+                        }
+                    }
                     .show()
                 dialog.window?.setDimAmount(0.8f)
             } else {
diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt b/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt
index c037959a..d5255095 100644
--- a/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt
@@ -178,13 +178,18 @@ class SettingsActivity : AppCompatActivity(),  SimpleDialog.OnDialogResultListen
 
 
         binding.customTheme.setOnClickListener {
-            val originalColor = getSharedPreferences("Dantotsu", Context.MODE_PRIVATE).getInt(
+            val originalColor = getSharedPreferences("Dantotsu", MODE_PRIVATE).getInt(
                 "custom_theme_int",
                 Color.parseColor("#6200EE")
             )
+            class CustomColorDialog : SimpleColorDialog() { //idk where to put it
+                override fun onPositiveButtonClick() {
+                    restartApp()
+                    super.onPositiveButtonClick()
+                }
+            }
             val tag = "colorPicker"
-            SimpleColorDialog.build()
-                .title("Custom Theme")
+            CustomColorDialog().title("Custom Theme")
                 .colorPreset(originalColor)
                 .colors(this, SimpleColorDialog.BEIGE_COLOR_PALLET)
                 .allowCustom(true)
@@ -251,9 +256,9 @@ class SettingsActivity : AppCompatActivity(),  SimpleDialog.OnDialogResultListen
         binding.skipExtensionIcons.setOnCheckedChangeListener { _, isChecked ->
             saveData("skip_extension_icons", isChecked)
         }
-        binding.NSFWExtension.isChecked = loadData("NFSWExtension") ?: true
+        binding.NSFWExtension.isChecked = loadData("NSFWExtension") ?: true
         binding.NSFWExtension.setOnCheckedChangeListener { _, isChecked ->
-            saveData("NFSWExtension", isChecked)
+            saveData("NSFWExtension", isChecked)
 
         }
 
@@ -427,6 +432,7 @@ class SettingsActivity : AppCompatActivity(),  SimpleDialog.OnDialogResultListen
             initActivity(this)
         }
 
+
         binding.uiSettingsAnime.setOnClickListener {
             uiTheme(0, it)
         }
@@ -793,4 +799,4 @@ class SettingsActivity : AppCompatActivity(),  SimpleDialog.OnDialogResultListen
             show()
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/ani/dantotsu/settings/paging/AnimePagingSource.kt b/app/src/main/java/ani/dantotsu/settings/paging/AnimePagingSource.kt
index 045ca140..5ead2138 100644
--- a/app/src/main/java/ani/dantotsu/settings/paging/AnimePagingSource.kt
+++ b/app/src/main/java/ani/dantotsu/settings/paging/AnimePagingSource.kt
@@ -1,5 +1,6 @@
 package ani.dantotsu.settings.paging
 
+import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.view.animation.LinearInterpolator
@@ -91,18 +92,14 @@ class AnimeExtensionPagingSource(
         val availableExtensions =
             availableExtensionsFlow.filterNot { it.pkgName in installedExtensions }
         val query = searchQuery
-        val isNsfwEnabled: Boolean = loadData("NFSWExtension") ?: true
+        val isNsfwEnabled: Boolean = loadData("NSFWExtension") ?: true
 
         val filteredExtensions = if (query.isEmpty()) {
             availableExtensions
         } else {
             availableExtensions.filter { it.name.contains(query, ignoreCase = true) }
         }
-        val filternfsw = if (isNsfwEnabled) {
-            filteredExtensions
-        } else {
-            filteredExtensions.filterNot { it.isNsfw }
-        }
+        val filternfsw = if (isNsfwEnabled) filteredExtensions else filteredExtensions.filterNot { it.isNsfw }
         return try {
             val sublist = filternfsw.subList(
                 fromIndex = position,
@@ -198,6 +195,7 @@ class AnimeExtensionAdapter(private val clickListener: OnAnimeInstallClickListen
 
         val extensionIconImageView: ImageView = binding.extensionIconImageView
 
+        @SuppressLint("SetTextI18n")
         fun bind(extension: AnimeExtension.Available) {
             val nsfw = if (extension.isNsfw) "(18+)" else ""
             val lang = LanguageMapper.mapLanguageCodeToName(extension.lang)
diff --git a/app/src/main/java/ani/dantotsu/settings/paging/MangaPagingSource.kt b/app/src/main/java/ani/dantotsu/settings/paging/MangaPagingSource.kt
index 0ae7e01d..eed5bccc 100644
--- a/app/src/main/java/ani/dantotsu/settings/paging/MangaPagingSource.kt
+++ b/app/src/main/java/ani/dantotsu/settings/paging/MangaPagingSource.kt
@@ -1,5 +1,6 @@
 package ani.dantotsu.settings.paging
 
+import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.view.animation.LinearInterpolator
@@ -91,17 +92,13 @@ class MangaExtensionPagingSource(
         val availableExtensions =
             availableExtensionsFlow.filterNot { it.pkgName in installedExtensions }
         val query = searchQuery
-        val isNsfwEnabled: Boolean = loadData("NFSWExtension") ?: true
+        val isNsfwEnabled: Boolean = loadData("NSFWExtension") ?: true
         val filteredExtensions = if (query.isEmpty()) {
             availableExtensions
         } else {
             availableExtensions.filter { it.name.contains(query, ignoreCase = true) }
         }
-        val filternfsw = if (isNsfwEnabled) {
-            filteredExtensions
-        } else {
-            filteredExtensions.filterNot { it.isNsfw }
-        }
+        val filternfsw = if (isNsfwEnabled) filteredExtensions else filteredExtensions.filterNot { it.isNsfw }
         return try {
             val sublist = filternfsw.subList(
                 fromIndex = position,
@@ -194,6 +191,7 @@ class MangaExtensionAdapter(private val clickListener: OnMangaInstallClickListen
         }
 
         val extensionIconImageView: ImageView = binding.extensionIconImageView
+        @SuppressLint("SetTextI18n")
         fun bind(extension: MangaExtension.Available) {
             val nsfw = if (extension.isNsfw) "(18+)" else ""
             val lang = LanguageMapper.mapLanguageCodeToName(extension.lang)
diff --git a/app/src/main/java/ani/dantotsu/themes/ThemeManager.kt b/app/src/main/java/ani/dantotsu/themes/ThemeManager.kt
index 2029177b..8ee3f62d 100644
--- a/app/src/main/java/ani/dantotsu/themes/ThemeManager.kt
+++ b/app/src/main/java/ani/dantotsu/themes/ThemeManager.kt
@@ -42,14 +42,15 @@ class ThemeManager(private val context: Context) {
             .getString("theme", "PURPLE")!!
 
         val themeToApply = when (theme) {
-            "PURPLE" -> if (useOLED) R.style.Theme_Dantotsu_PurpleOLED else R.style.Theme_Dantotsu_Purple
             "BLUE" -> if (useOLED) R.style.Theme_Dantotsu_BlueOLED else R.style.Theme_Dantotsu_Blue
             "GREEN" -> if (useOLED) R.style.Theme_Dantotsu_GreenOLED else R.style.Theme_Dantotsu_Green
+            "PURPLE" -> if (useOLED) R.style.Theme_Dantotsu_PurpleOLED else R.style.Theme_Dantotsu_Purple
             "PINK" -> if (useOLED) R.style.Theme_Dantotsu_PinkOLED else R.style.Theme_Dantotsu_Pink
+            "SAIKOU" -> if (useOLED) R.style.Theme_Dantotsu_SaikouOLED else R.style.Theme_Dantotsu_Saikou
             "RED" -> if (useOLED) R.style.Theme_Dantotsu_RedOLED else R.style.Theme_Dantotsu_Red
             "LAVENDER" -> if (useOLED) R.style.Theme_Dantotsu_LavenderOLED else R.style.Theme_Dantotsu_Lavender
+            "EMERALD" -> if (useOLED) R.style.Theme_Dantotsu_EmeraldOLED else R.style.Theme_Dantotsu_Emerald
             "MONOCHROME (BETA)" -> if (useOLED) R.style.Theme_Dantotsu_MonochromeOLED else R.style.Theme_Dantotsu_Monochrome
-            "SAIKOU" -> if (useOLED) R.style.Theme_Dantotsu_SaikouOLED else R.style.Theme_Dantotsu_Saikou
             else -> if (useOLED) R.style.Theme_Dantotsu_PurpleOLED else R.style.Theme_Dantotsu_Purple
         }
 
@@ -109,14 +110,15 @@ class ThemeManager(private val context: Context) {
 
     companion object {
         enum class Theme(val theme: String) {
-            PURPLE("PURPLE"),
             BLUE("BLUE"),
             GREEN("GREEN"),
+            PURPLE("PURPLE"),
             PINK("PINK"),
+            SAIKOU("SAIKOU"),
             RED("RED"),
             LAVENDER("LAVENDER"),
-            MONOCHROME("MONOCHROME (BETA)"),
-            SAIKOU("SAIKOU");
+            EMERALD("EMERALD"),
+            MONOCHROME("MONOCHROME (BETA)");
 
             companion object {
                 fun fromString(value: String): Theme {
diff --git a/app/src/main/res/layout/fragment_manga_offline.xml b/app/src/main/res/layout/fragment_manga_offline.xml
index 995953ea..be95cc1a 100644
--- a/app/src/main/res/layout/fragment_manga_offline.xml
+++ b/app/src/main/res/layout/fragment_manga_offline.xml
@@ -80,7 +80,43 @@
                 </com.google.android.material.card.MaterialCardView>
 
             </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
 
+                <TextView
+                    android:id="@+id/sourceTitle"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:fontFamily="@font/poppins_bold"
+                    android:gravity="center"
+                    android:text="Downloaded Manga and Novels"
+                    android:textSize="14sp"
+                    tools:ignore="HardcodedText" />
+
+                <ImageView
+                    android:id="@+id/downloadedList"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:alpha="0.33"
+                    android:padding="8dp"
+                    app:srcCompat="@drawable/ic_round_view_list_24"
+                    app:tint="?attr/colorOnBackground"
+                    tools:ignore="ContentDescription,ImageContrastCheck" />
+
+                <ImageView
+                    android:id="@+id/downloadedGrid"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:alpha="0.33"
+                    android:padding="8dp"
+                    app:srcCompat="@drawable/ic_round_grid_view_24"
+                    app:tint="?attr/colorOnBackground"
+                    tools:ignore="ContentDescription,ImageContrastCheck" />
+
+            </LinearLayout>
             <!-- This TextView might overlap with GridView if GridView has items -->
             <TextView
                 android:id="@+id/noMangaOffline"
@@ -91,18 +127,35 @@
                 android:textColor="?attr/colorOnSurface"
                 android:textSize="18sp"
                 android:visibility="gone" />
-
+            <!-- for large view  -->
             <GridView
                 android:id="@+id/gridView"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1"
-                android:numColumns="auto_fit"
-                android:columnWidth="128dp"
-                android:verticalSpacing="10dp"
+                android:numColumns="1"
+                android:verticalSpacing="20dp"
                 android:horizontalSpacing="10dp"
-                android:padding="10dp"
-                android:gravity="center" />
+                android:paddingStart="25dp"
+                android:paddingEnd="25dp"
+                android:gravity="center"
+                android:scrollbars="none"
+                android:visibility="gone"/>
+            <!-- for compact view -->
+            <GridView
+                android:id="@+id/gridView1"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:columnWidth="138dp"
+                android:gravity="center"
+                android:horizontalSpacing="-30dp"
+                android:numColumns="auto_fit"
+                android:paddingStart="-10dp"
+                android:paddingEnd="-10dp"
+                android:scrollbars="none"
+                android:verticalSpacing="20dp"
+                android:visibility="gone"/>
         </LinearLayout>
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/item_media_large.xml b/app/src/main/res/layout/item_media_large.xml
index 83fcffa8..91aa35c7 100644
--- a/app/src/main/res/layout/item_media_large.xml
+++ b/app/src/main/res/layout/item_media_large.xml
@@ -150,7 +150,43 @@
                     android:text="@string/eps" />
 
             </LinearLayout>
+            <LinearLayout
+                android:id="@+id/itemCompactType"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:layout_marginBottom="4dp"
+                android:orientation="horizontal"
+                android:visibility="gone"
+                tools:ignore="UseCompoundDrawables">
 
+                <ImageView
+                    android:id="@+id/itemCompactTypeImage"
+                    android:layout_width="18dp"
+                    android:layout_height="18dp"
+                    android:alpha="0.58"
+                    app:srcCompat="@drawable/ic_round_import_contacts_24"
+                    tools:ignore="ContentDescription" />
+
+                <TextView
+                    android:id="@+id/itemCompactRelation"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:alpha="0.58"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:paddingStart="4dp"
+                    android:paddingEnd="4dp"
+                    android:singleLine="true"
+                    android:textAlignment="textEnd"
+                    android:textAllCaps="true"
+                    android:textSize="12sp"
+                    android:textStyle="italic"
+                    android:transitionName="mediaTitle"
+                    tools:ignore="TextContrastCheck"
+                    tools:text="Relation  " />
+
+            </LinearLayout>
         </LinearLayout>
 
     </LinearLayout>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 73a2114d..fbda0709 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -65,32 +65,32 @@
     </style>
 
     <style name="Theme.Dantotsu.Purple" parent="Theme.Base">
-        <item name="colorPrimary">@color/mdmd_theme_dark_3_primary</item>
-        <item name="colorOnPrimary">@color/mdmd_theme_dark_3_onPrimary</item>
-        <item name="colorPrimaryContainer">@color/mdmd_theme_dark_3_primaryContainer</item>
-        <item name="colorOnPrimaryContainer">@color/mdmd_theme_dark_3_onPrimaryContainer</item>
-        <item name="colorSecondary">@color/mdmd_theme_dark_3_secondary</item>
-        <item name="colorOnSecondary">@color/mdmd_theme_dark_3_onSecondary</item>
-        <item name="colorSecondaryContainer">@color/mdmd_theme_dark_3_secondaryContainer</item>
-        <item name="colorOnSecondaryContainer">@color/mdmd_theme_dark_3_onSecondaryContainer</item>
-        <item name="colorTertiary">@color/mdmd_theme_dark_3_tertiary</item>
-        <item name="colorOnTertiary">@color/mdmd_theme_dark_3_onTertiary</item>
-        <item name="colorTertiaryContainer">@color/mdmd_theme_dark_3_tertiaryContainer</item>
-        <item name="colorOnTertiaryContainer">@color/mdmd_theme_dark_3_onTertiaryContainer</item>
-        <item name="colorError">@color/mdmd_theme_dark_3_error</item>
-        <item name="colorErrorContainer">@color/mdmd_theme_dark_3_errorContainer</item>
-        <item name="colorOnError">@color/mdmd_theme_dark_3_onError</item>
-        <item name="colorOnErrorContainer">@color/mdmd_theme_dark_3_onErrorContainer</item>
-        <item name="android:colorBackground">@color/mdmd_theme_dark_3_background</item>
-        <item name="colorOnBackground">@color/mdmd_theme_dark_3_onBackground</item>
-        <item name="colorSurface">@color/mdmd_theme_dark_3_surface</item>
-        <item name="colorOnSurface">@color/mdmd_theme_dark_3_onSurface</item>
-        <item name="colorSurfaceVariant">@color/mdmd_theme_dark_3_surfaceVariant</item>
-        <item name="colorOnSurfaceVariant">@color/mdmd_theme_dark_3_onSurfaceVariant</item>
-        <item name="colorOutline">@color/mdmd_theme_dark_3_outline</item>
-        <item name="colorOnSurfaceInverse">@color/mdmd_theme_dark_3_inverseOnSurface</item>
-        <item name="colorSurfaceInverse">@color/mdmd_theme_dark_3_inverseSurface</item>
-        <item name="colorPrimaryInverse">@color/mdmd_theme_dark_3_inversePrimary</item>
+        <item name="colorPrimary">@color/md_theme_dark_3_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_dark_3_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_dark_3_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_dark_3_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/md_theme_dark_3_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_dark_3_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_dark_3_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_dark_3_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/md_theme_dark_3_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_dark_3_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_dark_3_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_dark_3_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_dark_3_error</item>
+        <item name="colorErrorContainer">@color/md_theme_dark_3_errorContainer</item>
+        <item name="colorOnError">@color/md_theme_dark_3_onError</item>
+        <item name="colorOnErrorContainer">@color/md_theme_dark_3_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_dark_3_background</item>
+        <item name="colorOnBackground">@color/md_theme_dark_3_onBackground</item>
+        <item name="colorSurface">@color/md_theme_dark_3_surface</item>
+        <item name="colorOnSurface">@color/md_theme_dark_3_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_dark_3_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_dark_3_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_dark_3_outline</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_dark_3_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/md_theme_dark_3_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_dark_3_inversePrimary</item>
     </style>
 
     <style name="Theme.Dantotsu.Pink" parent="Theme.Base">
@@ -122,6 +122,122 @@
         <item name="colorPrimaryInverse">@color/md_theme_dark_4_inversePrimary</item>
     </style>
 
+    <style name="Theme.Dantotsu.Saikou" parent="Theme.Base">
+        <item name="colorPrimary">@color/md_theme_dark_5_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_dark_5_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_dark_5_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_dark_5_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/md_theme_dark_5_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_dark_5_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_dark_5_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_dark_5_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/md_theme_dark_5_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_dark_5_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_dark_5_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_dark_5_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_dark_5_error</item>
+        <item name="colorErrorContainer">@color/md_theme_dark_5_errorContainer</item>
+        <item name="colorOnError">@color/md_theme_dark_5_onError</item>
+        <item name="colorOnErrorContainer">@color/md_theme_dark_5_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_dark_5_background</item>
+        <item name="colorOnBackground">@color/md_theme_dark_5_onBackground</item>
+        <item name="colorSurface">@color/md_theme_dark_5_surface</item>
+        <item name="colorOnSurface">@color/md_theme_dark_5_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_dark_5_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_dark_5_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_dark_5_outline</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_dark_5_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/md_theme_dark_5_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_dark_5_inversePrimary</item>
+    </style>
+
+    <style name="Theme.Dantotsu.Red" parent="Theme.Base">
+        <item name="colorPrimary">@color/md_theme_dark_6_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_dark_6_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_dark_6_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_dark_6_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/md_theme_dark_6_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_dark_6_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_dark_6_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_dark_6_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/md_theme_dark_6_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_dark_6_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_dark_6_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_dark_6_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_dark_6_error</item>
+        <item name="colorErrorContainer">@color/md_theme_dark_6_errorContainer</item>
+        <item name="colorOnError">@color/md_theme_dark_6_onError</item>
+        <item name="colorOnErrorContainer">@color/md_theme_dark_6_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_dark_6_background</item>
+        <item name="colorOnBackground">@color/md_theme_dark_6_onBackground</item>
+        <item name="colorSurface">@color/md_theme_dark_6_surface</item>
+        <item name="colorOnSurface">@color/md_theme_dark_6_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_dark_6_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_dark_6_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_dark_6_outline</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_dark_6_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/md_theme_dark_6_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_dark_6_inversePrimary</item>
+    </style>
+
+    <style name="Theme.Dantotsu.Lavender" parent="Theme.Base">
+        <item name="colorPrimary">@color/md_theme_dark_7_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_dark_7_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_dark_7_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_dark_7_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/md_theme_dark_7_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_dark_7_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_dark_7_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_dark_7_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/md_theme_dark_7_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_dark_7_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_dark_7_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_dark_7_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_dark_7_error</item>
+        <item name="colorErrorContainer">@color/md_theme_dark_7_errorContainer</item>
+        <item name="colorOnError">@color/md_theme_dark_7_onError</item>
+        <item name="colorOnErrorContainer">@color/md_theme_dark_7_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_dark_7_background</item>
+        <item name="colorOnBackground">@color/md_theme_dark_7_onBackground</item>
+        <item name="colorSurface">@color/md_theme_dark_7_surface</item>
+        <item name="colorOnSurface">@color/md_theme_dark_7_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_dark_7_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_dark_7_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_dark_7_outline</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_dark_7_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/md_theme_dark_7_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_dark_7_inversePrimary</item>
+    </style>
+
+    <style name="Theme.Dantotsu.Emerald" parent="Theme.Base">
+        <item name="colorPrimary">@color/md_theme_dark_8_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_dark_8_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_dark_8_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_dark_8_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/md_theme_dark_8_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_dark_8_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_dark_8_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_dark_8_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/md_theme_dark_8_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_dark_8_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_dark_8_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_dark_8_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_dark_8_error</item>
+        <item name="colorErrorContainer">@color/md_theme_dark_8_errorContainer</item>
+        <item name="colorOnError">@color/md_theme_dark_8_onError</item>
+        <item name="colorOnErrorContainer">@color/md_theme_dark_8_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_dark_8_background</item>
+        <item name="colorOnBackground">@color/md_theme_dark_8_onBackground</item>
+        <item name="colorSurface">@color/md_theme_dark_8_surface</item>
+        <item name="colorOnSurface">@color/md_theme_dark_8_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_dark_8_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_dark_8_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_dark_8_outline</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_dark_8_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/md_theme_dark_8_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_dark_8_inversePrimary</item>
+    </style>
+
     <style name="Theme.Dantotsu.Monochrome" parent="Theme.Base">
         <item name="colorPrimary">@color/bg_white</item>
         <item name="colorOnPrimary">@color/bg_black</item>
@@ -151,93 +267,6 @@
         <item name="colorPrimaryInverse">@color/bg_black</item>
     </style>
 
-    <style name="Theme.Dantotsu.Red" parent="Theme.Base">
-        <item name="colorPrimary">@color/md_0_theme_dark_primary</item>
-        <item name="colorOnPrimary">@color/md_0_theme_dark_onPrimary</item>
-        <item name="colorPrimaryContainer">@color/md_0_theme_dark_primaryContainer</item>
-        <item name="colorOnPrimaryContainer">@color/md_0_theme_dark_onPrimaryContainer</item>
-        <item name="colorSecondary">@color/md_0_theme_dark_secondary</item>
-        <item name="colorOnSecondary">@color/md_0_theme_dark_onSecondary</item>
-        <item name="colorSecondaryContainer">@color/md_0_theme_dark_secondaryContainer</item>
-        <item name="colorOnSecondaryContainer">@color/md_0_theme_dark_onSecondaryContainer</item>
-        <item name="colorTertiary">@color/md_0_theme_dark_tertiary</item>
-        <item name="colorOnTertiary">@color/md_0_theme_dark_onTertiary</item>
-        <item name="colorTertiaryContainer">@color/md_0_theme_dark_tertiaryContainer</item>
-        <item name="colorOnTertiaryContainer">@color/md_0_theme_dark_onTertiaryContainer</item>
-        <item name="colorError">@color/md_0_theme_dark_error</item>
-        <item name="colorErrorContainer">@color/md_0_theme_dark_errorContainer</item>
-        <item name="colorOnError">@color/md_0_theme_dark_onError</item>
-        <item name="colorOnErrorContainer">@color/md_0_theme_dark_onErrorContainer</item>
-        <item name="android:colorBackground">@color/md_0_theme_dark_background</item>
-        <item name="colorOnBackground">@color/md_0_theme_dark_onBackground</item>
-        <item name="colorSurface">@color/md_0_theme_dark_surface</item>
-        <item name="colorOnSurface">@color/md_0_theme_dark_onSurface</item>
-        <item name="colorSurfaceVariant">@color/md_0_theme_dark_surfaceVariant</item>
-        <item name="colorOnSurfaceVariant">@color/md_0_theme_dark_onSurfaceVariant</item>
-        <item name="colorOutline">@color/md_0_theme_dark_outline</item>
-        <item name="colorOnSurfaceInverse">@color/md_0_theme_dark_inverseOnSurface</item>
-        <item name="colorSurfaceInverse">@color/md_0_theme_dark_inverseSurface</item>
-        <item name="colorPrimaryInverse">@color/md_0_theme_dark_inversePrimary</item>
-    </style>
-
-    <style name="Theme.Dantotsu.Lavender" parent="Theme.Base">
-        <item name="colorPrimary">@color/md_1_theme_dark_primary</item>
-        <item name="colorOnPrimary">@color/md_1_theme_dark_onPrimary</item>
-        <item name="colorPrimaryContainer">@color/md_1_theme_dark_primaryContainer</item>
-        <item name="colorOnPrimaryContainer">@color/md_1_theme_dark_onPrimaryContainer</item>
-        <item name="colorSecondary">@color/md_1_theme_dark_secondary</item>
-        <item name="colorOnSecondary">@color/md_1_theme_dark_onSecondary</item>
-        <item name="colorSecondaryContainer">@color/md_1_theme_dark_secondaryContainer</item>
-        <item name="colorOnSecondaryContainer">@color/md_1_theme_dark_onSecondaryContainer</item>
-        <item name="colorTertiary">@color/md_1_theme_dark_tertiary</item>
-        <item name="colorOnTertiary">@color/md_1_theme_dark_onTertiary</item>
-        <item name="colorTertiaryContainer">@color/md_1_theme_dark_tertiaryContainer</item>
-        <item name="colorOnTertiaryContainer">@color/md_1_theme_dark_onTertiaryContainer</item>
-        <item name="colorError">@color/md_1_theme_dark_error</item>
-        <item name="colorErrorContainer">@color/md_1_theme_dark_errorContainer</item>
-        <item name="colorOnError">@color/md_1_theme_dark_onError</item>
-        <item name="colorOnErrorContainer">@color/md_1_theme_dark_onErrorContainer</item>
-        <item name="android:colorBackground">@color/md_1_theme_dark_background</item>
-        <item name="colorOnBackground">@color/md_1_theme_dark_onBackground</item>
-        <item name="colorSurface">@color/md_1_theme_dark_surface</item>
-        <item name="colorOnSurface">@color/md_1_theme_dark_onSurface</item>
-        <item name="colorSurfaceVariant">@color/md_1_theme_dark_surfaceVariant</item>
-        <item name="colorOnSurfaceVariant">@color/md_1_theme_dark_onSurfaceVariant</item>
-        <item name="colorOutline">@color/md_1_theme_dark_outline</item>
-        <item name="colorOnSurfaceInverse">@color/md_1_theme_dark_inverseOnSurface</item>
-        <item name="colorSurfaceInverse">@color/md_1_theme_dark_inverseSurface</item>
-        <item name="colorPrimaryInverse">@color/md_1_theme_dark_inversePrimary</item>
-    </style>
-
-    <style name="Theme.Dantotsu.Saikou" parent="Theme.Base">
-        <item name="colorPrimary">@color/md_theme_dark_5_primary</item>
-        <item name="colorOnPrimary">@color/md_theme_dark_5_onPrimary</item>
-        <item name="colorPrimaryContainer">@color/md_theme_dark_5_primaryContainer</item>
-        <item name="colorOnPrimaryContainer">@color/md_theme_dark_5_onPrimaryContainer</item>
-        <item name="colorSecondary">@color/md_theme_dark_5_secondary</item>
-        <item name="colorOnSecondary">@color/md_theme_dark_5_onSecondary</item>
-        <item name="colorSecondaryContainer">@color/md_theme_dark_5_secondaryContainer</item>
-        <item name="colorOnSecondaryContainer">@color/md_theme_dark_5_onSecondaryContainer</item>
-        <item name="colorTertiary">@color/md_theme_dark_5_tertiary</item>
-        <item name="colorOnTertiary">@color/md_theme_dark_5_onTertiary</item>
-        <item name="colorTertiaryContainer">@color/md_theme_dark_5_tertiaryContainer</item>
-        <item name="colorOnTertiaryContainer">@color/md_theme_dark_5_onTertiaryContainer</item>
-        <item name="colorError">@color/md_theme_dark_5_error</item>
-        <item name="colorErrorContainer">@color/md_theme_dark_5_errorContainer</item>
-        <item name="colorOnError">@color/md_theme_dark_5_onError</item>
-        <item name="colorOnErrorContainer">@color/md_theme_dark_5_onErrorContainer</item>
-        <item name="android:colorBackground">@color/md_1_theme_dark_background</item>
-        <item name="colorOnBackground">@color/md_theme_dark_5_onBackground</item>
-        <item name="colorSurface">@color/md_theme_dark_5_surface</item>
-        <item name="colorOnSurface">@color/md_theme_dark_5_onSurface</item>
-        <item name="colorSurfaceVariant">@color/md_theme_dark_5_surfaceVariant</item>
-        <item name="colorOnSurfaceVariant">@color/md_theme_dark_5_onSurfaceVariant</item>
-        <item name="colorOutline">@color/md_theme_dark_5_outline</item>
-        <item name="colorOnSurfaceInverse">@color/md_theme_dark_5_inverseOnSurface</item>
-        <item name="colorSurfaceInverse">@color/md_theme_dark_5_inverseSurface</item>
-        <item name="colorPrimaryInverse">@color/md_theme_dark_5_inversePrimary</item>
-    </style>
-
     <style name="Theme.Dantotsu.BlueOLED" parent="Theme.Dantotsu.Blue">
         <item name="android:colorBackground">@color/darkest_Black</item>
         <item name="colorSurface">@color/darkest_Black</item>
@@ -277,5 +306,9 @@
         <item name="android:colorBackground">@color/darkest_Black</item>
         <item name="colorSurface">@color/darkest_Black</item>
     </style>
+    <style name="Theme.Dantotsu.EmeraldOLED" parent="Theme.Dantotsu.Emerald">
+        <item name="android:colorBackground">@color/darkest_Black</item>
+        <item name="colorSurface">@color/darkest_Black</item>
+    </style>
 
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 34281556..06f9958b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -24,6 +24,14 @@
     <color name="yt_red">#CD201F</color>
     <color name="chip">#a3a2a2</color>
     <color name="grey_nav">#E8EDEDED</color>
+    <color name="CustomColor1">#93DB00</color>
+    <color name="CustomColor2">#68AF86</color>
+    <color name="CustomColor3">#0096AE</color>
+    <color name="CustomColor4">#000000</color>
+    <color name="light_blue_50">#FFE1F5FE</color>
+    <color name="light_blue_200">#FF81D4FA</color>
+    <color name="light_blue_600">#FF039BE5</color>
+    <color name="light_blue_900">#FF01579B</color>
 
     <!-- theme 1 -->
     <color name="seed_1">#00658e</color>
@@ -88,6 +96,7 @@
     <color name="md_theme_dark_1_outlineVariant">#41484D</color>
     <color name="md_theme_dark_1_scrim">#000000</color>
 
+    <!-- theme 2 -->
     <color name="seed_2">#426916</color>
     <color name="md_theme_light_2_primary">#426916</color>
     <color name="md_theme_light_2_onPrimary">#FFFFFF</color>
@@ -150,6 +159,7 @@
     <color name="md_theme_dark_2_outlineVariant">#44483D</color>
     <color name="md_theme_dark_2_scrim">#000000</color>
 
+    <!-- theme 3 -->
     <color name="seed_3">#7c4997</color>
     <color name="md_theme_light_3_primary">#7C4997</color>
     <color name="md_theme_light_3_onPrimary">#FFFFFF</color>
@@ -181,37 +191,38 @@
     <color name="md_theme_light_3_surfaceTint">#7C4997</color>
     <color name="md_theme_light_3_outlineVariant">#CEC3CE</color>
     <color name="md_theme_light_3_scrim">#000000</color>
-    <color name="mdmd_theme_dark_3_primary">#E7B3FF</color>
-    <color name="mdmd_theme_dark_3_onPrimary">#4A1765</color>
-    <color name="mdmd_theme_dark_3_primaryContainer">#62307D</color>
-    <color name="mdmd_theme_dark_3_onPrimaryContainer">#F6D9FF</color>
-    <color name="mdmd_theme_dark_3_secondary">#D3C0D8</color>
-    <color name="mdmd_theme_dark_3_onSecondary">#382C3E</color>
-    <color name="mdmd_theme_dark_3_secondaryContainer">#504255</color>
-    <color name="mdmd_theme_dark_3_onSecondaryContainer">#F0DCF4</color>
-    <color name="mdmd_theme_dark_3_tertiary">#F5B7B7</color>
-    <color name="mdmd_theme_dark_3_onTertiary">#4C2526</color>
-    <color name="mdmd_theme_dark_3_tertiaryContainer">#663B3B</color>
-    <color name="mdmd_theme_dark_3_onTertiaryContainer">#FFDAD9</color>
-    <color name="mdmd_theme_dark_3_error">#FFB4AB</color>
-    <color name="mdmd_theme_dark_3_errorContainer">#93000A</color>
-    <color name="mdmd_theme_dark_3_onError">#690005</color>
-    <color name="mdmd_theme_dark_3_onErrorContainer">#FFDAD6</color>
-    <color name="mdmd_theme_dark_3_background">#1D1B1E</color>
-    <color name="mdmd_theme_dark_3_onBackground">#E8E0E5</color>
-    <color name="mdmd_theme_dark_3_surface">#1D1B1E</color>
-    <color name="mdmd_theme_dark_3_onSurface">#E8E0E5</color>
-    <color name="mdmd_theme_dark_3_surfaceVariant">#4B444D</color>
-    <color name="mdmd_theme_dark_3_onSurfaceVariant">#CEC3CE</color>
-    <color name="mdmd_theme_dark_3_outline">#978E98</color>
-    <color name="mdmd_theme_dark_3_inverseOnSurface">#1D1B1E</color>
-    <color name="mdmd_theme_dark_3_inverseSurface">#E8E0E5</color>
-    <color name="mdmd_theme_dark_3_inversePrimary">#7C4997</color>
-    <color name="mdmd_theme_dark_3_shadow">#000000</color>
-    <color name="mdmd_theme_dark_3_surfaceTint">#E7B3FF</color>
-    <color name="mdmd_theme_dark_3_outlineVariant">#4B444D</color>
-    <color name="mdmd_theme_dark_3_scrim">#000000</color>
+    <color name="md_theme_dark_3_primary">#E7B3FF</color>
+    <color name="md_theme_dark_3_onPrimary">#4A1765</color>
+    <color name="md_theme_dark_3_primaryContainer">#62307D</color>
+    <color name="md_theme_dark_3_onPrimaryContainer">#F6D9FF</color>
+    <color name="md_theme_dark_3_secondary">#D3C0D8</color>
+    <color name="md_theme_dark_3_onSecondary">#382C3E</color>
+    <color name="md_theme_dark_3_secondaryContainer">#504255</color>
+    <color name="md_theme_dark_3_onSecondaryContainer">#F0DCF4</color>
+    <color name="md_theme_dark_3_tertiary">#F5B7B7</color>
+    <color name="md_theme_dark_3_onTertiary">#4C2526</color>
+    <color name="md_theme_dark_3_tertiaryContainer">#663B3B</color>
+    <color name="md_theme_dark_3_onTertiaryContainer">#FFDAD9</color>
+    <color name="md_theme_dark_3_error">#FFB4AB</color>
+    <color name="md_theme_dark_3_errorContainer">#93000A</color>
+    <color name="md_theme_dark_3_onError">#690005</color>
+    <color name="md_theme_dark_3_onErrorContainer">#FFDAD6</color>
+    <color name="md_theme_dark_3_background">#1D1B1E</color>
+    <color name="md_theme_dark_3_onBackground">#E8E0E5</color>
+    <color name="md_theme_dark_3_surface">#1D1B1E</color>
+    <color name="md_theme_dark_3_onSurface">#E8E0E5</color>
+    <color name="md_theme_dark_3_surfaceVariant">#4B444D</color>
+    <color name="md_theme_dark_3_onSurfaceVariant">#CEC3CE</color>
+    <color name="md_theme_dark_3_outline">#978E98</color>
+    <color name="md_theme_dark_3_inverseOnSurface">#1D1B1E</color>
+    <color name="md_theme_dark_3_inverseSurface">#E8E0E5</color>
+    <color name="md_theme_dark_3_inversePrimary">#7C4997</color>
+    <color name="md_theme_dark_3_shadow">#000000</color>
+    <color name="md_theme_dark_3_surfaceTint">#E7B3FF</color>
+    <color name="md_theme_dark_3_outlineVariant">#4B444D</color>
+    <color name="md_theme_dark_3_scrim">#000000</color>
 
+    <!-- theme 4 -->
     <color name="seed_4">#e800ac</color>
     <color name="md_theme_light_4_primary">#B30084</color>
     <color name="md_theme_light_4_onPrimary">#FFFFFF</color>
@@ -274,7 +285,8 @@
     <color name="md_theme_dark_4_outlineVariant">#504349</color>
     <color name="md_theme_dark_4_scrim">#000000</color>
 
-    <color name="seed_7">#FF007F
+    <!-- theme 5 -->
+    <color name="seed_5">#FF007F
     </color>                                <!-- if there are any issues with Saikou theme message @Wai What to get it fixed, unallocated colors are also set to "#00FF00" as they are not yet being used-->
     <color name="md_theme_light_5_primary">#FF007F</color>
     <color name="md_theme_light_5_onPrimary">#EEEEEE
@@ -330,7 +342,7 @@
     <color name="md_theme_dark_5_errorContainer">#00FF00</color>
     <color name="md_theme_dark_5_onError">#00FF00</color>
     <color name="md_theme_dark_5_onErrorContainer">#00FF00</color>
-    <color name="md_theme_dark_5_background">#1C1B20</color>
+    <color name="md_theme_dark_5_background">#1C1B1E</color>
     <color name="md_theme_dark_5_onBackground">#EEEEEE</color>
     <color name="md_theme_dark_5_surface">#1C1B20</color>
     <color name="md_theme_dark_5_onSurface">#EEEEEE</color>
@@ -345,135 +357,195 @@
     <color name="md_theme_dark_5_outlineVariant">#00FF00</color>
     <color name="md_theme_dark_5_scrim">#00FF00</color>
 
-    <color name="seed_5">#c9000b</color>
-    <color name="md_0_theme_light_primary">#C0000A</color>
-    <color name="md_0_theme_light_onPrimary">#FFFFFF</color>
-    <color name="md_0_theme_light_primaryContainer">#FFDAD5</color>
-    <color name="md_0_theme_light_onPrimaryContainer">#410001</color>
-    <color name="md_0_theme_light_secondary">#775652</color>
-    <color name="md_0_theme_light_onSecondary">#FFFFFF</color>
-    <color name="md_0_theme_light_secondaryContainer">#FFDAD5</color>
-    <color name="md_0_theme_light_onSecondaryContainer">#2C1512</color>
-    <color name="md_0_theme_light_tertiary">#705C2E</color>
-    <color name="md_0_theme_light_onTertiary">#FFFFFF</color>
-    <color name="md_0_theme_light_tertiaryContainer">#FCDFA6</color>
-    <color name="md_0_theme_light_onTertiaryContainer">#261A00</color>
-    <color name="md_0_theme_light_error">#BA1A1A</color>
-    <color name="md_0_theme_light_errorContainer">#FFDAD6</color>
-    <color name="md_0_theme_light_onError">#FFFFFF</color>
-    <color name="md_0_theme_light_onErrorContainer">#410002</color>
-    <color name="md_0_theme_light_background">#FFFBFF</color>
-    <color name="md_0_theme_light_onBackground">#201A19</color>
-    <color name="md_0_theme_light_surface">#FFFBFF</color>
-    <color name="md_0_theme_light_onSurface">#201A19</color>
-    <color name="md_0_theme_light_surfaceVariant">#F5DDDA</color>
-    <color name="md_0_theme_light_onSurfaceVariant">#534341</color>
-    <color name="md_0_theme_light_outline">#857370</color>
-    <color name="md_0_theme_light_inverseOnSurface">#FBEEEC</color>
-    <color name="md_0_theme_light_inverseSurface">#362F2E</color>
-    <color name="md_0_theme_light_inversePrimary">#FFB4AA</color>
-    <color name="md_0_theme_light_shadow">#000000</color>
-    <color name="md_0_theme_light_surfaceTint">#C0000A</color>
-    <color name="md_0_theme_light_outlineVariant">#D8C2BE</color>
-    <color name="md_0_theme_light_scrim">#000000</color>
-    <color name="md_0_theme_dark_primary">#FFB4AA</color>
-    <color name="md_0_theme_dark_onPrimary">#690003</color>
-    <color name="md_0_theme_dark_primaryContainer">#930005</color>
-    <color name="md_0_theme_dark_onPrimaryContainer">#FFDAD5</color>
-    <color name="md_0_theme_dark_secondary">#E7BDB7</color>
-    <color name="md_0_theme_dark_onSecondary">#442926</color>
-    <color name="md_0_theme_dark_secondaryContainer">#5D3F3B</color>
-    <color name="md_0_theme_dark_onSecondaryContainer">#FFDAD5</color>
-    <color name="md_0_theme_dark_tertiary">#DFC38C</color>
-    <color name="md_0_theme_dark_onTertiary">#3E2E04</color>
-    <color name="md_0_theme_dark_tertiaryContainer">#574419</color>
-    <color name="md_0_theme_dark_onTertiaryContainer">#FCDFA6</color>
-    <color name="md_0_theme_dark_error">#FFB4AB</color>
-    <color name="md_0_theme_dark_errorContainer">#93000A</color>
-    <color name="md_0_theme_dark_onError">#690005</color>
-    <color name="md_0_theme_dark_onErrorContainer">#FFDAD6</color>
-    <color name="md_0_theme_dark_background">#201A19</color>
-    <color name="md_0_theme_dark_onBackground">#EDE0DE</color>
-    <color name="md_0_theme_dark_surface">#201A19</color>
-    <color name="md_0_theme_dark_onSurface">#EDE0DE</color>
-    <color name="md_0_theme_dark_surfaceVariant">#534341</color>
-    <color name="md_0_theme_dark_onSurfaceVariant">#D8C2BE</color>
-    <color name="md_0_theme_dark_outline">#A08C89</color>
-    <color name="md_0_theme_dark_inverseOnSurface">#201A19</color>
-    <color name="md_0_theme_dark_inverseSurface">#EDE0DE</color>
-    <color name="md_0_theme_dark_inversePrimary">#C0000A</color>
-    <color name="md_0_theme_dark_shadow">#000000</color>
-    <color name="md_0_theme_dark_surfaceTint">#FFB4AA</color>
-    <color name="md_0_theme_dark_outlineVariant">#534341</color>
-    <color name="md_0_theme_dark_scrim">#000000</color>
+    <!-- theme 6 -->
+    <color name="seed_6">#c9000b</color>
+    <color name="md_theme_light_6_primary">#C0000A</color>
+    <color name="md_theme_light_6_onPrimary">#FFFFFF</color>
+    <color name="md_theme_light_6_primaryContainer">#FFDAD5</color>
+    <color name="md_theme_light_6_onPrimaryContainer">#410001</color>
+    <color name="md_theme_light_6_secondary">#775652</color>
+    <color name="md_theme_light_6_onSecondary">#FFFFFF</color>
+    <color name="md_theme_light_6_secondaryContainer">#FFDAD5</color>
+    <color name="md_theme_light_6_onSecondaryContainer">#2C1512</color>
+    <color name="md_theme_light_6_tertiary">#705C2E</color>
+    <color name="md_theme_light_6_onTertiary">#FFFFFF</color>
+    <color name="md_theme_light_6_tertiaryContainer">#FCDFA6</color>
+    <color name="md_theme_light_6_onTertiaryContainer">#261A00</color>
+    <color name="md_theme_light_6_error">#BA1A1A</color>
+    <color name="md_theme_light_6_errorContainer">#FFDAD6</color>
+    <color name="md_theme_light_6_onError">#FFFFFF</color>
+    <color name="md_theme_light_6_onErrorContainer">#410002</color>
+    <color name="md_theme_light_6_background">#FFFBFF</color>
+    <color name="md_theme_light_6_onBackground">#201A19</color>
+    <color name="md_theme_light_6_surface">#FFFBFF</color>
+    <color name="md_theme_light_6_onSurface">#201A19</color>
+    <color name="md_theme_light_6_surfaceVariant">#F5DDDA</color>
+    <color name="md_theme_light_6_onSurfaceVariant">#534341</color>
+    <color name="md_theme_light_6_outline">#857370</color>
+    <color name="md_theme_light_6_inverseOnSurface">#FBEEEC</color>
+    <color name="md_theme_light_6_inverseSurface">#362F2E</color>
+    <color name="md_theme_light_6_inversePrimary">#FFB4AA</color>
+    <color name="md_theme_light_6_shadow">#000000</color>
+    <color name="md_theme_light_6_surfaceTint">#C0000A</color>
+    <color name="md_theme_light_6_outlineVariant">#D8C2BE</color>
+    <color name="md_theme_light_6_scrim">#000000</color>
+    <color name="md_theme_dark_6_primary">#FFB4AA</color>
+    <color name="md_theme_dark_6_onPrimary">#690003</color>
+    <color name="md_theme_dark_6_primaryContainer">#930005</color>
+    <color name="md_theme_dark_6_onPrimaryContainer">#FFDAD5</color>
+    <color name="md_theme_dark_6_secondary">#E7BDB7</color>
+    <color name="md_theme_dark_6_onSecondary">#442926</color>
+    <color name="md_theme_dark_6_secondaryContainer">#5D3F3B</color>
+    <color name="md_theme_dark_6_onSecondaryContainer">#FFDAD5</color>
+    <color name="md_theme_dark_6_tertiary">#DFC38C</color>
+    <color name="md_theme_dark_6_onTertiary">#3E2E04</color>
+    <color name="md_theme_dark_6_tertiaryContainer">#574419</color>
+    <color name="md_theme_dark_6_onTertiaryContainer">#FCDFA6</color>
+    <color name="md_theme_dark_6_error">#FFB4AB</color>
+    <color name="md_theme_dark_6_errorContainer">#93000A</color>
+    <color name="md_theme_dark_6_onError">#690005</color>
+    <color name="md_theme_dark_6_onErrorContainer">#FFDAD6</color>
+    <color name="md_theme_dark_6_background">#201A19</color>
+    <color name="md_theme_dark_6_onBackground">#EDE0DE</color>
+    <color name="md_theme_dark_6_surface">#201A19</color>
+    <color name="md_theme_dark_6_onSurface">#EDE0DE</color>
+    <color name="md_theme_dark_6_surfaceVariant">#534341</color>
+    <color name="md_theme_dark_6_onSurfaceVariant">#D8C2BE</color>
+    <color name="md_theme_dark_6_outline">#A08C89</color>
+    <color name="md_theme_dark_6_inverseOnSurface">#201A19</color>
+    <color name="md_theme_dark_6_inverseSurface">#EDE0DE</color>
+    <color name="md_theme_dark_6_inversePrimary">#C0000A</color>
+    <color name="md_theme_dark_6_shadow">#000000</color>
+    <color name="md_theme_dark_6_surfaceTint">#FFB4AA</color>
+    <color name="md_theme_dark_6_outlineVariant">#534341</color>
+    <color name="md_theme_dark_6_scrim">#000000</color>
+
+    <!-- theme 7 -->
+    <color name="seed_7">#6750A4</color>
+    <color name="md_theme_light_7_primary">#6750A4</color>
+    <color name="md_theme_light_7_onPrimary">#FFFFFF</color>
+    <color name="md_theme_light_7_primaryContainer">#E9DDFF</color>
+    <color name="md_theme_light_7_onPrimaryContainer">#22005D</color>
+    <color name="md_theme_light_7_secondary">#625B71</color>
+    <color name="md_theme_light_7_onSecondary">#FFFFFF</color>
+    <color name="md_theme_light_7_secondaryContainer">#E8DEF8</color>
+    <color name="md_theme_light_7_onSecondaryContainer">#1E192B</color>
+    <color name="md_theme_light_7_tertiary">#7E5260</color>
+    <color name="md_theme_light_7_onTertiary">#FFFFFF</color>
+    <color name="md_theme_light_7_tertiaryContainer">#FFD9E3</color>
+    <color name="md_theme_light_7_onTertiaryContainer">#31101D</color>
+    <color name="md_theme_light_7_error">#BA1A1A</color>
+    <color name="md_theme_light_7_errorContainer">#FFDAD6</color>
+    <color name="md_theme_light_7_onError">#FFFFFF</color>
+    <color name="md_theme_light_7_onErrorContainer">#410002</color>
+    <color name="md_theme_light_7_background">#FFFBFF</color>
+    <color name="md_theme_light_7_onBackground">#1C1B1E</color>
+    <color name="md_theme_light_7_surface">#FFFBFF</color>
+    <color name="md_theme_light_7_onSurface">#1C1B1E</color>
+    <color name="md_theme_light_7_surfaceVariant">#E7E0EB</color>
+    <color name="md_theme_light_7_onSurfaceVariant">#49454E</color>
+    <color name="md_theme_light_7_outline">#7A757F</color>
+    <color name="md_theme_light_7_inverseOnSurface">#F4EFF4</color>
+    <color name="md_theme_light_7_inverseSurface">#313033</color>
+    <color name="md_theme_light_7_inversePrimary">#CFBCFF</color>
+    <color name="md_theme_light_7_shadow">#000000</color>
+    <color name="md_theme_light_7_surfaceTint">#6750A4</color>
+    <color name="md_theme_light_7_outlineVariant">#CAC4CF</color>
+    <color name="md_theme_light_7_scrim">#000000</color>
+    <color name="md_theme_dark_7_primary">#CFBCFF</color>
+    <color name="md_theme_dark_7_onPrimary">#381E72</color>
+    <color name="md_theme_dark_7_primaryContainer">#4F378A</color>
+    <color name="md_theme_dark_7_onPrimaryContainer">#E9DDFF</color>
+    <color name="md_theme_dark_7_secondary">#CBC2DB</color>
+    <color name="md_theme_dark_7_onSecondary">#332D41</color>
+    <color name="md_theme_dark_7_secondaryContainer">#4A4458</color>
+    <color name="md_theme_dark_7_onSecondaryContainer">#E8DEF8</color>
+    <color name="md_theme_dark_7_tertiary">#EFB8C8</color>
+    <color name="md_theme_dark_7_onTertiary">#4A2532</color>
+    <color name="md_theme_dark_7_tertiaryContainer">#633B48</color>
+    <color name="md_theme_dark_7_onTertiaryContainer">#FFD9E3</color>
+    <color name="md_theme_dark_7_error">#FFB4AB</color>
+    <color name="md_theme_dark_7_errorContainer">#93000A</color>
+    <color name="md_theme_dark_7_onError">#690005</color>
+    <color name="md_theme_dark_7_onErrorContainer">#FFDAD6</color>
+    <color name="md_theme_dark_7_background">#1C1B1E</color>
+    <color name="md_theme_dark_7_onBackground">#E6E1E6</color>
+    <color name="md_theme_dark_7_surface">#1C1B1E</color>
+    <color name="md_theme_dark_7_onSurface">#E6E1E6</color>
+    <color name="md_theme_dark_7_surfaceVariant">#49454E</color>
+    <color name="md_theme_dark_7_onSurfaceVariant">#CAC4CF</color>
+    <color name="md_theme_dark_7_outline">#948F99</color>
+    <color name="md_theme_dark_7_inverseOnSurface">#1C1B1E</color>
+    <color name="md_theme_dark_7_inverseSurface">#E6E1E6</color>
+    <color name="md_theme_dark_7_inversePrimary">#6750A4</color>
+    <color name="md_theme_dark_7_shadow">#000000</color>
+    <color name="md_theme_dark_7_surfaceTint">#CFBCFF</color>
+    <color name="md_theme_dark_7_outlineVariant">#49454E</color>
+    <color name="md_theme_dark_7_scrim">#000000</color>
+
+    <!-- theme 8 -->
+    <color name="seed_8">#14AEA7</color>
+    <color name="md_theme_light_8_primary">#006A65</color>
+    <color name="md_theme_light_8_onPrimary">#FFFFFF</color>
+    <color name="md_theme_light_8_primaryContainer">#70F7EF</color>
+    <color name="md_theme_light_8_onPrimaryContainer">#00201E</color>
+    <color name="md_theme_light_8_secondary">#4A6361</color>
+    <color name="md_theme_light_8_onSecondary">#FFFFFF</color>
+    <color name="md_theme_light_8_secondaryContainer">#CCE8E5</color>
+    <color name="md_theme_light_8_onSecondaryContainer">#051F1E</color>
+    <color name="md_theme_light_8_tertiary">#48607B</color>
+    <color name="md_theme_light_8_onTertiary">#FFFFFF</color>
+    <color name="md_theme_light_8_tertiaryContainer">#D0E4FF</color>
+    <color name="md_theme_light_8_onTertiaryContainer">#001D34</color>
+    <color name="md_theme_light_8_error">#BA1A1A</color>
+    <color name="md_theme_light_8_errorContainer">#FFDAD6</color>
+    <color name="md_theme_light_8_onError">#FFFFFF</color>
+    <color name="md_theme_light_8_onErrorContainer">#410002</color>
+    <color name="md_theme_light_8_background">#FAFDFB</color>
+    <color name="md_theme_light_8_onBackground">#191C1C</color>
+    <color name="md_theme_light_8_surface">#FAFDFB</color>
+    <color name="md_theme_light_8_onSurface">#191C1C</color>
+    <color name="md_theme_light_8_surfaceVariant">#DAE5E3</color>
+    <color name="md_theme_light_8_onSurfaceVariant">#3F4948</color>
+    <color name="md_theme_light_8_outline">#6F7978</color>
+    <color name="md_theme_light_8_inverseOnSurface">#EFF1F0</color>
+    <color name="md_theme_light_8_inverseSurface">#2D3131</color>
+    <color name="md_theme_light_8_inversePrimary">#4FDAD2</color>
+    <color name="md_theme_light_8_shadow">#000000</color>
+    <color name="md_theme_light_8_surfaceTint">#006A65</color>
+    <color name="md_theme_light_8_outlineVariant">#BEC9C7</color>
+    <color name="md_theme_light_8_scrim">#000000</color>
+    <color name="md_theme_dark_8_primary">#4FDAD2</color>
+    <color name="md_theme_dark_8_onPrimary">#003734</color>
+    <color name="md_theme_dark_8_primaryContainer">#00504C</color>
+    <color name="md_theme_dark_8_onPrimaryContainer">#70F7EF</color>
+    <color name="md_theme_dark_8_secondary">#B0CCC9</color>
+    <color name="md_theme_dark_8_onSecondary">#1B3533</color>
+    <color name="md_theme_dark_8_secondaryContainer">#324B49</color>
+    <color name="md_theme_dark_8_onSecondaryContainer">#CCE8E5</color>
+    <color name="md_theme_dark_8_tertiary">#B0C9E7</color>
+    <color name="md_theme_dark_8_onTertiary">#19324A</color>
+    <color name="md_theme_dark_8_tertiaryContainer">#314962</color>
+    <color name="md_theme_dark_8_onTertiaryContainer">#D0E4FF</color>
+    <color name="md_theme_dark_8_error">#FFB4AB</color>
+    <color name="md_theme_dark_8_errorContainer">#93000A</color>
+    <color name="md_theme_dark_8_onError">#690005</color>
+    <color name="md_theme_dark_8_onErrorContainer">#FFDAD6</color>
+    <color name="md_theme_dark_8_background">#191C1C</color>
+    <color name="md_theme_dark_8_onBackground">#E0E3E2</color>
+    <color name="md_theme_dark_8_surface">#191C1C</color>
+    <color name="md_theme_dark_8_onSurface">#E0E3E2</color>
+    <color name="md_theme_dark_8_surfaceVariant">#3F4948</color>
+    <color name="md_theme_dark_8_onSurfaceVariant">#BEC9C7</color>
+    <color name="md_theme_dark_8_outline">#889391</color>
+    <color name="md_theme_dark_8_inverseOnSurface">#191C1C</color>
+    <color name="md_theme_dark_8_inverseSurface">#E0E3E2</color>
+    <color name="md_theme_dark_8_inversePrimary">#006A65</color>
+    <color name="md_theme_dark_8_shadow">#000000</color>
+    <color name="md_theme_dark_8_surfaceTint">#4FDAD2</color>
+    <color name="md_theme_dark_8_outlineVariant">#3F4948</color>
+    <color name="md_theme_dark_8_scrim">#000000</color>
+
+
 
-    <color name="seed_6">#6750A4</color>
-    <color name="md_1_theme_light_primary">#6750A4</color>
-    <color name="md_1_theme_light_onPrimary">#FFFFFF</color>
-    <color name="md_1_theme_light_primaryContainer">#E9DDFF</color>
-    <color name="md_1_theme_light_onPrimaryContainer">#22005D</color>
-    <color name="md_1_theme_light_secondary">#625B71</color>
-    <color name="md_1_theme_light_onSecondary">#FFFFFF</color>
-    <color name="md_1_theme_light_secondaryContainer">#E8DEF8</color>
-    <color name="md_1_theme_light_onSecondaryContainer">#1E192B</color>
-    <color name="md_1_theme_light_tertiary">#7E5260</color>
-    <color name="md_1_theme_light_onTertiary">#FFFFFF</color>
-    <color name="md_1_theme_light_tertiaryContainer">#FFD9E3</color>
-    <color name="md_1_theme_light_onTertiaryContainer">#31101D</color>
-    <color name="md_1_theme_light_error">#BA1A1A</color>
-    <color name="md_1_theme_light_errorContainer">#FFDAD6</color>
-    <color name="md_1_theme_light_onError">#FFFFFF</color>
-    <color name="md_1_theme_light_onErrorContainer">#410002</color>
-    <color name="md_1_theme_light_background">#FFFBFF</color>
-    <color name="md_1_theme_light_onBackground">#1C1B1E</color>
-    <color name="md_1_theme_light_surface">#FFFBFF</color>
-    <color name="md_1_theme_light_onSurface">#1C1B1E</color>
-    <color name="md_1_theme_light_surfaceVariant">#E7E0EB</color>
-    <color name="md_1_theme_light_onSurfaceVariant">#49454E</color>
-    <color name="md_1_theme_light_outline">#7A757F</color>
-    <color name="md_1_theme_light_inverseOnSurface">#F4EFF4</color>
-    <color name="md_1_theme_light_inverseSurface">#313033</color>
-    <color name="md_1_theme_light_inversePrimary">#CFBCFF</color>
-    <color name="md_1_theme_light_shadow">#000000</color>
-    <color name="md_1_theme_light_surfaceTint">#6750A4</color>
-    <color name="md_1_theme_light_outlineVariant">#CAC4CF</color>
-    <color name="md_1_theme_light_scrim">#000000</color>
-    <color name="md_1_theme_dark_primary">#CFBCFF</color>
-    <color name="md_1_theme_dark_onPrimary">#381E72</color>
-    <color name="md_1_theme_dark_primaryContainer">#4F378A</color>
-    <color name="md_1_theme_dark_onPrimaryContainer">#E9DDFF</color>
-    <color name="md_1_theme_dark_secondary">#CBC2DB</color>
-    <color name="md_1_theme_dark_onSecondary">#332D41</color>
-    <color name="md_1_theme_dark_secondaryContainer">#4A4458</color>
-    <color name="md_1_theme_dark_onSecondaryContainer">#E8DEF8</color>
-    <color name="md_1_theme_dark_tertiary">#EFB8C8</color>
-    <color name="md_1_theme_dark_onTertiary">#4A2532</color>
-    <color name="md_1_theme_dark_tertiaryContainer">#633B48</color>
-    <color name="md_1_theme_dark_onTertiaryContainer">#FFD9E3</color>
-    <color name="md_1_theme_dark_error">#FFB4AB</color>
-    <color name="md_1_theme_dark_errorContainer">#93000A</color>
-    <color name="md_1_theme_dark_onError">#690005</color>
-    <color name="md_1_theme_dark_onErrorContainer">#FFDAD6</color>
-    <color name="md_1_theme_dark_background">#1C1B1E</color>
-    <color name="md_1_theme_dark_onBackground">#E6E1E6</color>
-    <color name="md_1_theme_dark_surface">#1C1B1E</color>
-    <color name="md_1_theme_dark_onSurface">#E6E1E6</color>
-    <color name="md_1_theme_dark_surfaceVariant">#49454E</color>
-    <color name="md_1_theme_dark_onSurfaceVariant">#CAC4CF</color>
-    <color name="md_1_theme_dark_outline">#948F99</color>
-    <color name="md_1_theme_dark_inverseOnSurface">#1C1B1E</color>
-    <color name="md_1_theme_dark_inverseSurface">#E6E1E6</color>
-    <color name="md_1_theme_dark_inversePrimary">#6750A4</color>
-    <color name="md_1_theme_dark_shadow">#000000</color>
-    <color name="md_1_theme_dark_surfaceTint">#CFBCFF</color>
-    <color name="md_1_theme_dark_outlineVariant">#49454E</color>
-    <color name="md_1_theme_dark_scrim">#000000</color>
-    <color name="CustomColor1">#93DB00</color>
-    <color name="CustomColor2">#68AF86</color>
-    <color name="CustomColor3">#0096AE</color>
-    <color name="CustomColor4">#000000</color>
-    <color name="light_blue_50">#FFE1F5FE</color>
-    <color name="light_blue_200">#FF81D4FA</color>
-    <color name="light_blue_600">#FF039BE5</color>
-    <color name="light_blue_900">#FF01579B</color>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index d672ba53..5b893737 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -198,93 +198,6 @@
         <item name="colorPrimaryInverse">@color/md_theme_light_4_inversePrimary</item>
     </style>
 
-    <style name="Theme.Dantotsu.Monochrome" parent="Theme.Base">
-        <item name="colorPrimary">@color/bg_black</item>
-        <item name="colorOnPrimary">@color/bg_white</item>
-        <item name="colorPrimaryContainer">@color/bg_black</item>
-        <item name="colorOnPrimaryContainer">@color/bg_white</item>
-        <item name="colorSecondary">@color/bg_black</item>
-        <item name="colorOnSecondary">@color/bg_white</item>
-        <item name="colorSecondaryContainer">@color/bg_black</item>
-        <item name="colorOnSecondaryContainer">@color/bg_white</item>
-        <item name="colorTertiary">@color/bg_black</item>
-        <item name="colorOnTertiary">@color/bg_white</item>
-        <item name="colorTertiaryContainer">@color/bg_black</item>
-        <item name="colorOnTertiaryContainer">@color/bg_white</item>
-        <item name="colorError">@color/bg_black</item>
-        <item name="colorErrorContainer">@color/bg_black</item>
-        <item name="colorOnError">@color/bg_white</item>
-        <item name="colorOnErrorContainer">@color/bg_white</item>
-        <item name="android:colorBackground">@color/bg_white</item>
-        <item name="colorOnBackground">@color/bg_black</item>
-        <item name="colorSurface">@color/bg_white</item>
-        <item name="colorOnSurface">@color/bg_black</item>
-        <item name="colorSurfaceVariant">@color/bg_white</item>
-        <item name="colorOnSurfaceVariant">@color/bg_black</item>
-        <item name="colorOutline">@color/bg_black</item>
-        <item name="colorOnSurfaceInverse">@color/bg_black</item>
-        <item name="colorSurfaceInverse">@color/bg_white</item>
-        <item name="colorPrimaryInverse">@color/bg_white</item>
-    </style>
-
-    <style name="Theme.Dantotsu.Red" parent="Theme.Base">
-        <item name="colorPrimary">@color/md_0_theme_light_primary</item>
-        <item name="colorOnPrimary">@color/md_0_theme_light_onPrimary</item>
-        <item name="colorPrimaryContainer">@color/md_0_theme_light_primaryContainer</item>
-        <item name="colorOnPrimaryContainer">@color/md_0_theme_light_onPrimaryContainer</item>
-        <item name="colorSecondary">@color/md_0_theme_light_secondary</item>
-        <item name="colorOnSecondary">@color/md_0_theme_light_onSecondary</item>
-        <item name="colorSecondaryContainer">@color/md_0_theme_light_secondaryContainer</item>
-        <item name="colorOnSecondaryContainer">@color/md_0_theme_light_onSecondaryContainer</item>
-        <item name="colorTertiary">@color/md_0_theme_light_tertiary</item>
-        <item name="colorOnTertiary">@color/md_0_theme_light_onTertiary</item>
-        <item name="colorTertiaryContainer">@color/md_0_theme_light_tertiaryContainer</item>
-        <item name="colorOnTertiaryContainer">@color/md_0_theme_light_onTertiaryContainer</item>
-        <item name="colorError">@color/md_0_theme_light_error</item>
-        <item name="colorErrorContainer">@color/md_0_theme_light_errorContainer</item>
-        <item name="colorOnError">@color/md_0_theme_light_onError</item>
-        <item name="colorOnErrorContainer">@color/md_0_theme_light_onErrorContainer</item>
-        <item name="android:colorBackground">@color/md_0_theme_light_background</item>
-        <item name="colorOnBackground">@color/md_0_theme_light_onBackground</item>
-        <item name="colorSurface">@color/md_0_theme_light_surface</item>
-        <item name="colorOnSurface">@color/md_0_theme_light_onSurface</item>
-        <item name="colorSurfaceVariant">@color/md_0_theme_light_surfaceVariant</item>
-        <item name="colorOnSurfaceVariant">@color/md_0_theme_light_onSurfaceVariant</item>
-        <item name="colorOutline">@color/md_0_theme_light_outline</item>
-        <item name="colorOnSurfaceInverse">@color/md_0_theme_light_inverseOnSurface</item>
-        <item name="colorSurfaceInverse">@color/md_0_theme_light_inverseSurface</item>
-        <item name="colorPrimaryInverse">@color/md_0_theme_light_inversePrimary</item>
-    </style>
-
-    <style name="Theme.Dantotsu.Lavender" parent="Theme.Base">
-        <item name="colorPrimary">@color/md_1_theme_light_primary</item>
-        <item name="colorOnPrimary">@color/md_1_theme_light_onPrimary</item>
-        <item name="colorPrimaryContainer">@color/md_1_theme_light_primaryContainer</item>
-        <item name="colorOnPrimaryContainer">@color/md_1_theme_light_onPrimaryContainer</item>
-        <item name="colorSecondary">@color/md_1_theme_light_secondary</item>
-        <item name="colorOnSecondary">@color/md_1_theme_light_onSecondary</item>
-        <item name="colorSecondaryContainer">@color/md_1_theme_light_secondaryContainer</item>
-        <item name="colorOnSecondaryContainer">@color/md_1_theme_light_onSecondaryContainer</item>
-        <item name="colorTertiary">@color/md_1_theme_light_tertiary</item>
-        <item name="colorOnTertiary">@color/md_1_theme_light_onTertiary</item>
-        <item name="colorTertiaryContainer">@color/md_1_theme_light_tertiaryContainer</item>
-        <item name="colorOnTertiaryContainer">@color/md_1_theme_light_onTertiaryContainer</item>
-        <item name="colorError">@color/md_1_theme_light_error</item>
-        <item name="colorErrorContainer">@color/md_1_theme_light_errorContainer</item>
-        <item name="colorOnError">@color/md_1_theme_light_onError</item>
-        <item name="colorOnErrorContainer">@color/md_1_theme_light_onErrorContainer</item>
-        <item name="android:colorBackground">@color/md_1_theme_light_background</item>
-        <item name="colorOnBackground">@color/md_1_theme_light_onBackground</item>
-        <item name="colorSurface">@color/md_1_theme_light_surface</item>
-        <item name="colorOnSurface">@color/md_1_theme_light_onSurface</item>
-        <item name="colorSurfaceVariant">@color/md_1_theme_light_surfaceVariant</item>
-        <item name="colorOnSurfaceVariant">@color/md_1_theme_light_onSurfaceVariant</item>
-        <item name="colorOutline">@color/md_1_theme_light_outline</item>
-        <item name="colorOnSurfaceInverse">@color/md_1_theme_light_inverseOnSurface</item>
-        <item name="colorSurfaceInverse">@color/md_1_theme_light_inverseSurface</item>
-        <item name="colorPrimaryInverse">@color/md_1_theme_light_inversePrimary</item>
-    </style>
-
     <style name="Theme.Dantotsu.Saikou" parent="Theme.Base">
         <item name="colorPrimary">@color/md_theme_light_5_primary</item>
         <item name="colorOnPrimary">@color/md_theme_light_5_onPrimary</item>
@@ -314,6 +227,122 @@
         <item name="colorPrimaryInverse">@color/md_theme_light_5_inversePrimary</item>
     </style>
 
+    <style name="Theme.Dantotsu.Red" parent="Theme.Base">
+        <item name="colorPrimary">@color/md_theme_light_6_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_light_6_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_light_6_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_light_6_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/md_theme_light_6_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_light_6_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_light_6_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_light_6_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/md_theme_light_6_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_light_6_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_light_6_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_light_6_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_light_6_error</item>
+        <item name="colorErrorContainer">@color/md_theme_light_6_errorContainer</item>
+        <item name="colorOnError">@color/md_theme_light_6_onError</item>
+        <item name="colorOnErrorContainer">@color/md_theme_light_6_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_light_6_background</item>
+        <item name="colorOnBackground">@color/md_theme_light_6_onBackground</item>
+        <item name="colorSurface">@color/md_theme_light_6_surface</item>
+        <item name="colorOnSurface">@color/md_theme_light_6_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_light_6_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_light_6_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_light_6_outline</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_light_6_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/md_theme_light_6_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_light_6_inversePrimary</item>
+    </style>
+
+    <style name="Theme.Dantotsu.Lavender" parent="Theme.Base">
+        <item name="colorPrimary">@color/md_theme_light_7_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_light_7_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_light_7_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_light_7_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/md_theme_light_7_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_light_7_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_light_7_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_light_7_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/md_theme_light_7_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_light_7_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_light_7_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_light_7_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_light_7_error</item>
+        <item name="colorErrorContainer">@color/md_theme_light_7_errorContainer</item>
+        <item name="colorOnError">@color/md_theme_light_7_onError</item>
+        <item name="colorOnErrorContainer">@color/md_theme_light_7_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_light_7_background</item>
+        <item name="colorOnBackground">@color/md_theme_light_7_onBackground</item>
+        <item name="colorSurface">@color/md_theme_light_7_surface</item>
+        <item name="colorOnSurface">@color/md_theme_light_7_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_light_7_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_light_7_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_light_7_outline</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_light_7_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/md_theme_light_7_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_light_7_inversePrimary</item>
+    </style>
+
+    <style name="Theme.Dantotsu.Emerald" parent="Theme.Base">
+        <item name="colorPrimary">@color/md_theme_light_8_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_light_8_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_light_8_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_light_8_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/md_theme_light_8_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_light_8_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_light_8_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_light_8_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/md_theme_light_8_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_light_8_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_light_8_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_light_8_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_light_8_error</item>
+        <item name="colorErrorContainer">@color/md_theme_light_8_errorContainer</item>
+        <item name="colorOnError">@color/md_theme_light_8_onError</item>
+        <item name="colorOnErrorContainer">@color/md_theme_light_8_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_light_8_background</item>
+        <item name="colorOnBackground">@color/md_theme_light_8_onBackground</item>
+        <item name="colorSurface">@color/md_theme_light_8_surface</item>
+        <item name="colorOnSurface">@color/md_theme_light_8_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_light_8_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_light_8_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_light_8_outline</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_light_8_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/md_theme_light_8_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_light_8_inversePrimary</item>
+    </style>
+
+    <style name="Theme.Dantotsu.Monochrome" parent="Theme.Base">
+        <item name="colorPrimary">@color/bg_black</item>
+        <item name="colorOnPrimary">@color/bg_white</item>
+        <item name="colorPrimaryContainer">@color/bg_black</item>
+        <item name="colorOnPrimaryContainer">@color/bg_white</item>
+        <item name="colorSecondary">@color/bg_black</item>
+        <item name="colorOnSecondary">@color/bg_white</item>
+        <item name="colorSecondaryContainer">@color/bg_black</item>
+        <item name="colorOnSecondaryContainer">@color/bg_white</item>
+        <item name="colorTertiary">@color/bg_black</item>
+        <item name="colorOnTertiary">@color/bg_white</item>
+        <item name="colorTertiaryContainer">@color/bg_black</item>
+        <item name="colorOnTertiaryContainer">@color/bg_white</item>
+        <item name="colorError">@color/bg_black</item>
+        <item name="colorErrorContainer">@color/bg_black</item>
+        <item name="colorOnError">@color/bg_white</item>
+        <item name="colorOnErrorContainer">@color/bg_white</item>
+        <item name="android:colorBackground">@color/bg_white</item>
+        <item name="colorOnBackground">@color/bg_black</item>
+        <item name="colorSurface">@color/bg_white</item>
+        <item name="colorOnSurface">@color/bg_black</item>
+        <item name="colorSurfaceVariant">@color/bg_white</item>
+        <item name="colorOnSurfaceVariant">@color/bg_black</item>
+        <item name="colorOutline">@color/bg_black</item>
+        <item name="colorOnSurfaceInverse">@color/bg_black</item>
+        <item name="colorSurfaceInverse">@color/bg_white</item>
+        <item name="colorPrimaryInverse">@color/bg_white</item>
+    </style>
+
     <style name="Theme.Dantotsu.AppWidgetContainerParent" parent="@android:style/Theme.DeviceDefault">
         <!-- Radius of the outer bound of widgets to make the rounded corners -->
         <item name="appWidgetRadius">16dp</item>