diff --git a/app/build.gradle b/app/build.gradle
index fa4460c..32af6d5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,8 @@ android {
         applicationId "org.teslasoft.assistant"
         minSdk 26
         targetSdk 34
-        versionCode 236
-        versionName "2.36"
+        versionCode 238
+        versionName "2.38"
         externalNativeBuild {
             cmake {
                 cppFlags ''
@@ -58,10 +58,10 @@ android {
 dependencies {
     implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.10.0'
+    implementation 'com.google.android.material:material:1.11.0'
     implementation 'com.google.code.gson:gson:2.10.1'
-    implementation 'com.aallam.openai:openai-client:3.6.1'
-    implementation 'io.ktor:ktor-client-android:2.3.6'
+    implementation 'com.aallam.openai:openai-client:3.6.2'
+    implementation 'io.ktor:ktor-client-android:2.3.7'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
     implementation 'org.teslasoft.core.auth:teslasoft-id:1.3.0'
@@ -75,7 +75,7 @@ dependencies {
     implementation 'io.noties.markwon:ext-strikethrough:4.6.2'
     implementation 'io.noties.markwon:ext-tables:4.6.2'
     implementation 'io.noties.markwon:ext-tasklist:4.6.2'
-    implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.11'
+    implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.12'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha06'
     implementation 'com.google.mlkit:language-id:17.0.4'
diff --git a/app/src/main/java/org/teslasoft/assistant/ui/activities/AboutActivity.kt b/app/src/main/java/org/teslasoft/assistant/ui/activities/AboutActivity.kt
index 737d700..7b7c459 100644
--- a/app/src/main/java/org/teslasoft/assistant/ui/activities/AboutActivity.kt
+++ b/app/src/main/java/org/teslasoft/assistant/ui/activities/AboutActivity.kt
@@ -21,9 +21,12 @@ import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import android.widget.Toast
 
 import androidx.fragment.app.FragmentActivity
 
@@ -40,6 +43,9 @@ class AboutActivity : FragmentActivity() {
     private var btnFeedback: MaterialButton? = null
     private var appVer: TextView? = null
     private var btnDonate: LinearLayout? = null
+    private var btnGithub: LinearLayout? = null
+
+    private var activateEasterEggCounter: Int = 0
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -53,9 +59,26 @@ class AboutActivity : FragmentActivity() {
         btnFeedback = findViewById(R.id.btn_feedback)
         appVer = findViewById(R.id.app_ver)
         btnDonate = findViewById(R.id.btn_donate)
+        btnGithub = findViewById(R.id.btn_github)
 
         appIcon?.setImageResource(R.drawable.assistant)
 
+        appVer?.setOnClickListener {
+            if (activateEasterEggCounter == 0) {
+                Handler(Looper.getMainLooper()).postDelayed({
+                    activateEasterEggCounter = 0
+                }, 1500)
+            }
+
+            if (activateEasterEggCounter == 4) {
+                activateEasterEggCounter = 0
+                Toast.makeText(this, "Easter egg found!", Toast.LENGTH_SHORT).show()
+                /* TODO: Open easter egg */
+            }
+
+            activateEasterEggCounter++
+        }
+
         try {
             val pInfo: PackageInfo = if (android.os.Build.VERSION.SDK_INT >= 33) {
                 packageManager.getPackageInfo(packageName, PackageManager.PackageInfoFlags.of(0))
@@ -104,5 +127,12 @@ class AboutActivity : FragmentActivity() {
             i.action = Intent.ACTION_VIEW
             startActivity(i)
         }
+
+        btnGithub?.setOnClickListener {
+            val i = Intent()
+            i.data = Uri.parse("https://github.com/AndraxDev/speak-gpt")
+            i.action = Intent.ACTION_VIEW
+            startActivity(i)
+        }
     }
 }
diff --git a/app/src/main/java/org/teslasoft/assistant/ui/activities/ChatActivity.kt b/app/src/main/java/org/teslasoft/assistant/ui/activities/ChatActivity.kt
index b60948f..b6c86b0 100644
--- a/app/src/main/java/org/teslasoft/assistant/ui/activities/ChatActivity.kt
+++ b/app/src/main/java/org/teslasoft/assistant/ui/activities/ChatActivity.kt
@@ -1093,7 +1093,7 @@ class ChatActivity : FragmentActivity() {
             } else if (e.stackTraceToString().contains("You exceeded your current quota")) {
                 "You exceeded your current quota. If you had free trial usage please add payment info. Also please check your usage limits. You can change your limits in Account settings."
             } else {
-                e.stackTraceToString()
+                e.stackTraceToString() + "\n\n" + e.message
             }
 
             putMessage(response, true)
@@ -1169,16 +1169,18 @@ class ChatActivity : FragmentActivity() {
                 btnMicro?.isEnabled = false
                 btnSend?.isEnabled = false
                 progress?.visibility = View.GONE
+
                 val m = msgs
+
                 m.add(
                     ChatMessage(
-                        role = ChatRole.User,
+                        role = ChatRole.System,
                         content = "Create a short name for this chat according to the messages provided. Enter just short name and nothing else. Don't add word 'chat' or 'bot' to the name."
                     )
                 )
 
                 val chatCompletionRequest2 = ChatCompletionRequest(
-                    model = ModelId("gpt-3.5-turbo"),
+                    model = ModelId("gpt-3.5-turbo-1106"),
                     maxTokens = 5,
                     messages = m
                 )
diff --git a/app/src/main/java/org/teslasoft/assistant/ui/activities/SettingsActivity.kt b/app/src/main/java/org/teslasoft/assistant/ui/activities/SettingsActivity.kt
index 8182796..1a8a240 100644
--- a/app/src/main/java/org/teslasoft/assistant/ui/activities/SettingsActivity.kt
+++ b/app/src/main/java/org/teslasoft/assistant/ui/activities/SettingsActivity.kt
@@ -529,7 +529,7 @@ class SettingsActivity : FragmentActivity() {
             chatId = extras.getString("chatId", "")
 
             if (chatId == "") {
-                btnClearChat?.visibility = View.GONE
+                btnClearChat?.isEnabled = false
                 activitySettingsTitle?.text = getString(R.string.global_settings_title)
                 globalSettingsTip?.visibility = View.VISIBLE
             } else {
@@ -537,7 +537,7 @@ class SettingsActivity : FragmentActivity() {
                 globalSettingsTip?.visibility = View.GONE
             }
         } else {
-            btnClearChat?.visibility = View.GONE
+            btnClearChat?.isEnabled = false
             activitySettingsTitle?.text = getString(R.string.global_settings_title)
             globalSettingsTip?.visibility = View.VISIBLE
         }
diff --git a/app/src/main/java/org/teslasoft/assistant/ui/adapters/VoiceListAdapter.kt b/app/src/main/java/org/teslasoft/assistant/ui/adapters/VoiceListAdapter.kt
index 311ad80..514ba80 100644
--- a/app/src/main/java/org/teslasoft/assistant/ui/adapters/VoiceListAdapter.kt
+++ b/app/src/main/java/org/teslasoft/assistant/ui/adapters/VoiceListAdapter.kt
@@ -95,7 +95,7 @@ class VoiceListAdapter(private val context: Context, private val items: ArrayLis
     }
 
     private fun getSurfaceColor(context: Context) : Int {
-        return SurfaceColors.SURFACE_3.getColor(context)
+        return context.getColor(android.R.color.transparent)
     }
 
     private fun getSurfaceColorV2(context: Context) : Int {
diff --git a/app/src/main/java/org/teslasoft/assistant/ui/fragments/dialogs/AdvancedSettingsDialogFragment.kt b/app/src/main/java/org/teslasoft/assistant/ui/fragments/dialogs/AdvancedSettingsDialogFragment.kt
index 6cc1feb..d569a14 100644
--- a/app/src/main/java/org/teslasoft/assistant/ui/fragments/dialogs/AdvancedSettingsDialogFragment.kt
+++ b/app/src/main/java/org/teslasoft/assistant/ui/fragments/dialogs/AdvancedSettingsDialogFragment.kt
@@ -60,7 +60,7 @@ class AdvancedSettingsDialogFragment : DialogFragment() {
 
     private var gpt_35_turbo: RadioButton? = null
     private var gpt_35_turbo_0301: RadioButton? = null
-    private var gpt_35_turbo_0613: RadioButton? = null
+    private var gpt_35_turbo_1106: RadioButton? = null
     private var gpt_4: RadioButton? = null
     private var gpt_4_turbo: RadioButton? = null
     private var gpt_4_0314: RadioButton? = null
@@ -101,23 +101,23 @@ class AdvancedSettingsDialogFragment : DialogFragment() {
         val view: View = this.layoutInflater.inflate(R.layout.fragment_advanced_settings, null)
 
         gpt_35_turbo = view.findViewById(R.id.gpt_35_turbo)
-        gpt_35_turbo_0301 = view.findViewById(R.id.gpt_35_turbo_0301)
-        gpt_35_turbo_0613 = view.findViewById(R.id.gpt_35_turbo_0613)
+        // gpt_35_turbo_0301 = view.findViewById(R.id.gpt_35_turbo_0301)
+        gpt_35_turbo_1106 = view.findViewById(R.id.gpt_35_turbo_1106)
         gpt_4 = view.findViewById(R.id.gpt_4)
         gpt_4_turbo = view.findViewById(R.id.gpt_4_turbo)
-        gpt_4_0314 = view.findViewById(R.id.gpt_4_0314)
-        gpt_4_0613 = view.findViewById(R.id.gpt_4_0613)
+        // gpt_4_0314 = view.findViewById(R.id.gpt_4_0314)
+        // gpt_4_0613 = view.findViewById(R.id.gpt_4_0613)
         gpt_4_32k = view.findViewById(R.id.gpt_4_32k)
-        gpt_4_32k_0314 = view.findViewById(R.id.gpt_4_32k_0314)
-        text_davinci_003 = view.findViewById(R.id.text_davinci_003)
-        text_davinci_002 = view.findViewById(R.id.text_davinci_002)
-        text_curie_001 = view.findViewById(R.id.text_curie_001)
-        text_babbage_001 = view.findViewById(R.id.text_babbage_001)
-        text_ada_001 = view.findViewById(R.id.text_ada_001)
-        davinci = view.findViewById(R.id.davinci)
-        curie = view.findViewById(R.id.curie)
-        babbage = view.findViewById(R.id.babbage)
-        ada = view.findViewById(R.id.ada)
+        // gpt_4_32k_0314 = view.findViewById(R.id.gpt_4_32k_0314)
+        // text_davinci_003 = view.findViewById(R.id.text_davinci_003)
+        // text_davinci_002 = view.findViewById(R.id.text_davinci_002)
+        // text_curie_001 = view.findViewById(R.id.text_curie_001)
+        // text_babbage_001 = view.findViewById(R.id.text_babbage_001)
+        // text_ada_001 = view.findViewById(R.id.text_ada_001)
+        // davinci = view.findViewById(R.id.davinci)
+        // curie = view.findViewById(R.id.curie)
+        // babbage = view.findViewById(R.id.babbage)
+        // ada = view.findViewById(R.id.ada)
         ft = view.findViewById(R.id.ft)
         ftInput = view.findViewById(R.id.ft_input)
         maxTokens = view.findViewById(R.id.max_tokens)
@@ -136,6 +136,8 @@ class AdvancedSettingsDialogFragment : DialogFragment() {
                 ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v4)!!)
             ftInput?.visibility = View.GONE
         }
+        /* DEPRECATED */
+        /*
         gpt_35_turbo_0301?.setOnClickListener {
             model = "gpt-3.5-turbo-0301"
             clearSelection()
@@ -144,11 +146,12 @@ class AdvancedSettingsDialogFragment : DialogFragment() {
                 ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v4)!!)
             ftInput?.visibility = View.GONE
         }
-        gpt_35_turbo_0613?.setOnClickListener {
-            model = "gpt-3.5-turbo-16k-0613"
+         */
+        gpt_35_turbo_1106?.setOnClickListener {
+            model = "gpt-3.5-turbo-1106"
             clearSelection()
-            gpt_35_turbo_0613?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.window_background))
-            gpt_35_turbo_0613?.background = getDarkAccentDrawableV2(
+            gpt_35_turbo_1106?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.window_background))
+            gpt_35_turbo_1106?.background = getDarkAccentDrawableV2(
                 ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v4)!!)
             ftInput?.visibility = View.GONE
         }
@@ -168,6 +171,8 @@ class AdvancedSettingsDialogFragment : DialogFragment() {
                 ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v4)!!)
             ftInput?.visibility = View.GONE
         }
+        /* DEPRECATED */
+        /*
         gpt_4_0314?.setOnClickListener {
             model = "gpt-4-0314"
             clearSelection()
@@ -176,6 +181,9 @@ class AdvancedSettingsDialogFragment : DialogFragment() {
                 ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v4)!!)
             ftInput?.visibility = View.GONE
         }
+         */
+        /* DEPRECATED */
+        /*
         gpt_4_0613?.setOnClickListener {
             model = "gpt-4-0613"
             clearSelection()
@@ -184,6 +192,7 @@ class AdvancedSettingsDialogFragment : DialogFragment() {
                 ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v4)!!)
             ftInput?.visibility = View.GONE
         }
+         */
         gpt_4_32k?.setOnClickListener {
             model = "gpt-4-32k"
             clearSelection()
@@ -192,6 +201,8 @@ class AdvancedSettingsDialogFragment : DialogFragment() {
                 ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v4)!!)
             ftInput?.visibility = View.GONE
         }
+        /* DEPRECATED */
+        /*
         gpt_4_32k_0314?.setOnClickListener {
             model = "gpt-4-32k-0314"
             clearSelection()
@@ -271,7 +282,7 @@ class AdvancedSettingsDialogFragment : DialogFragment() {
             ada?.background = getDarkAccentDrawableV2(
                 ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v4)!!)
             ftInput?.visibility = View.GONE
-        }
+        }*/
         ft?.setOnClickListener {
             model = ftInput?.text.toString()
             clearSelection()
@@ -311,11 +322,11 @@ class AdvancedSettingsDialogFragment : DialogFragment() {
                     ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v4)!!)
                 ftInput?.visibility = View.GONE
             }
-            "gpt-3.5-turbo-16k-0613" -> {
-                gpt_35_turbo_0613?.isChecked = true
+            "gpt-3.5-turbo-1106" -> {
+                gpt_35_turbo_1106?.isChecked = true
                 clearSelection()
-                gpt_35_turbo_0613?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.window_background))
-                gpt_35_turbo_0613?.background = getDarkAccentDrawableV2(
+                gpt_35_turbo_1106?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.window_background))
+                gpt_35_turbo_1106?.background = getDarkAccentDrawableV2(
                     ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v4)!!)
                 ftInput?.visibility = View.GONE
             }
@@ -344,7 +355,8 @@ class AdvancedSettingsDialogFragment : DialogFragment() {
                     ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v4)!!)
                 ftInput?.visibility = View.GONE
             }
-            "gpt-4-0613" -> {
+            /* DEPRECATED */
+            /* "gpt-4-0613" -> {
                 gpt_4_0613?.isChecked = true
                 clearSelection()
                 gpt_4_0613?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.window_background))
@@ -352,6 +364,7 @@ class AdvancedSettingsDialogFragment : DialogFragment() {
                     ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v4)!!)
                 ftInput?.visibility = View.GONE
             }
+            */
             /* DEPRECATED */
             /*"gpt-4-0314" -> {
                 gpt_4_0314?.isChecked = true
@@ -378,6 +391,8 @@ class AdvancedSettingsDialogFragment : DialogFragment() {
                     ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v4)!!)
                 ftInput?.visibility = View.GONE
             }*/
+
+            /* THESE MODELS HAS BEEN SHUT DOWN ON Jan 1 2024
             "text-davinci-003" -> {
                 text_davinci_003?.isChecked = true
                 clearSelection()
@@ -418,6 +433,7 @@ class AdvancedSettingsDialogFragment : DialogFragment() {
                     ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v4)!!)
                 ftInput?.visibility = View.GONE
             }
+             */
             /* DEPRECATED */
             /*"davinci" -> {
                 davinci?.isChecked = true
@@ -470,69 +486,73 @@ class AdvancedSettingsDialogFragment : DialogFragment() {
             ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
         gpt_35_turbo?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
 
-        gpt_35_turbo_0301?.background = getDarkAccentDrawable(
-            ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
-        gpt_35_turbo_0301?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
+//        gpt_35_turbo_0301?.background = getDarkAccentDrawable(
+//            ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
+//        gpt_35_turbo_0301?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
 
-        gpt_35_turbo_0613?.background = getDarkAccentDrawable(
+        gpt_35_turbo_1106?.background = getDarkAccentDrawable(
             ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
-        gpt_35_turbo_0613?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
+        gpt_35_turbo_1106?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
 
         gpt_4?.background = getDarkAccentDrawable(
             ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
         gpt_4?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
 
-        gpt_4_0314?.background = getDarkAccentDrawable(
+        gpt_4_turbo?.background = getDarkAccentDrawable(
             ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
-        gpt_4_0314?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
+        gpt_4_turbo?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
 
-        gpt_4_0613?.background = getDarkAccentDrawable(
-            ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
-        gpt_4_0613?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
+//        gpt_4_0314?.background = getDarkAccentDrawable(
+//            ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
+//        gpt_4_0314?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
+//
+//        gpt_4_0613?.background = getDarkAccentDrawable(
+//            ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
+//        gpt_4_0613?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
 
         gpt_4_32k?.background = getDarkAccentDrawable(
             ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
         gpt_4_32k?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
 
-        gpt_4_32k_0314?.background = getDarkAccentDrawable(
-            ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
-        gpt_4_32k_0314?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
-
-        text_davinci_003?.background = getDarkAccentDrawable(
-            ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
-        text_davinci_003?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
-
-        text_davinci_002?.background = getDarkAccentDrawable(
-            ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
-        text_davinci_002?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
-
-        text_curie_001?.background = getDarkAccentDrawable(
-            ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
-        text_curie_001?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
-
-        text_babbage_001?.background = getDarkAccentDrawable(
-            ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
-        text_babbage_001?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
-
-        text_ada_001?.background = getDarkAccentDrawable(
-            ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
-        text_ada_001?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
-
-        davinci?.background = getDarkAccentDrawable(
-            ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
-        davinci?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
-
-        curie?.background = getDarkAccentDrawable(
-            ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
-        curie?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
-
-        babbage?.background = getDarkAccentDrawable(
-            ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
-        babbage?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
-
-        ada?.background = getDarkAccentDrawable(
-            ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
-        ada?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
+//        gpt_4_32k_0314?.background = getDarkAccentDrawable(
+//            ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
+//        gpt_4_32k_0314?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
+//
+//        text_davinci_003?.background = getDarkAccentDrawable(
+//            ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
+//        text_davinci_003?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
+//
+//        text_davinci_002?.background = getDarkAccentDrawable(
+//            ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
+//        text_davinci_002?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
+//
+//        text_curie_001?.background = getDarkAccentDrawable(
+//            ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
+//        text_curie_001?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
+//
+//        text_babbage_001?.background = getDarkAccentDrawable(
+//            ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
+//        text_babbage_001?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
+//
+//        text_ada_001?.background = getDarkAccentDrawable(
+//            ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
+//        text_ada_001?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
+//
+//        davinci?.background = getDarkAccentDrawable(
+//            ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
+//        davinci?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
+//
+//        curie?.background = getDarkAccentDrawable(
+//            ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
+//        curie?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
+//
+//        babbage?.background = getDarkAccentDrawable(
+//            ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
+//        babbage?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
+//
+//        ada?.background = getDarkAccentDrawable(
+//            ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
+//        ada?.setTextColor(ContextCompat.getColor(requireActivity(), R.color.neutral_200))
 
         ft?.background = getDarkAccentDrawable(
             ContextCompat.getDrawable(requireActivity(), R.drawable.btn_accent_tonal_selector_v3)!!, requireActivity())
@@ -550,7 +570,7 @@ class AdvancedSettingsDialogFragment : DialogFragment() {
     }
 
     private fun getSurfaceColor(context: Context) : Int {
-        return SurfaceColors.SURFACE_3.getColor(context)
+        return context.getColor(android.R.color.transparent)
     }
 
     private fun getSurfaceColorV2() : Int {
diff --git a/app/src/main/java/org/teslasoft/assistant/ui/fragments/dialogs/LanguageSelectorDialogFragment.kt b/app/src/main/java/org/teslasoft/assistant/ui/fragments/dialogs/LanguageSelectorDialogFragment.kt
index 5dbc719..d45f91a 100644
--- a/app/src/main/java/org/teslasoft/assistant/ui/fragments/dialogs/LanguageSelectorDialogFragment.kt
+++ b/app/src/main/java/org/teslasoft/assistant/ui/fragments/dialogs/LanguageSelectorDialogFragment.kt
@@ -349,7 +349,7 @@ class LanguageSelectorDialogFragment : DialogFragment() {
     }
 
     private fun getSurfaceColor(context: Context) : Int {
-        return SurfaceColors.SURFACE_3.getColor(context)
+        return context.getColor(android.R.color.transparent)
     }
 
     private fun getSurfaceColorV2(context: Context) : Int {
diff --git a/app/src/main/java/org/teslasoft/assistant/ui/fragments/tabs/PromptsFragment.kt b/app/src/main/java/org/teslasoft/assistant/ui/fragments/tabs/PromptsFragment.kt
index 4613371..9e1763b 100644
--- a/app/src/main/java/org/teslasoft/assistant/ui/fragments/tabs/PromptsFragment.kt
+++ b/app/src/main/java/org/teslasoft/assistant/ui/fragments/tabs/PromptsFragment.kt
@@ -336,31 +336,121 @@ class PromptsFragment : Fragment(), SwipeRefreshLayout.OnRefreshListener {
     }
 
     private fun initializeCat() {
-        catAll?.setOnClickListener { selectedCategory = "all";filter(prompts) }
-        catDevelopment?.setOnClickListener { selectedCategory = "development";filter(prompts) }
-        catMusic?.setOnClickListener { selectedCategory = "music";filter(prompts) }
-        catArt?.setOnClickListener { selectedCategory = "art";filter(prompts) }
-        catCulture?.setOnClickListener { selectedCategory = "culture";filter(prompts) }
-        catBusiness?.setOnClickListener { selectedCategory = "business";filter(prompts) }
-        catGaming?.setOnClickListener { selectedCategory = "gaming";filter(prompts) }
-        catEducation?.setOnClickListener { selectedCategory = "education";filter(prompts) }
-        catHistory?.setOnClickListener { selectedCategory = "history";filter(prompts) }
-        catFood?.setOnClickListener { selectedCategory = "food";filter(prompts) }
-        catTourism?.setOnClickListener { selectedCategory = "tourism";filter(prompts) }
-        catProductivity?.setOnClickListener { selectedCategory = "productivity";filter(prompts) }
-        catTools?.setOnClickListener { selectedCategory = "tools";filter(prompts) }
-        catEntertainment?.setOnClickListener { selectedCategory = "entertainment";filter(prompts) }
-        catSport?.setOnClickListener { selectedCategory = "sport";filter(prompts) }
-        catHealth?.setOnClickListener { selectedCategory = "health";filter(prompts) }
-    }
-
-    private fun getDarkAccentDrawable(drawable: Drawable, context: Context) : Drawable {
-        DrawableCompat.setTint(DrawableCompat.wrap(drawable), getSurfaceColor(context))
-        return drawable
+        catAll?.setOnClickListener {
+            clearSelection()
+            catAll?.setBackgroundResource(R.drawable.cat_all_active)
+            selectedCategory = "all"
+            filter(prompts)
+        }
+        catDevelopment?.setOnClickListener {
+            clearSelection()
+            catDevelopment?.setBackgroundResource(R.drawable.cat_development_active)
+            selectedCategory = "development"
+            filter(prompts)
+        }
+        catMusic?.setOnClickListener {
+            clearSelection()
+            catMusic?.setBackgroundResource(R.drawable.cat_music_active)
+            selectedCategory = "music"
+            filter(prompts)
+        }
+        catArt?.setOnClickListener {
+            clearSelection()
+            catArt?.setBackgroundResource(R.drawable.cat_art_active)
+            selectedCategory = "art"
+            filter(prompts)
+        }
+        catCulture?.setOnClickListener {
+            clearSelection()
+            catCulture?.setBackgroundResource(R.drawable.cat_culture_active)
+            selectedCategory = "culture"
+            filter(prompts)
+        }
+        catBusiness?.setOnClickListener {
+            clearSelection()
+            catBusiness?.setBackgroundResource(R.drawable.cat_business_active)
+            selectedCategory = "business"
+            filter(prompts)
+        }
+        catGaming?.setOnClickListener {
+            clearSelection()
+            catGaming?.setBackgroundResource(R.drawable.cat_gaming_active)
+            selectedCategory = "gaming"
+            filter(prompts)
+        }
+        catEducation?.setOnClickListener {
+            clearSelection()
+            catEducation?.setBackgroundResource(R.drawable.cat_education_active)
+            selectedCategory = "education"
+            filter(prompts)
+        }
+        catHistory?.setOnClickListener {
+            clearSelection()
+            catHistory?.setBackgroundResource(R.drawable.cat_history_active)
+            selectedCategory = "history"
+            filter(prompts)
+        }
+        catFood?.setOnClickListener {
+            clearSelection()
+            catFood?.setBackgroundResource(R.drawable.cat_food_active)
+            selectedCategory = "food"
+            filter(prompts)
+        }
+        catTourism?.setOnClickListener {
+            clearSelection()
+            catTourism?.setBackgroundResource(R.drawable.cat_tourism_active)
+            selectedCategory = "tourism"
+            filter(prompts)
+        }
+        catProductivity?.setOnClickListener {
+            clearSelection()
+            catProductivity?.setBackgroundResource(R.drawable.cat_productivity_active)
+            selectedCategory = "productivity"
+            filter(prompts)
+        }
+        catTools?.setOnClickListener {
+            clearSelection()
+            catTools?.setBackgroundResource(R.drawable.cat_tools_active)
+            selectedCategory = "tools"
+            filter(prompts)
+        }
+        catEntertainment?.setOnClickListener {
+            clearSelection()
+            catEntertainment?.setBackgroundResource(R.drawable.cat_entertainment_active)
+            selectedCategory = "entertainment"
+            filter(prompts)
+        }
+        catSport?.setOnClickListener {
+            clearSelection()
+            catSport?.setBackgroundResource(R.drawable.cat_sport_active)
+            selectedCategory = "sport"
+            filter(prompts)
+        }
+        catHealth?.setOnClickListener {
+            clearSelection()
+            catHealth?.setBackgroundResource(R.drawable.cat_health_active)
+            selectedCategory = "health"
+            filter(prompts)
+        }
     }
 
-    private fun getSurfaceColor(context: Context) : Int {
-        return SurfaceColors.SURFACE_2.getColor(context)
+    private fun clearSelection () {
+        catAll?.setBackgroundResource(R.drawable.cat_all)
+        catDevelopment?.setBackgroundResource(R.drawable.cat_development)
+        catMusic?.setBackgroundResource(R.drawable.cat_music)
+        catArt?.setBackgroundResource(R.drawable.cat_art)
+        catCulture?.setBackgroundResource(R.drawable.cat_culture)
+        catBusiness?.setBackgroundResource(R.drawable.cat_business)
+        catGaming?.setBackgroundResource(R.drawable.cat_gaming)
+        catEducation?.setBackgroundResource(R.drawable.cat_education)
+        catHistory?.setBackgroundResource(R.drawable.cat_history)
+        catFood?.setBackgroundResource(R.drawable.cat_food)
+        catTourism?.setBackgroundResource(R.drawable.cat_tourism)
+        catProductivity?.setBackgroundResource(R.drawable.cat_productivity)
+        catTools?.setBackgroundResource(R.drawable.cat_tools)
+        catEntertainment?.setBackgroundResource(R.drawable.cat_entertainment)
+        catSport?.setBackgroundResource(R.drawable.cat_sport)
+        catHealth?.setBackgroundResource(R.drawable.cat_health)
     }
 
     private fun loadData() {
diff --git a/app/src/main/res/drawable/btn_accent_24.xml b/app/src/main/res/drawable/btn_accent_24.xml
new file mode 100644
index 0000000..8ddf9a7
--- /dev/null
+++ b/app/src/main/res/drawable/btn_accent_24.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/accent_100"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="24dp" />
+            <solid android:color="@color/accent_100" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/drawable/btn_accent_50p.xml b/app/src/main/res/drawable/btn_accent_50p.xml
new file mode 100644
index 0000000..ffed27e
--- /dev/null
+++ b/app/src/main/res/drawable/btn_accent_50p.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/accent_50"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="200dp" />
+            <solid android:color="@color/accent_50" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_accent_tonal_v5.xml b/app/src/main/res/drawable/btn_accent_tonal_v5.xml
new file mode 100644
index 0000000..596f3a0
--- /dev/null
+++ b/app/src/main/res/drawable/btn_accent_tonal_v5.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/accent_500"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="16dp" />
+            <solid android:color="@color/accent_250" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_tip2.xml b/app/src/main/res/drawable/btn_tip2.xml
index e5a8d2e..46e5359 100644
--- a/app/src/main/res/drawable/btn_tip2.xml
+++ b/app/src/main/res/drawable/btn_tip2.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <corners android:radius="24dp" />
+            <corners android:radius="16dp" />
             <solid android:color="@color/warn_bg" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/cat_all_active.xml b/app/src/main/res/drawable/cat_all_active.xml
new file mode 100644
index 0000000..e88333f
--- /dev/null
+++ b/app/src/main/res/drawable/cat_all_active.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/accent_250"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="16dp" />
+            <solid android:color="@color/accent_200" />
+            <stroke android:width="1dp" android:color="@color/border" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cat_art.xml b/app/src/main/res/drawable/cat_art.xml
index 45f40ad..8b1f4de 100644
--- a/app/src/main/res/drawable/cat_art.xml
+++ b/app/src/main/res/drawable/cat_art.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/tint_cat_art"
+<ripple android:color="@color/tint_cat_art_active"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
diff --git a/app/src/main/res/drawable/cat_art_active.xml b/app/src/main/res/drawable/cat_art_active.xml
new file mode 100644
index 0000000..363d578
--- /dev/null
+++ b/app/src/main/res/drawable/cat_art_active.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/tint_cat_art_active"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="16dp" />
+            <solid android:color="@color/tint_cat_art_active" />
+            <stroke android:width="1dp" android:color="@color/border" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cat_business.xml b/app/src/main/res/drawable/cat_business.xml
index c09e473..07b3648 100644
--- a/app/src/main/res/drawable/cat_business.xml
+++ b/app/src/main/res/drawable/cat_business.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/tint_cat_business"
+<ripple android:color="@color/tint_cat_business_active"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
diff --git a/app/src/main/res/drawable/cat_business_active.xml b/app/src/main/res/drawable/cat_business_active.xml
new file mode 100644
index 0000000..476849b
--- /dev/null
+++ b/app/src/main/res/drawable/cat_business_active.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/tint_cat_business_active"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="16dp" />
+            <solid android:color="@color/tint_cat_business_active" />
+            <stroke android:width="1dp" android:color="@color/border" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cat_culture.xml b/app/src/main/res/drawable/cat_culture.xml
index a70e91d..a11f499 100644
--- a/app/src/main/res/drawable/cat_culture.xml
+++ b/app/src/main/res/drawable/cat_culture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/tint_cat_culture"
+<ripple android:color="@color/tint_cat_culture_active"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
diff --git a/app/src/main/res/drawable/cat_culture_active.xml b/app/src/main/res/drawable/cat_culture_active.xml
new file mode 100644
index 0000000..fb184a3
--- /dev/null
+++ b/app/src/main/res/drawable/cat_culture_active.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/tint_cat_culture_active"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="16dp" />
+            <solid android:color="@color/tint_cat_culture_active" />
+            <stroke android:width="1dp" android:color="@color/border" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cat_development.xml b/app/src/main/res/drawable/cat_development.xml
index 1968869..3a3bdad 100644
--- a/app/src/main/res/drawable/cat_development.xml
+++ b/app/src/main/res/drawable/cat_development.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/tint_cat_development"
+<ripple android:color="@color/tint_cat_development_active"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
diff --git a/app/src/main/res/drawable/cat_development_active.xml b/app/src/main/res/drawable/cat_development_active.xml
new file mode 100644
index 0000000..a717438
--- /dev/null
+++ b/app/src/main/res/drawable/cat_development_active.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/tint_cat_development_active"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="16dp" />
+            <solid android:color="@color/tint_cat_development_active" />
+            <stroke android:width="1dp" android:color="@color/border" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cat_education.xml b/app/src/main/res/drawable/cat_education.xml
index 00a993c..8bd1578 100644
--- a/app/src/main/res/drawable/cat_education.xml
+++ b/app/src/main/res/drawable/cat_education.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/tint_cat_education"
+<ripple android:color="@color/tint_cat_education_active"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
diff --git a/app/src/main/res/drawable/cat_education_active.xml b/app/src/main/res/drawable/cat_education_active.xml
new file mode 100644
index 0000000..2357de8
--- /dev/null
+++ b/app/src/main/res/drawable/cat_education_active.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/tint_cat_education_active"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="16dp" />
+            <solid android:color="@color/tint_cat_education_active" />
+            <stroke android:width="1dp" android:color="@color/border" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cat_entertainment.xml b/app/src/main/res/drawable/cat_entertainment.xml
index 8bde176..093fab4 100644
--- a/app/src/main/res/drawable/cat_entertainment.xml
+++ b/app/src/main/res/drawable/cat_entertainment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/tint_cat_entertainment"
+<ripple android:color="@color/tint_cat_entertainment_active"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
diff --git a/app/src/main/res/drawable/cat_entertainment_active.xml b/app/src/main/res/drawable/cat_entertainment_active.xml
new file mode 100644
index 0000000..71f1607
--- /dev/null
+++ b/app/src/main/res/drawable/cat_entertainment_active.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/tint_cat_entertainment_active"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="16dp" />
+            <solid android:color="@color/tint_cat_entertainment_active" />
+            <stroke android:width="1dp" android:color="@color/border" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cat_food.xml b/app/src/main/res/drawable/cat_food.xml
index 73e66e8..938d092 100644
--- a/app/src/main/res/drawable/cat_food.xml
+++ b/app/src/main/res/drawable/cat_food.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/tint_cat_food"
+<ripple android:color="@color/tint_cat_food_active"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
diff --git a/app/src/main/res/drawable/cat_food_active.xml b/app/src/main/res/drawable/cat_food_active.xml
new file mode 100644
index 0000000..b1895ed
--- /dev/null
+++ b/app/src/main/res/drawable/cat_food_active.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/tint_cat_food_active"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="16dp" />
+            <solid android:color="@color/tint_cat_food_active" />
+            <stroke android:width="1dp" android:color="@color/border" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cat_gaming.xml b/app/src/main/res/drawable/cat_gaming.xml
index 38a96bb..267c812 100644
--- a/app/src/main/res/drawable/cat_gaming.xml
+++ b/app/src/main/res/drawable/cat_gaming.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/tint_cat_gaming"
+<ripple android:color="@color/tint_cat_gaming_active"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
diff --git a/app/src/main/res/drawable/cat_gaming_active.xml b/app/src/main/res/drawable/cat_gaming_active.xml
new file mode 100644
index 0000000..2cdc42d
--- /dev/null
+++ b/app/src/main/res/drawable/cat_gaming_active.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/tint_cat_gaming_active"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="16dp" />
+            <solid android:color="@color/tint_cat_gaming_active" />
+            <stroke android:width="1dp" android:color="@color/border" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cat_health.xml b/app/src/main/res/drawable/cat_health.xml
index 047175e..cabb8ba 100644
--- a/app/src/main/res/drawable/cat_health.xml
+++ b/app/src/main/res/drawable/cat_health.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/tint_cat_health"
+<ripple android:color="@color/tint_cat_health_active"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
diff --git a/app/src/main/res/drawable/cat_health_active.xml b/app/src/main/res/drawable/cat_health_active.xml
new file mode 100644
index 0000000..ac42fb9
--- /dev/null
+++ b/app/src/main/res/drawable/cat_health_active.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/tint_cat_health_active"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="16dp" />
+            <solid android:color="@color/tint_cat_health_active" />
+            <stroke android:width="1dp" android:color="@color/border" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cat_history.xml b/app/src/main/res/drawable/cat_history.xml
index 06e55f6..ede34c5 100644
--- a/app/src/main/res/drawable/cat_history.xml
+++ b/app/src/main/res/drawable/cat_history.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/tint_cat_history"
+<ripple android:color="@color/tint_cat_history_active"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
diff --git a/app/src/main/res/drawable/cat_history_active.xml b/app/src/main/res/drawable/cat_history_active.xml
new file mode 100644
index 0000000..ce0dd5d
--- /dev/null
+++ b/app/src/main/res/drawable/cat_history_active.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/tint_cat_history_active"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="16dp" />
+            <solid android:color="@color/tint_cat_history_active" />
+            <stroke android:width="1dp" android:color="@color/border" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cat_music.xml b/app/src/main/res/drawable/cat_music.xml
index 6afefb9..d9b8be3 100644
--- a/app/src/main/res/drawable/cat_music.xml
+++ b/app/src/main/res/drawable/cat_music.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/tint_cat_music"
+<ripple android:color="@color/tint_cat_music_active"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
diff --git a/app/src/main/res/drawable/cat_music_active.xml b/app/src/main/res/drawable/cat_music_active.xml
new file mode 100644
index 0000000..e329f2b
--- /dev/null
+++ b/app/src/main/res/drawable/cat_music_active.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/tint_cat_music_active"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="16dp" />
+            <solid android:color="@color/tint_cat_music_active" />
+            <stroke android:width="1dp" android:color="@color/border" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cat_productivity.xml b/app/src/main/res/drawable/cat_productivity.xml
index 503f3c8..d8c6b0c 100644
--- a/app/src/main/res/drawable/cat_productivity.xml
+++ b/app/src/main/res/drawable/cat_productivity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/tint_cat_productivity"
+<ripple android:color="@color/tint_cat_productivity_active"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
diff --git a/app/src/main/res/drawable/cat_productivity_active.xml b/app/src/main/res/drawable/cat_productivity_active.xml
new file mode 100644
index 0000000..862f2ce
--- /dev/null
+++ b/app/src/main/res/drawable/cat_productivity_active.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/tint_cat_productivity_active"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="16dp" />
+            <solid android:color="@color/tint_cat_productivity_active" />
+            <stroke android:width="1dp" android:color="@color/border" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cat_sport.xml b/app/src/main/res/drawable/cat_sport.xml
index c792bdc..c5e6b62 100644
--- a/app/src/main/res/drawable/cat_sport.xml
+++ b/app/src/main/res/drawable/cat_sport.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/tint_cat_sport"
+<ripple android:color="@color/tint_cat_sport_active"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
diff --git a/app/src/main/res/drawable/cat_sport_active.xml b/app/src/main/res/drawable/cat_sport_active.xml
new file mode 100644
index 0000000..42c7df2
--- /dev/null
+++ b/app/src/main/res/drawable/cat_sport_active.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/tint_cat_sport_active"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="16dp" />
+            <solid android:color="@color/tint_cat_sport_active" />
+            <stroke android:width="1dp" android:color="@color/border" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cat_tools.xml b/app/src/main/res/drawable/cat_tools.xml
index c4cc227..752fd5e 100644
--- a/app/src/main/res/drawable/cat_tools.xml
+++ b/app/src/main/res/drawable/cat_tools.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/tint_cat_tools"
+<ripple android:color="@color/tint_cat_tools_active"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
diff --git a/app/src/main/res/drawable/cat_tools_active.xml b/app/src/main/res/drawable/cat_tools_active.xml
new file mode 100644
index 0000000..e0efdcd
--- /dev/null
+++ b/app/src/main/res/drawable/cat_tools_active.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/tint_cat_tools_active"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="16dp" />
+            <solid android:color="@color/tint_cat_tools_active" />
+            <stroke android:width="1dp" android:color="@color/border" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cat_tourism.xml b/app/src/main/res/drawable/cat_tourism.xml
index e28c14f..968d209 100644
--- a/app/src/main/res/drawable/cat_tourism.xml
+++ b/app/src/main/res/drawable/cat_tourism.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/tint_cat_tourism"
+<ripple android:color="@color/tint_cat_tourism_active"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
diff --git a/app/src/main/res/drawable/cat_tourism_active.xml b/app/src/main/res/drawable/cat_tourism_active.xml
new file mode 100644
index 0000000..48ea029
--- /dev/null
+++ b/app/src/main/res/drawable/cat_tourism_active.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/tint_cat_tourism_active"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="16dp" />
+            <solid android:color="@color/tint_cat_tourism_active" />
+            <stroke android:width="1dp" android:color="@color/border" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_github.xml b/app/src/main/res/drawable/ic_github.xml
new file mode 100644
index 0000000..8391c7a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_github.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="98dp"
+    android:height="96dp"
+    android:viewportWidth="98"
+    android:viewportHeight="96">
+  <path
+      android:pathData="M48.854,0C21.839,0 0,22 0,49.217c0,21.756 13.993,40.172 33.405,46.69 2.427,0.49 3.316,-1.059 3.316,-2.362 0,-1.141 -0.08,-5.052 -0.08,-9.127 -13.59,2.934 -16.42,-5.867 -16.42,-5.867 -2.184,-5.704 -5.42,-7.17 -5.42,-7.17 -4.448,-3.015 0.324,-3.015 0.324,-3.015 4.934,0.326 7.523,5.052 7.523,5.052 4.367,7.496 11.404,5.378 14.235,4.074 0.404,-3.178 1.699,-5.378 3.074,-6.6 -10.839,-1.141 -22.243,-5.378 -22.243,-24.283 0,-5.378 1.94,-9.778 5.014,-13.2 -0.485,-1.222 -2.184,-6.275 0.486,-13.038 0,0 4.125,-1.304 13.426,5.052a46.97,46.97 0,0 1,12.214 -1.63c4.125,0 8.33,0.571 12.213,1.63 9.302,-6.356 13.427,-5.052 13.427,-5.052 2.67,6.763 0.97,11.816 0.485,13.038 3.155,3.422 5.015,7.822 5.015,13.2 0,18.905 -11.404,23.06 -22.324,24.283 1.78,1.548 3.316,4.481 3.316,9.126 0,6.6 -0.08,11.897 -0.08,13.526 0,1.304 0.89,2.853 3.316,2.364 19.412,-6.52 33.405,-24.935 33.405,-46.691C97.707,22 75.788,0 48.854,0z"
+      android:fillColor="@color/accent_900"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/t_menu_bottom_item_background.xml b/app/src/main/res/drawable/t_menu_bottom_item_background.xml
index 333d290..07fa96f 100644
--- a/app/src/main/res/drawable/t_menu_bottom_item_background.xml
+++ b/app/src/main/res/drawable/t_menu_bottom_item_background.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape >
-            <corners android:topLeftRadius="8dp" android:topRightRadius="8dp" android:bottomRightRadius="24dp" android:bottomLeftRadius="24dp"/>
+            <corners android:topLeftRadius="8dp" android:topRightRadius="8dp" android:bottomRightRadius="16dp" android:bottomLeftRadius="16dp"/>
             <gradient android:type="linear" android:angle="315" android:startColor="@color/accent_100" android:centerColor="@color/accent_100" android:endColor="@color/accent_100" android:useLevel="true"/>
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/t_menu_top_item_background.xml b/app/src/main/res/drawable/t_menu_top_item_background.xml
index fceda33..c724dbe 100644
--- a/app/src/main/res/drawable/t_menu_top_item_background.xml
+++ b/app/src/main/res/drawable/t_menu_top_item_background.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <corners android:topLeftRadius="24dp" android:topRightRadius="24dp" android:bottomRightRadius="8dp" android:bottomLeftRadius="8dp"/>
+            <corners android:topLeftRadius="16dp" android:topRightRadius="16dp" android:bottomRightRadius="8dp" android:bottomLeftRadius="8dp"/>
             <gradient android:type="linear" android:angle="315" android:startColor="@color/accent_100" android:centerColor="@color/accent_100" android:endColor="@color/accent_100" android:useLevel="true"/>
         </shape>
     </item>
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 55e2cc1..0399462 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -21,11 +22,13 @@
                 android:layout_width="120dp"
                 android:layout_height="120dp"
                 android:layout_marginTop="36dp"
+                android:background="@drawable/btn_accent_50p"
+                android:contentDescription="@string/app_name"
+                android:padding="12dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/assistant"
-                android:contentDescription="@string/app_name" />
+                app:srcCompat="@drawable/assistant" />
 
             <TextView
                 android:id="@+id/textView7"
@@ -40,93 +43,195 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/app_icon" />
 
-            <TextView
-                android:id="@+id/textView8"
-                android:layout_width="wrap_content"
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/constraintLayout3"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="36dp"
                 android:layout_marginTop="16dp"
-                android:text="@string/about_developer"
-                android:textSize="16sp"
+                android:layout_marginEnd="36dp"
+                android:background="@drawable/btn_accent_24"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/textView7" />
+                app:layout_constraintTop_toBottomOf="@+id/textView7">
 
-            <TextView
-                android:id="@+id/app_ver"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="@string/about_version"
-                android:textSize="16sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/textView8" />
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btn_projects"
+                    style="@style/Widget.Material3.Button.TonalButton"
+                    android:layout_width="0dp"
+                    android:layout_height="56dp"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="12dp"
+                    android:layout_marginEnd="12dp"
+                    android:background="@drawable/btn_accent_selector_v2"
+                    android:text="@string/about_view_other_projects"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/btn_projects"
-                style="@style/Widget.Material3.Button.TonalButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="36dp"
-                android:text="@string/about_view_other_projects"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/app_ver" />
+                <LinearLayout
+                    android:id="@+id/constraintLayout"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="12dp"
+                    android:layout_marginEnd="12dp"
+                    android:weightSum="2"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/btn_projects">
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/btn_feedback"
-                style="@style/Widget.Material3.Button.TonalButton"
-                android:layout_width="wrap_content"
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btn_terms"
+                        style="@style/Widget.Material3.Button.TonalButton"
+                        android:layout_width="0dp"
+                        android:layout_height="56dp"
+                        android:layout_marginEnd="6dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/btn_accent_selector_v2"
+                        android:text="@string/about_terms"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btn_privacy"
+                        style="@style/Widget.Material3.Button.TonalButton"
+                        android:layout_width="0dp"
+                        android:layout_height="56dp"
+                        android:layout_marginStart="6dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/btn_accent_selector_v2"
+                        android:text="@string/about_privacy"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toEndOf="@+id/btn_terms"
+                        app:layout_constraintTop_toTopOf="parent" />
+                </LinearLayout>
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btn_feedback"
+                    style="@style/Widget.Material3.Button.TonalButton"
+                    android:layout_width="0dp"
+                    android:layout_height="56dp"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="12dp"
+                    android:layout_marginEnd="12dp"
+                    android:layout_marginBottom="12dp"
+                    android:background="@drawable/btn_accent_selector_v2"
+                    android:text="@string/about_send_feedback"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/constraintLayout" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <LinearLayout
+                android:id="@+id/linearLayout"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="36dp"
                 android:layout_marginTop="16dp"
-                android:text="@string/about_send_feedback"
+                android:layout_marginEnd="36dp"
+                android:layout_marginBottom="24dp"
+                android:background="@drawable/btn_accent_24"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:padding="12dp"
+                android:weightSum="2"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/constraintLayout" />
+                app:layout_constraintTop_toBottomOf="@+id/constraintLayout6">
+
+                <LinearLayout
+                    android:id="@+id/btn_github"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginEnd="6dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/btn_accent_tonal_selector_v5"
+                    android:gravity="center"
+                    android:orientation="vertical"
+                    android:padding="8dp">
+
+                    <LinearLayout
+                        android:layout_width="71dp"
+                        android:layout_height="70dp"
+                        android:background="@drawable/ic_github"
+                        android:orientation="vertical"></LinearLayout>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/btn_donate"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="6dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/btn_accent_tonal_selector_v5"
+                    android:gravity="center"
+                    android:orientation="vertical"
+                    android:padding="8dp">
+
+                    <LinearLayout
+                        android:layout_width="120dp"
+                        android:layout_height="70dp"
+                        android:background="@drawable/paypal_button"
+                        android:orientation="horizontal" />
+                </LinearLayout>
+
+            </LinearLayout>
 
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/constraintLayout"
-                android:layout_width="wrap_content"
+                android:id="@+id/constraintLayout6"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="36dp"
                 android:layout_marginTop="16dp"
+                android:layout_marginEnd="36dp"
+                android:background="@drawable/btn_accent_24"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/btn_projects">
+                app:layout_constraintTop_toBottomOf="@+id/constraintLayout3">
 
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btn_terms"
-                    style="@style/Widget.Material3.Button.TonalButton"
-                    android:layout_width="wrap_content"
+                <TextView
+                    android:id="@+id/textView8"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:text="@string/about_terms"
-                    app:layout_constraintBottom_toBottomOf="parent"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="12dp"
+                    android:layout_marginEnd="12dp"
+                    android:background="@drawable/btn_accent_tonal_selector_v5"
+                    android:paddingStart="16dp"
+                    android:paddingTop="14dp"
+                    android:paddingEnd="16dp"
+                    android:paddingBottom="14dp"
+                    android:text="@string/about_developer"
+                    android:textSize="16sp"
+                    app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/btn_privacy"
-                    style="@style/Widget.Material3.Button.TonalButton"
-                    android:layout_width="wrap_content"
+                <TextView
+                    android:id="@+id/app_ver"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:text="@string/about_privacy"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="12dp"
+                    android:layout_marginEnd="12dp"
+                    android:layout_marginBottom="12dp"
+                    android:background="@drawable/btn_accent_tonal_selector_v5"
+                    android:paddingStart="16dp"
+                    android:paddingTop="14dp"
+                    android:paddingEnd="16dp"
+                    android:paddingBottom="14dp"
+                    android:text="@string/about_version"
+                    android:textSize="16sp"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toEndOf="@+id/btn_terms"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/textView8" />
             </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <LinearLayout
-                android:id="@+id/btn_donate"
-                android:layout_width="120dp"
-                android:layout_height="70dp"
-                android:layout_marginTop="24dp"
-                android:layout_marginBottom="24dp"
-                android:background="@drawable/paypal_button"
-                android:orientation="horizontal"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/btn_feedback"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_activation.xml b/app/src/main/res/layout/activity_activation.xml
index 513e07a..b819804 100644
--- a/app/src/main/res/layout/activity_activation.xml
+++ b/app/src/main/res/layout/activity_activation.xml
@@ -56,9 +56,10 @@
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_next"
                 style="@style/Widget.Material3.Button"
-                android:layout_width="150dp"
-                android:layout_height="wrap_content"
+                android:layout_width="200dp"
+                android:layout_height="64dp"
                 android:layout_marginTop="32dp"
+                android:background="@drawable/btn_accent_selector_v2"
                 android:text="@string/activation_begin"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_chat.xml b/app/src/main/res/layout/activity_chat.xml
index 9841878..5a0cbf4 100644
--- a/app/src/main/res/layout/activity_chat.xml
+++ b/app/src/main/res/layout/activity_chat.xml
@@ -25,10 +25,10 @@
                 android:layout_height="48dp"
                 android:layout_marginTop="16dp"
                 android:layout_marginEnd="16dp"
-                android:layout_marginBottom="8dp"
-                android:background="@drawable/btn_accent_tonal_v2"
-                android:src="@drawable/ic_send"
+                android:layout_marginBottom="16dp"
+                android:background="@drawable/btn_accent_tonal_v5"
                 android:contentDescription="@string/btn_send"
+                android:src="@drawable/ic_send"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -40,12 +40,12 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="16dp"
                 android:layout_marginEnd="76dp"
-                android:layout_marginBottom="8dp"
+                android:layout_marginBottom="16dp"
                 android:autofillHints="message"
                 android:background="@drawable/btn_accent_tonal_selector_v5"
                 android:ems="10"
                 android:hint="@string/hint_message"
-                android:inputType="text|textMultiLine"
+                android:inputType="text|textMultiLine|textCapSentences"
                 android:isScrollContainer="true"
                 android:maxHeight="120dp"
                 android:paddingLeft="12dp"
@@ -66,8 +66,8 @@
                 android:layout_height="48dp"
                 android:layout_marginTop="16dp"
                 android:layout_marginEnd="16dp"
-                android:layout_marginBottom="8dp"
-                android:background="@drawable/btn_accent_tonal_v2"
+                android:layout_marginBottom="16dp"
+                android:background="@drawable/btn_accent_tonal_v5"
                 android:elevation="0.02dip"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -79,8 +79,8 @@
                 android:layout_height="48dp"
                 android:layout_marginTop="16dp"
                 android:layout_marginEnd="16dp"
-                android:layout_marginBottom="8dp"
-                android:background="@drawable/btn_accent_tonal_v2"
+                android:layout_marginBottom="16dp"
+                android:background="@drawable/btn_accent_tonal_v5"
                 android:clickable="true"
                 android:contentDescription="@string/btn_speak"
                 android:elevation="0.01dip"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index e90c181..8a517f8 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -1990,10 +1990,13 @@
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_clear_chat"
             style="@style/Widget.Material3.Button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="15dp"
+            android:layout_width="0dp"
+            android:layout_height="64dp"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="25dp"
+            android:layout_marginBottom="24dp"
+            android:background="@drawable/btn_accent_tonal_selector"
             android:text="@string/setting_clear_chat"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/activity_terms.xml b/app/src/main/res/layout/activity_terms.xml
index e87e306..8e917a0 100644
--- a/app/src/main/res/layout/activity_terms.xml
+++ b/app/src/main/res/layout/activity_terms.xml
@@ -57,10 +57,11 @@
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_next"
                 style="@style/Widget.Material3.Button"
-                android:layout_width="150dp"
-                android:layout_height="wrap_content"
+                android:layout_width="200dp"
+                android:layout_height="64dp"
                 android:layout_marginTop="16dp"
                 android:layout_marginBottom="16dp"
+                android:background="@drawable/btn_accent_selector_v2"
                 android:text="@string/btn_next"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/activity_view_prompt.xml b/app/src/main/res/layout/activity_view_prompt.xml
index ed54c78..300261c 100644
--- a/app/src/main/res/layout/activity_view_prompt.xml
+++ b/app/src/main/res/layout/activity_view_prompt.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -85,51 +86,34 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent">
 
-                        <com.google.android.material.textfield.TextInputLayout
-                            android:id="@+id/prompt_text_frame"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="24dp"
-                            android:layout_marginTop="16dp"
-                            android:layout_marginEnd="24dp"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/textView19">
-
-                            <com.google.android.material.textfield.TextInputEditText
-                                android:id="@+id/prompt_text"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="Prompt" />
-                        </com.google.android.material.textfield.TextInputLayout>
-
-
-                        <TextView
-                            android:id="@+id/prompt_by"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="22dp"
-                            android:layout_marginEnd="24dp"
-                            android:text="by Unknown"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/prompt_text_frame" />
 
-                        <androidx.constraintlayout.widget.ConstraintLayout
+                        <LinearLayout
                             android:id="@+id/constraintLayout5"
-                            android:layout_width="wrap_content"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
+                            android:layout_marginStart="16dp"
                             android:layout_marginTop="16dp"
+                            android:layout_marginEnd="16dp"
                             android:layout_marginBottom="16dp"
+                            android:background="@drawable/btn_accent_24"
+                            android:paddingStart="6dp"
+                            android:paddingTop="12dp"
+                            android:paddingEnd="6dp"
+                            android:paddingBottom="12dp"
+                            android:weightSum="3"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/text_cat">
+                            app:layout_constraintTop_toBottomOf="@+id/constraintLayout4">
 
                             <com.google.android.material.button.MaterialButton
                                 android:id="@+id/btn_try"
-                                style="@style/Widget.Material3.Button.TonalButton"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
+                                style="@style/Widget.Material3.Button"
+                                android:layout_width="0dp"
+                                android:layout_height="56dp"
+                                android:layout_marginHorizontal="6dp"
+                                android:layout_weight="1"
+                                android:background="@drawable/btn_accent_tonal"
                                 android:text="@string/btn_try_it"
                                 app:icon="@drawable/ic_play"
                                 app:iconGravity="textStart"
@@ -140,9 +124,11 @@
                             <com.google.android.material.button.MaterialButton
                                 android:id="@+id/btn_copy"
                                 style="@style/Widget.Material3.Button.TonalButton"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="16dp"
+                                android:layout_width="0dp"
+                                android:layout_height="56dp"
+                                android:layout_marginHorizontal="6dp"
+                                android:layout_weight="1"
+                                android:background="@drawable/btn_accent_tonal"
                                 android:text="@string/btn_copy"
                                 app:icon="@drawable/ic_copy"
                                 app:iconGravity="textStart"
@@ -153,9 +139,11 @@
                             <com.google.android.material.button.MaterialButton
                                 android:id="@+id/btn_like"
                                 style="@style/Widget.Material3.Button.TonalButton"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginStart="16dp"
+                                android:layout_width="0dp"
+                                android:layout_height="56dp"
+                                android:layout_marginHorizontal="6dp"
+                                android:layout_weight="1"
+                                android:background="@drawable/btn_accent_tonal"
                                 android:text="0"
                                 app:icon="@drawable/ic_like_outline"
                                 app:iconGravity="textStart"
@@ -163,37 +151,95 @@
                                 app:layout_constraintEnd_toEndOf="parent"
                                 app:layout_constraintStart_toEndOf="@+id/btn_copy"
                                 app:layout_constraintTop_toTopOf="parent" />
-                        </androidx.constraintlayout.widget.ConstraintLayout>
+                        </LinearLayout>
 
-                        <TextView
-                            android:id="@+id/textView19"
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:id="@+id/constraintLayout4"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="24dp"
+                            android:layout_marginStart="16dp"
                             android:layout_marginTop="16dp"
-                            android:layout_marginEnd="24dp"
-                            android:background="@drawable/btn_tip1"
-                            android:padding="16dp"
-                            android:text="@string/prompt_tip"
-                            android:textColor="@color/tip1"
+                            android:layout_marginEnd="16dp"
+                            android:background="@drawable/btn_accent_24"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
+                            app:layout_constraintTop_toTopOf="parent">
 
-                        <TextView
-                            android:id="@+id/text_cat"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="24dp"
-                            android:layout_marginTop="16dp"
-                            android:background="@drawable/btn_accent_tonal"
-                            android:paddingStart="12dp"
-                            android:paddingTop="6dp"
-                            android:paddingEnd="12dp"
-                            android:paddingBottom="6dp"
-                            android:text="@string/cat"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/prompt_text_frame" />
+                            <TextView
+                                android:id="@+id/prompt_by"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="12dp"
+                                android:layout_marginEnd="12dp"
+                                android:layout_marginBottom="12dp"
+                                android:background="@drawable/btn_accent_tonal_selector_v5"
+                                android:paddingStart="12dp"
+                                android:paddingTop="8dp"
+                                android:paddingEnd="12dp"
+                                android:paddingBottom="8dp"
+                                android:text="by Unknown"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintTop_toBottomOf="@+id/prompt_text_frame" />
+
+                            <TextView
+                                android:id="@+id/text_cat"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="12dp"
+                                android:layout_marginTop="12dp"
+                                android:layout_marginBottom="12dp"
+                                android:background="@drawable/btn_accent_tonal_selector_v5"
+                                android:paddingStart="12dp"
+                                android:paddingTop="8dp"
+                                android:paddingEnd="12dp"
+                                android:paddingBottom="8dp"
+                                android:text="@string/cat"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toBottomOf="@+id/prompt_text_frame" />
+
+                            <TextView
+                                android:id="@+id/textView19"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="12dp"
+                                android:layout_marginTop="12dp"
+                                android:layout_marginEnd="12dp"
+                                android:background="@drawable/btn_tip1"
+                                android:padding="12dp"
+                                android:text="@string/prompt_tip"
+                                android:textColor="@color/tip1"
+                                android:textSize="14sp"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toTopOf="parent" />
+
+                            <com.google.android.material.textfield.TextInputLayout
+                                android:id="@+id/prompt_text_frame"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="12dp"
+                                android:layout_marginTop="8dp"
+                                android:layout_marginEnd="12dp"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toBottomOf="@+id/textView19">
+
+                                <com.google.android.material.textfield.TextInputEditText
+                                    android:id="@+id/prompt_text"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:background="@drawable/btn_accent_tonal_selector_v5"
+                                    android:hint="Prompt (tap to edit)"
+                                    android:paddingStart="12dp"
+                                    android:paddingTop="12dp"
+                                    android:paddingEnd="12dp"
+                                    android:paddingBottom="12dp"
+                                    android:textColor="@color/accent_900"
+                                    android:textSize="14sp" />
+                            </com.google.android.material.textfield.TextInputLayout>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
                 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml
index dad03e0..e41cd7a 100644
--- a/app/src/main/res/layout/activity_welcome.xml
+++ b/app/src/main/res/layout/activity_welcome.xml
@@ -59,10 +59,11 @@
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btn_next"
                 style="@style/Widget.Material3.Button"
-                android:layout_width="150dp"
-                android:layout_height="wrap_content"
+                android:layout_width="200dp"
+                android:layout_height="64dp"
                 android:layout_marginTop="48dp"
                 android:layout_marginBottom="24dp"
+                android:background="@drawable/btn_accent_selector_v2"
                 android:text="@string/btn_get_started"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_add_chat.xml b/app/src/main/res/layout/fragment_add_chat.xml
index 7b73e51..b943d1e 100644
--- a/app/src/main/res/layout/fragment_add_chat.xml
+++ b/app/src/main/res/layout/fragment_add_chat.xml
@@ -48,7 +48,7 @@
                 android:id="@+id/field_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:inputType="text"
+                android:inputType="text|textCapSentences"
                 android:backgroundTint="@color/button"
                 android:textColor="@color/accent_900"
                 android:textColorHighlight="@color/accent_100"
diff --git a/app/src/main/res/layout/fragment_advanced_settings.xml b/app/src/main/res/layout/fragment_advanced_settings.xml
index 00f7ba9..4ac47ec 100644
--- a/app/src/main/res/layout/fragment_advanced_settings.xml
+++ b/app/src/main/res/layout/fragment_advanced_settings.xml
@@ -65,7 +65,7 @@
                     android:textSize="16sp" />
 
                 <RadioButton
-                    android:id="@+id/gpt_35_turbo_0613"
+                    android:id="@+id/gpt_35_turbo_1106"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="24dp"
@@ -74,7 +74,7 @@
                     android:minHeight="56dp"
                     android:paddingStart="16dp"
                     android:paddingEnd="16dp"
-                    android:text="GPT 3.5 (Enhanced)"
+                    android:text="GPT 3.5 (Long context)"
                     android:textSize="16sp" />
 
                 <RadioButton
@@ -151,7 +151,8 @@
                     android:paddingStart="16dp"
                     android:paddingEnd="16dp"
                     android:text="GPT 4 (Enchanced)"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    android:visibility="gone" />
 
                 <RadioButton
                     android:id="@+id/gpt_4_32k_0314"
@@ -176,7 +177,8 @@
                     android:paddingStart="16dp"
                     android:paddingEnd="16dp"
                     android:text="Text davinci v3"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    android:visibility="gone" />
 
                 <RadioButton
                     android:id="@+id/text_davinci_002"
@@ -189,7 +191,8 @@
                     android:paddingStart="16dp"
                     android:paddingEnd="16dp"
                     android:text="Text davinci v2"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    android:visibility="gone" />
 
                 <RadioButton
                     android:id="@+id/text_curie_001"
@@ -202,7 +205,8 @@
                     android:paddingStart="16dp"
                     android:paddingEnd="16dp"
                     android:text="Text curie"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    android:visibility="gone" />
 
                 <RadioButton
                     android:id="@+id/text_babbage_001"
@@ -215,7 +219,8 @@
                     android:paddingStart="16dp"
                     android:paddingEnd="16dp"
                     android:text="Text babbage"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    android:visibility="gone" />
 
                 <RadioButton
                     android:id="@+id/text_ada_001"
@@ -228,7 +233,8 @@
                     android:paddingStart="16dp"
                     android:paddingEnd="16dp"
                     android:text="Text ada"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    android:visibility="gone" />
 
                 <RadioButton
                     android:id="@+id/davinci"
diff --git a/app/src/main/res/layout/fragment_assistant.xml b/app/src/main/res/layout/fragment_assistant.xml
index 9e761ce..1e99ad0 100644
--- a/app/src/main/res/layout/fragment_assistant.xml
+++ b/app/src/main/res/layout/fragment_assistant.xml
@@ -141,10 +141,11 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
                     android:layout_marginEnd="8dp"
+                    android:autofillHints="message"
                     android:background="@color/transparent"
                     android:ems="10"
                     android:gravity="top|start"
-                    android:inputType="text|textMultiLine"
+                    android:inputType="text|textMultiLine|textCapSentences"
                     android:maxHeight="150dp"
                     android:minHeight="48dp"
                     android:paddingTop="16dp"
diff --git a/app/src/main/res/layout/fragment_post_prompt.xml b/app/src/main/res/layout/fragment_post_prompt.xml
index 16d71a3..f6dcb76 100644
--- a/app/src/main/res/layout/fragment_post_prompt.xml
+++ b/app/src/main/res/layout/fragment_post_prompt.xml
@@ -48,7 +48,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:backgroundTint="@color/button"
-                android:inputType="text"
+                android:inputType="text|textCapSentences"
                 android:textColor="@color/accent_900"
                 android:textColorHighlight="@color/accent_100"
                 android:textColorHint="@color/accent_500"
@@ -79,7 +79,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:backgroundTint="@color/button"
-                android:inputType="text"
+                android:inputType="text|textCapSentences"
                 android:textColor="@color/accent_900"
                 android:textColorHighlight="@color/accent_100"
                 android:textColorHint="@color/accent_500"
@@ -184,10 +184,13 @@
 
         <TextView
             android:id="@+id/textView13"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="0dp"
+            android:layout_height="56dp"
             android:layout_marginTop="16dp"
+            android:background="@color/accent_250"
+            android:gravity="center"
             android:text="@string/prompt_for"
+            android:textColor="@color/neutral_200"
             android:textSize="18sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -195,10 +198,13 @@
 
         <TextView
             android:id="@+id/textView16"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="0dp"
+            android:layout_height="56dp"
             android:layout_marginTop="16dp"
+            android:background="@color/accent_250"
+            android:gravity="center"
             android:text="@string/category"
+            android:textColor="@color/neutral_200"
             android:textSize="18sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -313,7 +319,10 @@
             android:layout_marginStart="24dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
+            android:background="@drawable/btn_tip2"
+            android:padding="16dp"
             android:text="@string/safety_warning"
+            android:textColor="@color/error"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/radioGroup3" />
diff --git a/app/src/main/res/layout/fragment_prompts.xml b/app/src/main/res/layout/fragment_prompts.xml
index bcaaaca..fcf84c3 100644
--- a/app/src/main/res/layout/fragment_prompts.xml
+++ b/app/src/main/res/layout/fragment_prompts.xml
@@ -151,7 +151,7 @@
                     android:id="@+id/cat_all"
                     android:layout_width="56dp"
                     android:layout_height="56dp"
-                    android:background="@drawable/cat_all"
+                    android:background="@drawable/cat_all_active"
                     android:clickable="true"
                     android:contentDescription="@string/cat_all"
                     android:orientation="vertical"
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 63606dd..a41b597 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -10,7 +10,7 @@
     <string name="about_send_feedback">Send feedback</string>
     <string name="about_terms">Terms</string>
     <string name="about_privacy">Privacy</string>
-    <string name="activation">Activation</string>
+    <string name="activation">API setup</string>
     <string name="activation_desc1">To use this software you need to provide your OpenAI API key. SpeakGPT uses paid OpenAI models.</string>
     <string name="activation_begin">Let\'s begin</string>
     <string name="activation_desc2">API usage is significantly cheaper than fixed subscription.</string>
@@ -116,7 +116,7 @@
     <string name="cat_sport">Sport</string>
     <string name="cat_uncat">Sport</string>
     <string name="cat">Category: %s</string>
-    <string name="safety_warning">Follow OpenAI\'s safety principles. Do not post any inappropriate or sensitive information. All prompts is being moderated. Inappropriate prompts will be removed without further notice.</string>
+    <string name="safety_warning">Follow OpenAI safety principles. Do not post any inappropriate or sensitive information. All prompts is being moderated. Inappropriate prompts will be removed without further notice.</string>
     <string name="btn_post_your_prompt">Post your prompt</string>
     <string name="title_prompts_store">Prompts store</string>
     <string name="hint_search">Search</string>
diff --git a/app/src/main/res/values-night-v31/colors.xml b/app/src/main/res/values-night-v31/colors.xml
index 5826367..457d925 100644
--- a/app/src/main/res/values-night-v31/colors.xml
+++ b/app/src/main/res/values-night-v31/colors.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <color name="accent_100">@android:color/system_neutral2_800</color>
+    <color name="accent_50">@android:color/system_neutral1_800</color>
+    <color name="accent_100">@android:color/system_accent2_800</color>
     <color name="accent_200">@android:color/system_neutral2_700</color>
     <color name="accent_250">@android:color/system_accent2_700</color>
     <color name="accent_500">@android:color/system_accent1_300</color>
diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml
index c0ab895..8212181 100644
--- a/app/src/main/res/values-night-v31/themes.xml
+++ b/app/src/main/res/values-night-v31/themes.xml
@@ -15,4 +15,4 @@
         <item name="android:windowSplashScreenAnimationDuration">1200</item>
         <item name="android:windowSplashScreenIconBackgroundColor">@color/accent_100</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index a927c0b..cf29442 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <color name="accent_50">#26262A</color>
     <color name="accent_100">#302f36</color>
     <color name="accent_200">#424250</color>
     <color name="accent_250">#424250</color>
@@ -61,6 +62,22 @@
     <color name="tint_cat_health">#25CCFFE5</color>
     <color name="tint_grey">#25d4d4d4</color>
 
+    <color name="tint_cat_development_active">#50ffddad</color>
+    <color name="tint_cat_music_active">#50ffadad</color>
+    <color name="tint_cat_art_active">#50b5c1ff</color>
+    <color name="tint_cat_culture_active">#50b9fac1</color>
+    <color name="tint_cat_business_active">#50e0c3fa</color>
+    <color name="tint_cat_gaming_active">#50daffcc</color>
+    <color name="tint_cat_education_active">#50caf9fc</color>
+    <color name="tint_cat_history_active">#50cafce2</color>
+    <color name="tint_cat_food_active">#50fccaf1</color>
+    <color name="tint_cat_tourism_active">#50FFD6E3</color>
+    <color name="tint_cat_productivity_active">#50faffcc</color>
+    <color name="tint_cat_tools_active">#50ccddff</color>
+    <color name="tint_cat_entertainment_active">#50ffe6cc</color>
+    <color name="tint_cat_sport_active">#50d5ffcc</color>
+    <color name="tint_cat_health_active">#50CCFFE5</color>
+
     <color name="tint_red">#40824444</color>
     <color name="gpt_icon_red">#CCB4B4</color>
 
@@ -72,4 +89,9 @@
 
     <color name="tint_blue">#405F71A7</color>
     <color name="gpt_icon_blue">#B4B6CC</color>
+
+    <color name="tint_purple">#40855FA7</color>
+    <color name="gpt_icon_purple">#C2B4CC</color>
+
+    <color name="border">#38FFFFFF</color>
 </resources>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 7195663..d69a26a 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -11,4 +11,4 @@
         <item name="android:navigationBarColor">@color/window_background</item>
         <item name="android:windowBackground">@color/window_background</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-v31/colors.xml b/app/src/main/res/values-v31/colors.xml
index 950c8c4..e44f422 100644
--- a/app/src/main/res/values-v31/colors.xml
+++ b/app/src/main/res/values-v31/colors.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <color name="accent_50">@android:color/system_neutral2_50</color>
     <color name="accent_100">@android:color/system_neutral2_100</color>
     <color name="accent_200">@android:color/system_neutral2_200</color>
     <color name="accent_250">@android:color/system_accent2_100</color>
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
index 30edf09..0636bcd 100644
--- a/app/src/main/res/values-v31/themes.xml
+++ b/app/src/main/res/values-v31/themes.xml
@@ -15,4 +15,4 @@
         <item name="android:windowSplashScreenAnimationDuration">1200</item>
         <item name="android:windowSplashScreenIconBackgroundColor">@color/accent_100</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 10073bd..f627ac6 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -16,6 +16,7 @@
     <color name="white">#ffffffff</color>
     <color name="warning">#ffff3d00</color>
 
+    <color name="accent_50">#F0EDF6</color>
     <color name="accent_100">#e3dfec</color>
     <color name="accent_200">#c7c4cf</color>
     <color name="accent_250">#e4d9ff</color>
@@ -79,6 +80,22 @@
     <color name="tint_cat_health">#25005329</color>
     <color name="tint_grey">#25494949</color>
 
+    <color name="tint_cat_development_active">#50974E00</color>
+    <color name="tint_cat_music_active">#50730000</color>
+    <color name="tint_cat_art_active">#50000E55</color>
+    <color name="tint_cat_culture_active">#5000530A</color>
+    <color name="tint_cat_business_active">#5038006A</color>
+    <color name="tint_cat_gaming_active">#501C6500</color>
+    <color name="tint_cat_education_active">#50005D63</color>
+    <color name="tint_cat_history_active">#5000602E</color>
+    <color name="tint_cat_food_active">#5060004B</color>
+    <color name="tint_cat_tourism_active">#50460016</color>
+    <color name="tint_cat_productivity_active">#50505900</color>
+    <color name="tint_cat_tools_active">#50001E5A</color>
+    <color name="tint_cat_entertainment_active">#50532A00</color>
+    <color name="tint_cat_sport_active">#500C4700</color>
+    <color name="tint_cat_health_active">#50005329</color>
+
     <color name="tint_red">#25730000</color>
     <color name="gpt_icon_red">#730000</color>
 
@@ -90,4 +107,9 @@
 
     <color name="tint_blue">#250B0073</color>
     <color name="gpt_icon_blue">#220073</color>
+
+    <color name="tint_purple">#25540073</color>
+    <color name="gpt_icon_purple">#5A0073</color>
+
+    <color name="border">#33000000</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 58a14eb..1452083 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,7 +10,7 @@
     <string name="about_send_feedback">Send feedback</string>
     <string name="about_terms">Terms</string>
     <string name="about_privacy">Privacy</string>
-    <string name="activation">Activation</string>
+    <string name="activation">API setup</string>
     <string name="activation_desc1">To use this software you need to provide your OpenAI API key. SpeakGPT uses paid OpenAI models.</string>
     <string name="activation_begin">Let\'s begin</string>
     <string name="activation_desc2">API usage is significantly cheaper than fixed subscription.</string>
@@ -97,7 +97,7 @@
     <string name="hint_prompt_title">Prompt title</string>
     <string name="hint_prompt_desc">Brief description</string>
     <string name="hint_prompt">Prompt</string>
-    <string name="prompt_for">Prompt for</string>
+    <string name="prompt_for">AI Model</string>
     <string name="category">Category</string>
     <string name="cat_development">Development</string>
     <string name="cat_music">Music</string>
@@ -116,7 +116,7 @@
     <string name="cat_sport">Sport</string>
     <string name="cat_uncat">Sport</string>
     <string name="cat">Category: %s</string>
-    <string name="safety_warning">Follow OpenAI\'s safety principles. Do not post any inappropriate or sensitive information. All prompts is being moderated. Inappropriate prompts will be removed without further notice.</string>
+    <string name="safety_warning">Follow OpenAI safety principles. Do not post any inappropriate or sensitive information. All prompts is being moderated. Inappropriate prompts will be removed without further notice.</string>
     <string name="btn_post_your_prompt">Post your prompt</string>
     <string name="title_prompts_store">Prompts store</string>
     <string name="hint_search">Search</string>
diff --git a/build.gradle b/build.gradle
index 2f7c244..cca2a3f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.0-alpha17'
+        classpath 'com.android.tools.build:gradle:8.4.0-alpha02'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,8 +15,8 @@ buildscript {
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.3.0-alpha17' apply false
-    id 'com.android.library' version '8.3.0-alpha17' apply false
+    id 'com.android.application' version '8.4.0-alpha02' apply false
+    id 'com.android.library' version '8.4.0-alpha02' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
     id 'org.jetbrains.kotlin.plugin.serialization' version '1.6.21'
 }