From 86ea78b850620c614ec35f8091ce11f5865d355a Mon Sep 17 00:00:00 2001
From: AndraxDev <dostapenko82@gmail.com>
Date: Wed, 13 Mar 2024 16:39:39 +0100
Subject: [PATCH] OLDE mode

---
 .idea/deploymentTargetSelector.xml            |   4 +-
 app/build.gradle                              |   8 +-
 .../assistant/preferences/Preferences.kt      |  18 ++
 .../assistant/ui/activities/AboutActivity.kt  |  56 ++++++
 .../assistant/ui/activities/ChatActivity.kt   | 159 ++++++++++++++++--
 .../ui/activities/DocumentationActivity.kt    |  32 ++++
 .../assistant/ui/activities/MainActivity.kt   |  42 ++++-
 .../ui/activities/PromptViewActivity.kt       |  93 +++++++++-
 .../ui/activities/ReportAbuseActivity.kt      |  61 ++++++-
 .../ui/activities/SettingsActivity.kt         |   7 +-
 .../ui/activities/SettingsV2Activity.kt       | 149 +++++++++++++---
 .../ui/adapters/AbstractChatAdapter.kt        |  25 ++-
 .../assistant/ui/adapters/AssistantAdapter.kt |  21 ++-
 .../assistant/ui/adapters/ChatAdapter.kt      |  22 ++-
 .../ui/fragments/AssistantFragment.kt         |  28 ++-
 .../assistant/ui/fragments/TileFragment.kt    |  40 ++++-
 .../ui/fragments/tabs/ChatsListFragment.kt    |  57 ++++++-
 .../ui/fragments/tabs/PromptsFragment.kt      |  45 ++++-
 .../main/res/drawable/assistant_amoled.xml    |  10 ++
 .../res/drawable/btn_accent_24_amoled.xml     |  10 ++
 app/src/main/res/drawable/btn_accent_50.xml   |   2 +-
 .../res/drawable/btn_accent_50_amoled.xml     |  10 ++
 .../drawable/btn_accent_icon_large_amoled.xml |  10 ++
 .../res/drawable/btn_accent_tonal_amoled.xml  |  10 ++
 .../drawable/btn_accent_tonal_selector_v6.xml |   2 +-
 .../btn_accent_tonal_selector_v6_amoled.xml   |  10 ++
 .../drawable/btn_accent_tonal_v4_amoled.xml   |  10 ++
 .../main/res/drawable/btn_accent_tonal_v5.xml |   2 +-
 .../drawable/btn_accent_tonal_v5_amoled.xml   |  10 ++
 app/src/main/res/drawable/bubble_in.xml       |   2 +-
 app/src/main/res/drawable/bubble_in_dark.xml  |  10 ++
 app/src/main/res/drawable/bubble_out.xml      |   2 +-
 app/src/main/res/drawable/bubble_out_dark.xml |  10 ++
 app/src/main/res/drawable/cat_all.xml         |   2 +-
 app/src/main/res/drawable/cat_all_active.xml  |   2 +-
 app/src/main/res/layout/activity_about.xml    |  12 +-
 app/src/main/res/layout/activity_chat.xml     |   1 +
 .../main/res/layout/activity_imageview.xml    |   6 +-
 app/src/main/res/layout/activity_main.xml     |   1 +
 .../res/layout/activity_report_prompt.xml     |   4 +-
 .../main/res/layout/activity_settings_new.xml |  31 ++++
 .../main/res/layout/activity_view_prompt.xml  |   6 +-
 .../main/res/layout/fragment_assistant.xml    |  26 +--
 .../main/res/layout/fragment_chats_list.xml   |  23 ++-
 app/src/main/res/layout/fragment_prompts.xml  |  18 +-
 app/src/main/res/layout/fragment_tips.xml     |   2 +-
 .../res/layout/view_assistant_bot_message.xml |  27 ++-
 .../layout/view_assistant_user_message.xml    |  47 +++---
 app/src/main/res/values-night-v31/colors.xml  |   4 +-
 app/src/main/res/values-night-v31/themes.xml  |   2 +-
 app/src/main/res/values-night/colors.xml      |  14 +-
 app/src/main/res/values-v31/colors.xml        |   2 +
 app/src/main/res/values-v31/themes.xml        |   2 +-
 app/src/main/res/values/colors-amoled.xml     |  12 ++
 app/src/main/res/values/colors.xml            |  18 +-
 55 files changed, 1060 insertions(+), 179 deletions(-)
 create mode 100644 app/src/main/res/drawable/assistant_amoled.xml
 create mode 100644 app/src/main/res/drawable/btn_accent_24_amoled.xml
 create mode 100644 app/src/main/res/drawable/btn_accent_50_amoled.xml
 create mode 100644 app/src/main/res/drawable/btn_accent_icon_large_amoled.xml
 create mode 100644 app/src/main/res/drawable/btn_accent_tonal_amoled.xml
 create mode 100644 app/src/main/res/drawable/btn_accent_tonal_selector_v6_amoled.xml
 create mode 100644 app/src/main/res/drawable/btn_accent_tonal_v4_amoled.xml
 create mode 100644 app/src/main/res/drawable/btn_accent_tonal_v5_amoled.xml
 create mode 100644 app/src/main/res/drawable/bubble_in_dark.xml
 create mode 100644 app/src/main/res/drawable/bubble_out_dark.xml
 create mode 100644 app/src/main/res/values/colors-amoled.xml

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index ac57769..12ddc54 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-03-10T22:28:49.498327500Z">
+        <DropdownSelection timestamp="2024-03-12T22:57:22.195615800Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="Default" identifier="serial=192.168.121.103:4774;connection=ab20189f" />
+              <DeviceId pluginId="Default" identifier="serial=localhost:58526;connection=ba65c85c" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/build.gradle b/app/build.gradle
index d9943f1..9ec7a1a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,8 @@ android {
         applicationId "org.teslasoft.assistant"
         minSdk 26
         targetSdk 34
-        versionCode 304
-        versionName "3.4"
+        versionCode 305
+        versionName "3.5"
         externalNativeBuild {
             cmake {
                 cppFlags ''
@@ -34,8 +34,8 @@ android {
 
         debug {
             debuggable true
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled false
+            shrinkResources false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             multiDexEnabled true
         }
diff --git a/app/src/main/java/org/teslasoft/assistant/preferences/Preferences.kt b/app/src/main/java/org/teslasoft/assistant/preferences/Preferences.kt
index 2c99f39..e069de4 100644
--- a/app/src/main/java/org/teslasoft/assistant/preferences/Preferences.kt
+++ b/app/src/main/java/org/teslasoft/assistant/preferences/Preferences.kt
@@ -243,6 +243,24 @@ class Preferences private constructor(private var preferences: SharedPreferences
         putBoolean("function_calling", mode)
     }
 
+    /**
+     * Set amoled pitch black mode
+     *
+     * @param mode amoled pitch black mode
+     * */
+    fun setAmoledPitchBlack(mode: Boolean) {
+        putGlobalBoolean("amoled_pitch_black", mode)
+    }
+
+    /**
+     * Get amoled pitch black mode
+     *
+     * @return amoled pitch black mode
+     * */
+    fun getAmoledPitchBlack() : Boolean {
+        return getGlobalBoolean("amoled_pitch_black", false)
+    }
+
     /**
      * Retrieves the imagine command status from the shared preferences.
      *
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 0811762..3e7652d 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
@@ -19,6 +19,7 @@ package org.teslasoft.assistant.ui.activities
 import android.content.Intent
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
+import android.content.res.Configuration
 import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
@@ -27,12 +28,18 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import android.widget.Toast
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.res.ResourcesCompat
 
 import androidx.fragment.app.FragmentActivity
 
 import com.google.android.material.button.MaterialButton
+import com.google.android.material.elevation.SurfaceColors
 
 import org.teslasoft.assistant.R
+import org.teslasoft.assistant.preferences.Preferences
+import org.teslasoft.assistant.ui.fragments.tabs.ChatsListFragment
+import org.teslasoft.assistant.ui.fragments.tabs.PromptsFragment
 
 class AboutActivity : FragmentActivity() {
 
@@ -45,6 +52,10 @@ class AboutActivity : FragmentActivity() {
     private var btnDonate: LinearLayout? = null
     private var btnGithub: LinearLayout? = null
 
+    private var actions: ConstraintLayout? = null
+    private var system: ConstraintLayout? = null
+    private var links: LinearLayout? = null
+
     private var activateEasterEggCounter: Int = 0
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -61,8 +72,14 @@ class AboutActivity : FragmentActivity() {
         btnDonate = findViewById(R.id.btn_donate)
         btnGithub = findViewById(R.id.btn_github)
 
+        actions = findViewById(R.id.common_actions)
+        system = findViewById(R.id.system_info)
+        links = findViewById(R.id.links)
+
         appIcon?.setImageResource(R.drawable.assistant)
 
+        reloadAmoled()
+
         appVer?.setOnClickListener {
             if (activateEasterEggCounter == 0) {
                 Handler(Looper.getMainLooper()).postDelayed({
@@ -135,4 +152,43 @@ class AboutActivity : FragmentActivity() {
             startActivity(i)
         }
     }
+
+    override fun onResume() {
+        super.onResume()
+        reloadAmoled()
+    }
+
+    private fun reloadAmoled() {
+        if (isDarkThemeEnabled() &&  Preferences.getPreferences(this, "").getAmoledPitchBlack()) {
+            window.navigationBarColor = ResourcesCompat.getColor(resources, R.color.amoled_window_background, theme)
+            window.statusBarColor = ResourcesCompat.getColor(resources, R.color.amoled_window_background, theme)
+            window.setBackgroundDrawableResource(R.color.amoled_window_background)
+
+            appIcon?.setBackgroundResource(R.drawable.btn_accent_50_amoled)
+
+            actions?.setBackgroundResource(R.drawable.btn_accent_24_amoled)
+            system?.setBackgroundResource(R.drawable.btn_accent_24_amoled)
+            links?.setBackgroundResource(R.drawable.btn_accent_24_amoled)
+        } else {
+            window.navigationBarColor = ResourcesCompat.getColor(resources, R.color.window_background, theme)
+            window.statusBarColor = ResourcesCompat.getColor(resources, R.color.window_background, theme)
+            window.setBackgroundDrawableResource(R.color.window_background)
+
+            appIcon?.setBackgroundResource(R.drawable.btn_accent_50)
+
+            actions?.setBackgroundResource(R.drawable.btn_accent_24)
+            system?.setBackgroundResource(R.drawable.btn_accent_24)
+            links?.setBackgroundResource(R.drawable.btn_accent_24)
+        }
+    }
+
+    private fun isDarkThemeEnabled(): Boolean {
+        return when (resources.configuration.uiMode and
+                Configuration.UI_MODE_NIGHT_MASK) {
+            Configuration.UI_MODE_NIGHT_YES -> true
+            Configuration.UI_MODE_NIGHT_NO -> false
+            Configuration.UI_MODE_NIGHT_UNDEFINED -> false
+            else -> false
+        }
+    }
 }
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 317fe4e..6d2779a 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
@@ -23,6 +23,7 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
+import android.content.res.Configuration
 import android.content.res.Configuration.KEYBOARD_QWERTY
 import android.graphics.drawable.Drawable
 import android.media.MediaPlayer
@@ -53,6 +54,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.fragment.app.FragmentActivity
 import com.aallam.openai.api.audio.SpeechRequest
@@ -131,6 +133,7 @@ class ChatActivity : FragmentActivity() {
     private var fileContents: ByteArray? = null
     private var actionBar: ConstraintLayout? = null
     private var btnBack: ImageButton? = null
+    private var keyboardFrame: ConstraintLayout? = null
 
     // Init chat
     private var messages: ArrayList<HashMap<String, Any>> = arrayListOf()
@@ -226,6 +229,121 @@ class ChatActivity : FragmentActivity() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        reloadAmoled()
+    }
+
+    private fun reloadAmoled() {
+        if (isDarkThemeEnabled() && Preferences.getPreferences(this, chatId).getAmoledPitchBlack()) {
+            window.setBackgroundDrawableResource(R.color.amoled_window_background)
+            window.statusBarColor = ResourcesCompat.getColor(resources, R.color.amoled_accent_50, theme)
+            window.navigationBarColor = ResourcesCompat.getColor(resources, R.color.amoled_accent_100, theme)
+            keyboardFrame?.setBackgroundColor(ResourcesCompat.getColor(resources, R.color.amoled_accent_100, theme))
+            actionBar?.setBackgroundColor(ResourcesCompat.getColor(resources, R.color.amoled_accent_50, theme))
+            activityTitle?.setBackgroundColor(ResourcesCompat.getColor(resources, R.color.amoled_accent_50, theme))
+            btnBack?.background = getAmoledAccentDrawable(
+                AppCompatResources.getDrawable(
+                    this,
+                    R.drawable.btn_accent_tonal_v4_amoled
+                )!!, this
+            )
+
+            btnExport?.background = getAmoledAccentDrawable(
+                AppCompatResources.getDrawable(
+                    this,
+                    R.drawable.btn_accent_tonal_v4_amoled
+                )!!, this
+            )
+
+            btnSettings?.background = getAmoledAccentDrawable(
+                AppCompatResources.getDrawable(
+                    this,
+                    R.drawable.btn_accent_tonal_v4_amoled
+                )!!, this
+            )
+
+            messageInput?.background = getAmoledAccentDrawableV2(
+                AppCompatResources.getDrawable(
+                    this,
+                    R.drawable.btn_accent_tonal_selector_v6_amoled
+                )!!, this
+            )
+
+            btnMicro?.background = getAmoledAccentDrawableV2(
+                AppCompatResources.getDrawable(
+                    this,
+                    R.drawable.btn_accent_tonal_v5_amoled
+                )!!, this
+            )
+
+            btnSend?.background = getAmoledAccentDrawableV2(
+                AppCompatResources.getDrawable(
+                    this,
+                    R.drawable.btn_accent_tonal_v5_amoled
+                )!!, this
+            )
+        } else {
+            window.setBackgroundDrawableResource(R.color.window_background)
+            window.statusBarColor = SurfaceColors.SURFACE_4.getColor(this)
+            window.navigationBarColor = SurfaceColors.SURFACE_5.getColor(this)
+            keyboardFrame?.setBackgroundColor(SurfaceColors.SURFACE_5.getColor(this))
+            actionBar?.setBackgroundColor(SurfaceColors.SURFACE_4.getColor(this))
+            activityTitle?.setBackgroundColor(SurfaceColors.SURFACE_4.getColor(this))
+            btnBack?.background = getDarkAccentDrawable(
+                AppCompatResources.getDrawable(
+                    this,
+                    R.drawable.btn_accent_tonal_v4
+                )!!, this
+            )
+
+            btnExport?.background = getDarkAccentDrawable(
+                AppCompatResources.getDrawable(
+                    this,
+                    R.drawable.btn_accent_tonal_v4
+                )!!, this
+            )
+
+            btnSettings?.background = getDarkAccentDrawable(
+                AppCompatResources.getDrawable(
+                    this,
+                    R.drawable.btn_accent_tonal_v4
+                )!!, this
+            )
+
+            messageInput?.background = getDarkAccentDrawable(
+                AppCompatResources.getDrawable(
+                    this,
+                    R.drawable.btn_accent_tonal_selector_v6
+                )!!, this
+            )
+
+            btnMicro?.background = getDarkAccentDrawable(
+                AppCompatResources.getDrawable(
+                    this,
+                    R.drawable.btn_accent_tonal_v5
+                )!!, this
+            )
+
+            btnSend?.background = getDarkAccentDrawable(
+                AppCompatResources.getDrawable(
+                    this,
+                    R.drawable.btn_accent_tonal_v5
+                )!!, this
+            )
+        }
+    }
+
+    private fun isDarkThemeEnabled(): Boolean {
+        return when (resources.configuration.uiMode and
+                Configuration.UI_MODE_NIGHT_MASK) {
+            Configuration.UI_MODE_NIGHT_YES -> true
+            Configuration.UI_MODE_NIGHT_NO -> false
+            Configuration.UI_MODE_NIGHT_UNDEFINED -> false
+            else -> false
+        }
+    }
+
     // Init TTS
     private var tts: TextToSpeech? = null
     private val ttsListener: TextToSpeech.OnInitListener =
@@ -285,18 +403,16 @@ class ChatActivity : FragmentActivity() {
         setContentView(R.layout.activity_chat)
         languageIdentifier = LanguageIdentification.getClient()
 
+        reloadAmoled()
 
         val policy = StrictMode.ThreadPolicy.Builder().permitAll().build()
         StrictMode.setThreadPolicy(policy)
 
-        window.statusBarColor = SurfaceColors.SURFACE_4.getColor(this)
-        window.navigationBarColor = SurfaceColors.SURFACE_4.getColor(this)
-
         val chatActivityTitle: TextView = findViewById(R.id.chat_activity_title)
         val keyboardInput: LinearLayout = findViewById(R.id.keyboard_input)
 
         chatActivityTitle.setBackgroundColor(SurfaceColors.SURFACE_4.getColor(this))
-        keyboardInput.setBackgroundColor(SurfaceColors.SURFACE_4.getColor(this))
+        keyboardInput.setBackgroundColor(SurfaceColors.SURFACE_5.getColor(this))
 
         initChatId()
 
@@ -379,6 +495,7 @@ class ChatActivity : FragmentActivity() {
         btnExport = findViewById(R.id.btn_export)
         actionBar = findViewById(R.id.action_bar)
         btnBack = findViewById(R.id.btn_back)
+        keyboardFrame = findViewById(R.id.keyboard_frame)
 
         btnExport?.setImageResource(R.drawable.ic_upload)
         btnBack?.setImageResource(R.drawable.ic_back)
@@ -413,13 +530,6 @@ class ChatActivity : FragmentActivity() {
             )!!, this
         )
 
-        actionBar?.background = getDarkAccentDrawable(
-            AppCompatResources.getDrawable(
-                this,
-                R.color.accent_100
-            )!!, this
-        )
-
         btnBack?.setOnClickListener {
             finish()
         }
@@ -443,10 +553,28 @@ class ChatActivity : FragmentActivity() {
         return drawable
     }
 
+    private fun getAmoledAccentDrawable(drawable: Drawable, context: Context) : Drawable {
+        DrawableCompat.setTint(DrawableCompat.wrap(drawable), getAmoledSurfaceColor(context))
+        return drawable
+    }
+
+    private fun getAmoledAccentDrawableV2(drawable: Drawable, context: Context) : Drawable {
+        DrawableCompat.setTint(DrawableCompat.wrap(drawable), getAmoledSurfaceColorV2(context))
+        return drawable
+    }
+
     private fun getSurfaceColor(context: Context) : Int {
         return SurfaceColors.SURFACE_4.getColor(context)
     }
 
+    private fun getAmoledSurfaceColor(context: Context) : Int {
+        return ResourcesCompat.getColor(context.resources, R.color.amoled_accent_50, null)
+    }
+
+    private fun getAmoledSurfaceColorV2(context: Context) : Int {
+        return ResourcesCompat.getColor(context.resources, R.color.amoled_accent_300, null)
+    }
+
     private fun initLogic() {
         btnMicro?.setOnClickListener {
             if (Preferences.getPreferences(this, chatId).getAudioModel() == "google") {
@@ -517,10 +645,11 @@ class ChatActivity : FragmentActivity() {
         }
 
         btnSettings?.setOnClickListener {
-            val i = Intent(
-                    this,
-                    SettingsActivity::class.java
-            ).setAction(Intent.ACTION_VIEW)
+            val i = if (Preferences.getPreferences(this, chatId).getExperimentalUI()) {
+                Intent(this, SettingsV2Activity::class.java).setAction(Intent.ACTION_VIEW)
+            } else {
+                Intent(this, SettingsActivity::class.java).setAction(Intent.ACTION_VIEW)
+            }
 
             i.putExtra("chatId", chatId)
 
diff --git a/app/src/main/java/org/teslasoft/assistant/ui/activities/DocumentationActivity.kt b/app/src/main/java/org/teslasoft/assistant/ui/activities/DocumentationActivity.kt
index 8f22870..736bec4 100644
--- a/app/src/main/java/org/teslasoft/assistant/ui/activities/DocumentationActivity.kt
+++ b/app/src/main/java/org/teslasoft/assistant/ui/activities/DocumentationActivity.kt
@@ -1,12 +1,44 @@
 package org.teslasoft.assistant.ui.activities
 
+import android.content.res.Configuration
 import android.os.Bundle
+import androidx.core.content.res.ResourcesCompat
 import androidx.fragment.app.FragmentActivity
 import org.teslasoft.assistant.R
+import org.teslasoft.assistant.preferences.Preferences
 
 class DocumentationActivity : FragmentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_documentation)
+
+        reloadAmoled()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        reloadAmoled()
+    }
+
+    private fun reloadAmoled() {
+        if (isDarkThemeEnabled() &&  Preferences.getPreferences(this, "").getAmoledPitchBlack()) {
+            window.navigationBarColor = ResourcesCompat.getColor(resources, R.color.amoled_window_background, theme)
+            window.statusBarColor = ResourcesCompat.getColor(resources, R.color.amoled_window_background, theme)
+            window.setBackgroundDrawableResource(R.color.amoled_window_background)
+        } else {
+            window.navigationBarColor = ResourcesCompat.getColor(resources, R.color.window_background, theme)
+            window.statusBarColor = ResourcesCompat.getColor(resources, R.color.window_background, theme)
+            window.setBackgroundDrawableResource(R.color.window_background)
+        }
+    }
+
+    private fun isDarkThemeEnabled(): Boolean {
+        return when (resources.configuration.uiMode and
+                Configuration.UI_MODE_NIGHT_MASK) {
+            Configuration.UI_MODE_NIGHT_YES -> true
+            Configuration.UI_MODE_NIGHT_NO -> false
+            Configuration.UI_MODE_NIGHT_UNDEFINED -> false
+            else -> false
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/teslasoft/assistant/ui/activities/MainActivity.kt b/app/src/main/java/org/teslasoft/assistant/ui/activities/MainActivity.kt
index 1178909..1a82894 100644
--- a/app/src/main/java/org/teslasoft/assistant/ui/activities/MainActivity.kt
+++ b/app/src/main/java/org/teslasoft/assistant/ui/activities/MainActivity.kt
@@ -18,6 +18,7 @@ package org.teslasoft.assistant.ui.activities
 
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
+import android.content.res.Configuration
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
@@ -25,6 +26,7 @@ import android.view.MenuItem
 import android.view.View
 
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.res.ResourcesCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentManager
@@ -34,6 +36,9 @@ import com.google.android.material.elevation.SurfaceColors
 import com.google.android.material.navigation.NavigationBarView
 
 import org.teslasoft.assistant.R
+import org.teslasoft.assistant.preferences.Preferences
+import org.teslasoft.assistant.ui.fragments.tabs.ChatsListFragment
+import org.teslasoft.assistant.ui.fragments.tabs.PromptsFragment
 
 class MainActivity : FragmentActivity() {
     private var navigationBar: BottomNavigationView? = null
@@ -53,8 +58,6 @@ class MainActivity : FragmentActivity() {
 
         setContentView(R.layout.activity_main)
 
-        window.navigationBarColor = SurfaceColors.SURFACE_2.getColor(this)
-
         navigationBar = findViewById(R.id.navigation_bar)
 
         fragmentChats = findViewById(R.id.fragment_chats)
@@ -65,6 +68,8 @@ class MainActivity : FragmentActivity() {
         framePrompts = supportFragmentManager.findFragmentById(R.id.fragment_prompts_)
         frameTips = supportFragmentManager.findFragmentById(R.id.fragment_tips_)
 
+        reloadAmoled()
+
         navigationBar!!.setOnItemSelectedListener(NavigationBarView.OnItemSelectedListener { item: MenuItem ->
             if (!isAnimating) {
                 isAnimating = true
@@ -92,6 +97,39 @@ class MainActivity : FragmentActivity() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        reloadAmoled()
+    }
+
+    private fun reloadAmoled() {
+        if (isDarkThemeEnabled() &&  Preferences.getPreferences(this, "").getAmoledPitchBlack()) {
+            window.navigationBarColor = ResourcesCompat.getColor(resources, R.color.amoled_window_background, theme)
+            window.statusBarColor = ResourcesCompat.getColor(resources, R.color.amoled_window_background, theme)
+            window.setBackgroundDrawableResource(R.color.amoled_window_background)
+            navigationBar!!.setBackgroundColor(ResourcesCompat.getColor(resources, R.color.amoled_accent_50, theme))
+        } else {
+            window.navigationBarColor = SurfaceColors.SURFACE_2.getColor(this)
+            window.statusBarColor = ResourcesCompat.getColor(resources, R.color.window_background, theme)
+            window.setBackgroundDrawableResource(R.color.window_background)
+            navigationBar!!.setBackgroundColor(ResourcesCompat.getColor(resources, R.color.accent_50, theme))
+        }
+
+        (frameChats as ChatsListFragment).reloadAmoled()
+        (framePrompts as PromptsFragment).reloadAmoled()
+    }
+
+    private fun isDarkThemeEnabled(): Boolean {
+        return when (resources.configuration.uiMode and
+                Configuration.UI_MODE_NIGHT_MASK) {
+            Configuration.UI_MODE_NIGHT_YES -> true
+            Configuration.UI_MODE_NIGHT_NO -> false
+            Configuration.UI_MODE_NIGHT_UNDEFINED -> false
+            else -> false
+        }
+    }
+
+
     override fun onSaveInstanceState(savedInstanceState: Bundle) {
         super.onSaveInstanceState(savedInstanceState)
         savedInstanceState.putInt("tab", selectedTab)
diff --git a/app/src/main/java/org/teslasoft/assistant/ui/activities/PromptViewActivity.kt b/app/src/main/java/org/teslasoft/assistant/ui/activities/PromptViewActivity.kt
index afe3b26..60664a6 100644
--- a/app/src/main/java/org/teslasoft/assistant/ui/activities/PromptViewActivity.kt
+++ b/app/src/main/java/org/teslasoft/assistant/ui/activities/PromptViewActivity.kt
@@ -21,11 +21,13 @@ import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
+import android.content.res.Configuration
 import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.view.View
 import android.widget.EditText
 import android.widget.ImageButton
+import android.widget.LinearLayout
 import android.widget.ProgressBar
 import android.widget.TextView
 import android.widget.Toast
@@ -33,6 +35,7 @@ import androidx.appcompat.content.res.AppCompatResources
 
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.fragment.app.FragmentActivity
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -45,6 +48,7 @@ import com.google.gson.reflect.TypeToken
 
 import org.teslasoft.assistant.Api
 import org.teslasoft.assistant.R
+import org.teslasoft.assistant.preferences.Preferences
 import org.teslasoft.assistant.ui.assistant.AssistantActivity
 import org.teslasoft.core.api.network.RequestNetwork
 
@@ -78,6 +82,10 @@ class PromptViewActivity : FragmentActivity(), SwipeRefreshLayout.OnRefreshListe
 
     private var btnFlag: ImageButton? = null
 
+    private var promptBg: ConstraintLayout? = null
+
+    private var promptActions: LinearLayout? = null
+
     private var id = ""
 
     private var title = ""
@@ -178,6 +186,73 @@ class PromptViewActivity : FragmentActivity(), SwipeRefreshLayout.OnRefreshListe
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        reloadAmoled()
+    }
+
+    private fun reloadAmoled() {
+        if (isDarkThemeEnabled() &&  Preferences.getPreferences(this, "").getAmoledPitchBlack()) {
+            window.navigationBarColor = ResourcesCompat.getColor(resources, R.color.amoled_window_background, theme)
+            window.statusBarColor = ResourcesCompat.getColor(resources, R.color.amoled_accent_50, theme)
+            window.setBackgroundDrawableResource(R.color.amoled_window_background)
+
+            activityTitle?.setBackgroundColor(ResourcesCompat.getColor(resources, R.color.amoled_accent_50, theme))
+
+            promptBg?.setBackgroundResource(R.drawable.btn_accent_24_amoled)
+
+            promptActions?.setBackgroundResource(R.drawable.btn_accent_24_amoled)
+
+            btnBack?.background = getDarkAccentDrawable(
+                AppCompatResources.getDrawable(
+                    this,
+                    R.drawable.btn_accent_tonal_v4_amoled
+                )!!, this
+            )
+
+            btnFlag?.background = getDarkAccentDrawable(
+                AppCompatResources.getDrawable(
+                    this,
+                    R.drawable.btn_accent_tonal_v4_amoled
+                )!!, this
+            )
+        } else {
+            window.navigationBarColor = ResourcesCompat.getColor(resources, R.color.window_background, theme)
+            window.statusBarColor = SurfaceColors.SURFACE_4.getColor(this)
+            window.setBackgroundDrawableResource(R.color.window_background)
+
+            activityTitle?.setBackgroundColor(SurfaceColors.SURFACE_4.getColor(this))
+
+            promptBg?.setBackgroundResource(R.drawable.btn_accent_24)
+
+            promptActions?.setBackgroundResource(R.drawable.btn_accent_24)
+
+            btnBack?.background = getDarkAccentDrawable(
+                AppCompatResources.getDrawable(
+                    this,
+                    R.drawable.btn_accent_tonal_v4
+                )!!, this
+            )
+
+            btnFlag?.background = getDarkAccentDrawable(
+                AppCompatResources.getDrawable(
+                    this,
+                    R.drawable.btn_accent_tonal_v4
+                )!!, this
+            )
+        }
+    }
+
+    private fun isDarkThemeEnabled(): Boolean {
+        return when (resources.configuration.uiMode and
+                Configuration.UI_MODE_NIGHT_MASK) {
+            Configuration.UI_MODE_NIGHT_YES -> true
+            Configuration.UI_MODE_NIGHT_NO -> false
+            Configuration.UI_MODE_NIGHT_UNDEFINED -> false
+            else -> false
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -212,14 +287,12 @@ class PromptViewActivity : FragmentActivity(), SwipeRefreshLayout.OnRefreshListe
                 textCat = findViewById(R.id.text_cat)
                 btnBack = findViewById(R.id.btn_back)
 
-                activityTitle?.isSelected = true
+                promptBg = findViewById(R.id.prompt_bg)
+                promptActions = findViewById(R.id.prompt_actions)
 
-                activityTitle?.background = getDarkAccentDrawable(
-                    AppCompatResources.getDrawable(
-                        this,
-                        R.color.accent_100
-                    )!!, this
-                )
+                reloadAmoled()
+
+                activityTitle?.isSelected = true
 
                 btnFlag?.background = getDarkAccentDrawable(
                     AppCompatResources.getDrawable(
@@ -319,7 +392,11 @@ class PromptViewActivity : FragmentActivity(), SwipeRefreshLayout.OnRefreshListe
     }
 
     private fun getSurfaceColor(context: Context) : Int {
-        return SurfaceColors.SURFACE_4.getColor(context)
+        return if (isDarkThemeEnabled() &&  Preferences.getPreferences(context, "").getAmoledPitchBlack()) {
+            ResourcesCompat.getColor(context.resources, R.color.amoled_accent_50, context.theme)
+        } else {
+            SurfaceColors.SURFACE_4.getColor(context)
+        }
     }
 
     override fun onRefresh() {
diff --git a/app/src/main/java/org/teslasoft/assistant/ui/activities/ReportAbuseActivity.kt b/app/src/main/java/org/teslasoft/assistant/ui/activities/ReportAbuseActivity.kt
index dbf5c9d..57f42fb 100644
--- a/app/src/main/java/org/teslasoft/assistant/ui/activities/ReportAbuseActivity.kt
+++ b/app/src/main/java/org/teslasoft/assistant/ui/activities/ReportAbuseActivity.kt
@@ -17,6 +17,7 @@
 package org.teslasoft.assistant.ui.activities
 
 import android.content.Context
+import android.content.res.Configuration
 import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.view.View
@@ -25,8 +26,10 @@ import android.widget.ImageButton
 import android.widget.ProgressBar
 import android.widget.RadioButton
 import android.widget.ScrollView
+import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.content.res.AppCompatResources
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.drawable.DrawableCompat
 
 import androidx.fragment.app.FragmentActivity
@@ -35,6 +38,7 @@ import com.google.android.material.button.MaterialButton
 import com.google.android.material.elevation.SurfaceColors
 import org.teslasoft.assistant.Api
 import org.teslasoft.assistant.R
+import org.teslasoft.assistant.preferences.Preferences
 import org.teslasoft.core.api.network.RequestNetwork
 
 class ReportAbuseActivity : FragmentActivity() {
@@ -54,6 +58,7 @@ class ReportAbuseActivity : FragmentActivity() {
     private var btnPolitical: RadioButton? = null
     private var btnDuplicated: RadioButton? = null
     private var btnCatIncorrect: RadioButton? = null
+    private var reportActivityTitle: TextView? = null
 
     private var fieldDetails: EditText? = null
     private var btnSend: MaterialButton? = null
@@ -98,8 +103,6 @@ class ReportAbuseActivity : FragmentActivity() {
     private fun initUI() {
         setContentView(R.layout.activity_report_prompt)
 
-        window.statusBarColor = SurfaceColors.SURFACE_4.getColor(this)
-
         reportForm = findViewById(R.id.report_form)
         loadingBar = findViewById(R.id.loading_bar)
         btnIllegal = findViewById(R.id.btn_illegal)
@@ -114,6 +117,7 @@ class ReportAbuseActivity : FragmentActivity() {
         btnSend = findViewById(R.id.btn_send_report)
         btnCatIncorrect = findViewById(R.id.btn_cat_incorrect)
         btnBack = findViewById(R.id.btn_back)
+        reportActivityTitle = findViewById(R.id.activity_report_title)
 
         btnBack?.background = getDarkAccentDrawable(
             AppCompatResources.getDrawable(
@@ -127,6 +131,8 @@ class ReportAbuseActivity : FragmentActivity() {
 
         requestNetwork = RequestNetwork(this)
 
+        reloadAmoled()
+
         initLogic()
     }
 
@@ -136,7 +142,11 @@ class ReportAbuseActivity : FragmentActivity() {
     }
 
     private fun getSurfaceColor(context: Context) : Int {
-        return SurfaceColors.SURFACE_4.getColor(context)
+        return if (isDarkThemeEnabled() && Preferences.getPreferences(context, "").getAmoledPitchBlack()) {
+            ResourcesCompat.getColor(context.resources, R.color.amoled_accent_50, context.theme)
+        } else {
+            SurfaceColors.SURFACE_4.getColor(context)
+        }
     }
 
     private fun initLogic() {
@@ -214,4 +224,49 @@ class ReportAbuseActivity : FragmentActivity() {
 
         requestNetwork?.startRequestNetwork("GET", "https://gpt.teslasoft.org/api/v1/report.php?api_key=${Api.TESLASOFT_API_KEY}&id=$id&reason=$reason&details=${fieldDetails?.text.toString()}", "A", reportListener)
     }
+
+    override fun onResume() {
+        super.onResume()
+        reloadAmoled()
+    }
+
+    private fun reloadAmoled() {
+        if (isDarkThemeEnabled() &&  Preferences.getPreferences(this, "").getAmoledPitchBlack()) {
+            window.navigationBarColor = ResourcesCompat.getColor(resources, R.color.amoled_window_background, theme)
+            window.statusBarColor = ResourcesCompat.getColor(resources, R.color.amoled_accent_50, theme)
+            window.setBackgroundDrawableResource(R.color.amoled_window_background)
+
+            reportActivityTitle?.setBackgroundColor(ResourcesCompat.getColor(resources, R.color.amoled_accent_50, theme))
+
+            btnBack?.background = getDarkAccentDrawable(
+                AppCompatResources.getDrawable(
+                    this,
+                    R.drawable.btn_accent_tonal_v4
+                )!!, this
+            )
+        } else {
+            window.navigationBarColor = ResourcesCompat.getColor(resources, R.color.window_background, theme)
+            window.statusBarColor = SurfaceColors.SURFACE_4.getColor(this)
+            window.setBackgroundDrawableResource(R.color.window_background)
+
+            reportActivityTitle?.setBackgroundColor(SurfaceColors.SURFACE_4.getColor(this))
+
+            btnBack?.background = getDarkAccentDrawable(
+                AppCompatResources.getDrawable(
+                    this,
+                    R.drawable.btn_accent_tonal_v4
+                )!!, this
+            )
+        }
+    }
+
+    private fun isDarkThemeEnabled(): Boolean {
+        return when (resources.configuration.uiMode and
+                Configuration.UI_MODE_NIGHT_MASK) {
+            Configuration.UI_MODE_NIGHT_YES -> true
+            Configuration.UI_MODE_NIGHT_NO -> false
+            Configuration.UI_MODE_NIGHT_UNDEFINED -> false
+            else -> false
+        }
+    }
 }
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 06e078d..fa9fa53 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
@@ -29,6 +29,7 @@ import android.widget.TextView
 import android.widget.Toast
 
 import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.fragment.app.FragmentActivity
 
@@ -545,15 +546,15 @@ class SettingsActivity : FragmentActivity() {
     }
 
     private fun getSurfaceColor(context: Context) : Int {
-        return SurfaceColors.SURFACE_2.getColor(context)
+        return SurfaceColors.SURFACE_5.getColor(context)
     }
 
     private fun getSurfaceColorV2() : Int {
-        return SurfaceColors.SURFACE_2.getColor(this)
+        return SurfaceColors.SURFACE_5.getColor(this)
     }
 
     private fun getSurfaceColorV3(context: Context) : Int {
-        return SurfaceColors.SURFACE_5.getColor(context)
+        return ResourcesCompat.getColor(context.resources, R.color.accent_250, context.theme)
     }
 
     private fun switchUIToClassic() {
diff --git a/app/src/main/java/org/teslasoft/assistant/ui/activities/SettingsV2Activity.kt b/app/src/main/java/org/teslasoft/assistant/ui/activities/SettingsV2Activity.kt
index f2c2d9e..7af1967 100644
--- a/app/src/main/java/org/teslasoft/assistant/ui/activities/SettingsV2Activity.kt
+++ b/app/src/main/java/org/teslasoft/assistant/ui/activities/SettingsV2Activity.kt
@@ -19,6 +19,7 @@ package org.teslasoft.assistant.ui.activities
 import android.app.role.RoleManager
 import android.content.Context
 import android.content.Intent
+import android.content.res.Configuration
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Build
@@ -27,6 +28,7 @@ import android.provider.Settings
 import android.widget.ImageButton
 import android.widget.TextView
 import android.widget.Toast
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.fragment.app.FragmentActivity
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -83,6 +85,7 @@ class SettingsV2Activity : FragmentActivity() {
     private var tileAboutApp: TileFragment? = null
     private var tileClearChat: TileFragment? = null
     private var tileDocumentation: TileFragment? = null
+    private var tileAmoledMode: TileFragment? = null
 
     private var btnBack: ImageButton? = null
 
@@ -199,8 +202,6 @@ class SettingsV2Activity : FragmentActivity() {
 
         btnBack = findViewById(R.id.btn_back)
 
-        btnBack?.background = getDisabledDrawable(btnBack?.background!!)
-
         val activitySettingsTitle: TextView? = findViewById(R.id.activity_new_settings_title)
 
         val extras: Bundle? = intent.extras
@@ -219,8 +220,12 @@ class SettingsV2Activity : FragmentActivity() {
             activitySettingsTitle?.text = getString(R.string.global_settings_title)
         }
 
+        // Toast.makeText(this, chatId, Toast.LENGTH_SHORT).show()
+
         preferences = Preferences.getPreferences(this, chatId)
 
+        // Toast.makeText(this, preferences?.getLayout(), Toast.LENGTH_SHORT).show()
+
         model = preferences?.getModel() ?: "gpt-3.5-turbo"
         activationPrompt = preferences?.getPrompt() ?: ""
         systemMessage = preferences?.getSystemMessage() ?: ""
@@ -229,6 +234,8 @@ class SettingsV2Activity : FragmentActivity() {
         voice = if (preferences?.getTtsEngine() == "google") preferences?.getVoice() ?: "" else preferences?.getOpenAIVoice() ?: ""
         host = preferences?.getCustomHost() ?: ""
 
+        reloadAmoled()
+
         tileAccountFragment = TileFragment.newInstance(
             false,
             false,
@@ -237,7 +244,8 @@ class SettingsV2Activity : FragmentActivity() {
             "Manage OpenAI account",
             null,
             R.drawable.ic_user,
-            false
+            false,
+            chatId
         )
 
         tileAssistant = TileFragment.newInstance(
@@ -248,7 +256,8 @@ class SettingsV2Activity : FragmentActivity() {
             "On",
             "Off",
             R.drawable.ic_assistant,
-            false
+            false,
+            chatId
         )
 
         tileApiKey = TileFragment.newInstance(
@@ -259,7 +268,8 @@ class SettingsV2Activity : FragmentActivity() {
             "****************",
             null,
             R.drawable.ic_key,
-            false
+            false,
+            chatId
         )
 
         tileCustomHost = TileFragment.newInstance(
@@ -270,7 +280,8 @@ class SettingsV2Activity : FragmentActivity() {
             host,
             null,
             R.drawable.ic_user,
-            false
+            false,
+            chatId
         )
 
         tileVoice = TileFragment.newInstance(
@@ -281,7 +292,8 @@ class SettingsV2Activity : FragmentActivity() {
             voice,
             null,
             R.drawable.ic_voice,
-            false
+            false,
+            chatId
         )
 
         tileVoiceLanguage = TileFragment.newInstance(
@@ -292,7 +304,8 @@ class SettingsV2Activity : FragmentActivity() {
             Locale.forLanguageTag(preferences?.getLanguage()!!).displayLanguage,
             null,
             R.drawable.ic_language,
-            false
+            false,
+            chatId
         )
 
         tileImageModel = TileFragment.newInstance(
@@ -303,7 +316,8 @@ class SettingsV2Activity : FragmentActivity() {
             "On",
             "DALL-e 2 is used",
             R.drawable.ic_image,
-            false
+            false,
+            chatId
         )
 
         tileImageResolution = TileFragment.newInstance(
@@ -314,7 +328,8 @@ class SettingsV2Activity : FragmentActivity() {
             preferences?.getResolution()!!,
             null,
             R.drawable.ic_image,
-            false
+            false,
+            chatId
         )
 
         tileTTS = TileFragment.newInstance(
@@ -325,7 +340,8 @@ class SettingsV2Activity : FragmentActivity() {
             "On",
             "Google TTS is used",
             R.drawable.ic_tts,
-            false
+            false,
+            chatId
         )
 
         tileSTT = TileFragment.newInstance(
@@ -336,7 +352,8 @@ class SettingsV2Activity : FragmentActivity() {
             "On",
             "Google STT is used",
             R.drawable.ic_microphone,
-            false
+            false,
+            chatId
         )
 
         tileSilentMode = TileFragment.newInstance(
@@ -347,7 +364,8 @@ class SettingsV2Activity : FragmentActivity() {
             "On",
             "Off",
             R.drawable.ic_mute,
-            preferences?.getNotSilence() == true
+            preferences?.getNotSilence() == true,
+            chatId
         )
 
         tileAlwaysSpeak = TileFragment.newInstance(
@@ -358,7 +376,8 @@ class SettingsV2Activity : FragmentActivity() {
             "On",
             "Off",
             R.drawable.ic_volume_up,
-            preferences?.getSilence() == true
+            preferences?.getSilence() == true,
+            chatId
         )
 
         tileTextModel = TileFragment.newInstance(
@@ -369,7 +388,8 @@ class SettingsV2Activity : FragmentActivity() {
             model,
             null,
             R.drawable.chatgpt_icon,
-            false
+            false,
+            chatId
         )
 
         tileActivationMessage = TileFragment.newInstance(
@@ -380,7 +400,8 @@ class SettingsV2Activity : FragmentActivity() {
             "Tap to set",
             null,
             R.drawable.ic_play,
-            false
+            false,
+            chatId
         )
 
         tileSystemMessage = TileFragment.newInstance(
@@ -391,7 +412,8 @@ class SettingsV2Activity : FragmentActivity() {
             "Tap to set",
             null,
             R.drawable.ic_play,
-            false
+            false,
+            chatId
         )
 
         tileLangDetect = TileFragment.newInstance(
@@ -402,7 +424,8 @@ class SettingsV2Activity : FragmentActivity() {
             "On",
             "Off",
             R.drawable.ic_language,
-            false
+            false,
+            chatId
         )
 
         tileChatLayout = TileFragment.newInstance(
@@ -413,7 +436,8 @@ class SettingsV2Activity : FragmentActivity() {
             "On",
             "Off",
             R.drawable.ic_chat,
-            false
+            false,
+            chatId
         )
 
         tileFunctionCalling = TileFragment.newInstance(
@@ -424,7 +448,8 @@ class SettingsV2Activity : FragmentActivity() {
             "On",
             "Off",
             R.drawable.ic_experiment,
-            false
+            false,
+            chatId
         )
 
         tileSlashCommands = TileFragment.newInstance(
@@ -435,7 +460,8 @@ class SettingsV2Activity : FragmentActivity() {
             "On",
             "Off",
             R.drawable.ic_experiment,
-            false
+            false,
+            chatId
         )
 
         tileDesktopMode = TileFragment.newInstance(
@@ -446,7 +472,8 @@ class SettingsV2Activity : FragmentActivity() {
             "On",
             "Off",
             R.drawable.ic_desktop,
-            false
+            false,
+            chatId
         )
 
         tileNewLook = TileFragment.newInstance(
@@ -457,7 +484,8 @@ class SettingsV2Activity : FragmentActivity() {
             "On",
             "Off",
             R.drawable.ic_experiment,
-            false
+            false,
+            chatId
         )
 
         tileAboutApp = TileFragment.newInstance(
@@ -468,7 +496,8 @@ class SettingsV2Activity : FragmentActivity() {
             "About SpeakGPT",
             null,
             R.drawable.ic_info,
-            false
+            false,
+            chatId
         )
 
         tileClearChat = TileFragment.newInstance(
@@ -479,7 +508,8 @@ class SettingsV2Activity : FragmentActivity() {
             "Clear chat history",
             null,
             R.drawable.ic_close,
-            chatId == ""
+            chatId == "",
+            chatId
         )
 
         tileDocumentation = TileFragment.newInstance(
@@ -490,7 +520,20 @@ class SettingsV2Activity : FragmentActivity() {
             "Open documentation",
             null,
             R.drawable.ic_book,
-            false
+            false,
+            chatId
+        )
+
+        tileAmoledMode = TileFragment.newInstance(
+            preferences?.getAmoledPitchBlack() == true && isDarkThemeEnabled(),
+            true,
+            "AMOLED mode",
+            null,
+            "On",
+            "Off",
+            R.drawable.ic_experiment,
+            !isDarkThemeEnabled(),
+            chatId
         )
 
         supportFragmentManager.beginTransaction().replace(R.id.tile_account, tileAccountFragment!!).commit()
@@ -522,6 +565,7 @@ class SettingsV2Activity : FragmentActivity() {
         supportFragmentManager.beginTransaction().replace(R.id.tile_slash_commands, tileSlashCommands!!).commit()
         supportFragmentManager.beginTransaction().replace(R.id.tile_desktop_mode, tileDesktopMode!!).commit()
         supportFragmentManager.beginTransaction().replace(R.id.tile_new_look, tileNewLook!!).commit()
+        supportFragmentManager.beginTransaction().replace(R.id.tile_amoled_mode, tileAmoledMode!!).commit()
 
         supportFragmentManager.beginTransaction().replace(R.id.tile_about_app, tileAboutApp!!).commit()
         supportFragmentManager.beginTransaction().replace(R.id.tile_clear_chat, tileClearChat!!).commit()
@@ -532,6 +576,9 @@ class SettingsV2Activity : FragmentActivity() {
     }
 
     private fun initializeLogic() {
+
+        // Toast.makeText(this, preferences?.getLayout(), Toast.LENGTH_SHORT).show()
+
         btnBack?.setOnClickListener {
             finish()
         }
@@ -657,7 +704,7 @@ class SettingsV2Activity : FragmentActivity() {
             if (ischecked) {
                 preferences?.setLayout("classic")
             } else {
-                preferences?.setLayout("modern")
+                preferences?.setLayout("bubbles")
             }
         }}
 
@@ -693,6 +740,16 @@ class SettingsV2Activity : FragmentActivity() {
             }
         }}
 
+        tileAmoledMode?.setOnCheckedChangeListener { ischecked -> run {
+            if (ischecked) {
+                preferences?.setAmoledPitchBlack(true)
+            } else {
+                preferences?.setAmoledPitchBlack(false)
+            }
+
+            recreate()
+        }}
+
         tileAboutApp?.setOnTileClickListener {
             startActivity(Intent(this, AboutActivity::class.java))
         }
@@ -716,6 +773,32 @@ class SettingsV2Activity : FragmentActivity() {
         }
     }
 
+    private fun isDarkThemeEnabled(): Boolean {
+        return when (resources.configuration.uiMode and
+                Configuration.UI_MODE_NIGHT_MASK) {
+            Configuration.UI_MODE_NIGHT_YES -> true
+            Configuration.UI_MODE_NIGHT_NO -> false
+            Configuration.UI_MODE_NIGHT_UNDEFINED -> false
+            else -> false
+        }
+    }
+
+    private fun reloadAmoled() {
+        if (isDarkThemeEnabled() && preferences?.getAmoledPitchBlack() == true) {
+            window.navigationBarColor = ResourcesCompat.getColor(resources, R.color.amoled_window_background, theme)
+            window.statusBarColor = ResourcesCompat.getColor(resources, R.color.amoled_window_background, theme)
+            window.setBackgroundDrawableResource(R.color.amoled_window_background)
+
+            btnBack?.setBackgroundResource(R.drawable.btn_accent_icon_large_amoled)
+        } else {
+            window.navigationBarColor = SurfaceColors.SURFACE_2.getColor(this)
+            window.statusBarColor = ResourcesCompat.getColor(resources, R.color.window_background, theme)
+            window.setBackgroundDrawableResource(R.color.window_background)
+
+            btnBack?.background = getDisabledDrawable(ResourcesCompat.getDrawable(resources, R.drawable.btn_accent_icon_large, theme)!!)
+        }
+    }
+
     private fun isDefaultAssistantApp(context: Context): Boolean {
         return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             val roleManager = context.getSystemService(Context.ROLE_SERVICE) as RoleManager
@@ -732,12 +815,22 @@ class SettingsV2Activity : FragmentActivity() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+
+        tileAssistant?.setChecked(isDefaultAssistantApp(this))
+    }
+
     private fun getDisabledDrawable(drawable: Drawable) : Drawable {
         DrawableCompat.setTint(DrawableCompat.wrap(drawable), getDisabledColor())
         return drawable
     }
 
     private fun getDisabledColor() : Int {
-        return SurfaceColors.SURFACE_2.getColor(this)
+        return if (isDarkThemeEnabled() && preferences?.getAmoledPitchBlack() == true) {
+            ResourcesCompat.getColor(resources, R.color.accent_50, theme)
+        } else {
+            SurfaceColors.SURFACE_5.getColor(this)
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/teslasoft/assistant/ui/adapters/AbstractChatAdapter.kt b/app/src/main/java/org/teslasoft/assistant/ui/adapters/AbstractChatAdapter.kt
index 4eeeadb..ec71f49 100644
--- a/app/src/main/java/org/teslasoft/assistant/ui/adapters/AbstractChatAdapter.kt
+++ b/app/src/main/java/org/teslasoft/assistant/ui/adapters/AbstractChatAdapter.kt
@@ -22,6 +22,7 @@ import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
+import android.content.res.Configuration
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.util.DisplayMetrics
@@ -34,6 +35,7 @@ import android.widget.TextView
 import android.widget.Toast
 
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.fragment.app.FragmentActivity
 
@@ -46,6 +48,7 @@ import com.google.android.material.elevation.SurfaceColors
 import io.noties.markwon.Markwon
 
 import org.teslasoft.assistant.R
+import org.teslasoft.assistant.preferences.Preferences
 import org.teslasoft.assistant.ui.activities.ImageBrowserActivity
 
 import java.io.File
@@ -163,10 +166,28 @@ abstract class AbstractChatAdapter(data: ArrayList<HashMap<String, Any>>?, conte
     }
 
     protected fun getSurfaceColor(context: Context): Int {
-        return SurfaceColors.SURFACE_2.getColor(context)
+        return if (isDarkThemeEnabled() && Preferences.getPreferences(context, "").getAmoledPitchBlack()) {
+            ResourcesCompat.getColor(context.resources, R.color.amoled_accent_50, null)
+        } else {
+            SurfaceColors.SURFACE_2.getColor(context)
+        }
     }
 
     private fun get3SurfaceColor(context: Context): Int {
-        return SurfaceColors.SURFACE_3.getColor(context)
+        return if (isDarkThemeEnabled() && Preferences.getPreferences(context, "").getAmoledPitchBlack()) {
+            ResourcesCompat.getColor(context.resources, R.color.amoled_accent_100, null)
+        } else {
+            SurfaceColors.SURFACE_3.getColor(context)
+        }
+    }
+
+    protected fun isDarkThemeEnabled(): Boolean {
+        return when (mContext.resources.configuration.uiMode and
+                Configuration.UI_MODE_NIGHT_MASK) {
+            Configuration.UI_MODE_NIGHT_YES -> true
+            Configuration.UI_MODE_NIGHT_NO -> false
+            Configuration.UI_MODE_NIGHT_UNDEFINED -> false
+            else -> false
+        }
     }
 }
diff --git a/app/src/main/java/org/teslasoft/assistant/ui/adapters/AssistantAdapter.kt b/app/src/main/java/org/teslasoft/assistant/ui/adapters/AssistantAdapter.kt
index cf7fd38..a495f30 100644
--- a/app/src/main/java/org/teslasoft/assistant/ui/adapters/AssistantAdapter.kt
+++ b/app/src/main/java/org/teslasoft/assistant/ui/adapters/AssistantAdapter.kt
@@ -23,10 +23,12 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.res.ResourcesCompat
 
 import androidx.fragment.app.FragmentActivity
 
 import org.teslasoft.assistant.R
+import org.teslasoft.assistant.preferences.Preferences
 
 class AssistantAdapter(data: ArrayList<HashMap<String, Any>>?, context: FragmentActivity) : AbstractChatAdapter(data, context) {
     @SuppressLint("InflateParams", "SetTextI18n")
@@ -39,18 +41,27 @@ class AssistantAdapter(data: ArrayList<HashMap<String, Any>>?, context: Fragment
             inflater.inflate(R.layout.view_assistant_user_message, null)
         }
 
-        if (dataArray?.get(position)?.get("isBot") == true) {
-            val bubbleBg: ConstraintLayout = mView!!.findViewById(R.id.bubble_bg)
-            bubbleBg.background = getSurface3Drawable(AppCompatResources.getDrawable(mContext, R.drawable.bubble_in)!!, mContext)
-        }
+        val bubbleBg: ConstraintLayout = mView!!.findViewById(R.id.bubble_bg)
 
-        icon = mView!!.findViewById(R.id.icon)
+        icon = mView.findViewById(R.id.icon)
         message = mView.findViewById(R.id.message)
         dalleImage = mView.findViewById(R.id.dalle_image)
         btnCopy = mView.findViewById(R.id.btn_copy)
 
         message?.setTextIsSelectable(true)
 
+        if (dataArray?.get(position)?.get("isBot") == true) {
+            if (isDarkThemeEnabled() && Preferences.getPreferences(mContext, "").getAmoledPitchBlack()) {
+                bubbleBg.setBackgroundResource(R.drawable.bubble_out_dark)
+                message?.setTextColor(ResourcesCompat.getColor(mContext.resources, R.color.white, null))
+            }
+        } else {
+            if (isDarkThemeEnabled() && Preferences.getPreferences(mContext, "").getAmoledPitchBlack()) {
+                bubbleBg.setBackgroundResource(R.drawable.bubble_in_dark)
+                message?.setTextColor(ResourcesCompat.getColor(mContext.resources, R.color.white, null))
+            }
+        }
+
         btnCopy?.background = getSurface3Drawable(AppCompatResources.getDrawable(mContext, R.drawable.btn_accent_tonal)!!, mContext)
 
         super.getView(position, mView, parent)
diff --git a/app/src/main/java/org/teslasoft/assistant/ui/adapters/ChatAdapter.kt b/app/src/main/java/org/teslasoft/assistant/ui/adapters/ChatAdapter.kt
index cda65a2..facd0c6 100644
--- a/app/src/main/java/org/teslasoft/assistant/ui/adapters/ChatAdapter.kt
+++ b/app/src/main/java/org/teslasoft/assistant/ui/adapters/ChatAdapter.kt
@@ -22,8 +22,10 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import android.widget.Toast
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.res.ResourcesCompat
 
 import androidx.fragment.app.FragmentActivity
 
@@ -48,10 +50,12 @@ class ChatAdapter(data: ArrayList<HashMap<String, Any>>?, context: FragmentActiv
             inflater.inflate(R.layout.view_message, null)
         }
 
-        if (dataArray?.get(position)?.get("isBot") == true && layout == "bubbles") {
-            val bubbleBg: ConstraintLayout = mView!!.findViewById(R.id.bubble_bg)
-            bubbleBg.background = getSurface3Drawable(AppCompatResources.getDrawable(mContext, R.drawable.bubble_in)!!, mContext)
-        }
+//        if (dataArray?.get(position)?.get("isBot") == true && layout == "bubbles") {
+//            val bubbleBg: ConstraintLayout = mView!!.findViewById(R.id.bubble_bg)
+//            bubbleBg.background = getSurface3Drawable(AppCompatResources.getDrawable(mContext, R.drawable.bubble_in)!!, mContext)
+//        }
+
+        val bubbleBg: ConstraintLayout? = mView?.findViewById(R.id.bubble_bg)
 
         ui = mView!!.findViewById(R.id.ui)
         icon = mView.findViewById(R.id.icon)
@@ -68,8 +72,18 @@ class ChatAdapter(data: ArrayList<HashMap<String, Any>>?, context: FragmentActiv
         if (layout == "bubbles") {
             if (dataArray?.get(position)?.get("isBot") == true) {
                 icon?.setImageResource(R.drawable.assistant)
+
+                if (isDarkThemeEnabled() && Preferences.getPreferences(mContext, chatID).getAmoledPitchBlack()) {
+                    bubbleBg?.setBackgroundResource(R.drawable.bubble_out_dark)
+                    message?.setTextColor(ResourcesCompat.getColor(mContext.resources, R.color.white, null))
+                }
             } else {
                 icon?.setImageResource(R.drawable.ic_user)
+
+                if (isDarkThemeEnabled() && Preferences.getPreferences(mContext, chatID).getAmoledPitchBlack()) {
+                    bubbleBg?.setBackgroundResource(R.drawable.bubble_in_dark)
+                    message?.setTextColor(ResourcesCompat.getColor(mContext.resources, R.color.white, null))
+                }
             }
         } else {
             if (dataArray?.get(position)?.get("isBot") == true) {
diff --git a/app/src/main/java/org/teslasoft/assistant/ui/fragments/AssistantFragment.kt b/app/src/main/java/org/teslasoft/assistant/ui/fragments/AssistantFragment.kt
index 37a6e32..ed0bb59 100644
--- a/app/src/main/java/org/teslasoft/assistant/ui/fragments/AssistantFragment.kt
+++ b/app/src/main/java/org/teslasoft/assistant/ui/fragments/AssistantFragment.kt
@@ -22,6 +22,7 @@ import android.app.Activity
 import android.content.DialogInterface
 import android.content.Intent
 import android.content.pm.PackageManager
+import android.content.res.Configuration
 import android.media.MediaPlayer
 import android.media.MediaRecorder
 import android.net.Uri
@@ -45,6 +46,7 @@ import android.widget.Toast
 
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
 import androidx.fragment.app.FragmentActivity
 
 import com.aallam.openai.api.audio.SpeechRequest
@@ -124,6 +126,7 @@ class AssistantFragment : BottomSheetDialogFragment() {
     private var assistantActionsLayout: LinearLayout? = null
     private var assistantConversation: ListView? = null
     private var assistantLoading: ProgressBar? = null
+    private var ui: LinearLayout? = null
 
     // Init chat
     private var messages: ArrayList<HashMap<String, Any>> = arrayListOf()
@@ -152,6 +155,26 @@ class AssistantFragment : BottomSheetDialogFragment() {
     // Init DALL-e
     private var resolution = "512x152"
 
+    private fun isDarkThemeEnabled(): Boolean {
+        return when (resources.configuration.uiMode and
+                Configuration.UI_MODE_NIGHT_MASK) {
+            Configuration.UI_MODE_NIGHT_YES -> true
+            Configuration.UI_MODE_NIGHT_NO -> false
+            Configuration.UI_MODE_NIGHT_UNDEFINED -> false
+            else -> false
+        }
+    }
+
+    private fun reloadAmoled() {
+        if (isDarkThemeEnabled() &&  Preferences.getPreferences(requireActivity(), "").getAmoledPitchBlack()) {
+            dialog?.window?.navigationBarColor = ResourcesCompat.getColor(resources, R.color.amoled_window_background, requireActivity().theme)
+            ui?.setBackgroundResource(R.drawable.assistant_amoled)
+        } else {
+            dialog?.window?.navigationBarColor = SurfaceColors.SURFACE_1.getColor(requireActivity())
+            ui?.setBackgroundColor(ResourcesCompat.getColor(resources, android.R.color.transparent, requireActivity().theme))
+        }
+    }
+
     // Media player for OpenAI TTS
     private var mediaPlayer: MediaPlayer? = null
 
@@ -1298,8 +1321,6 @@ class AssistantFragment : BottomSheetDialogFragment() {
 
         languageIdentifier = LanguageIdentification.getClient()
 
-        dialog?.window?.navigationBarColor = SurfaceColors.SURFACE_1.getColor(requireActivity())
-
         btnAssistantVoice = view.findViewById(R.id.btn_assistant_voice)
         btnAssistantSettings = view.findViewById(R.id.btn_assistant_settings)
         btnAssistantShowKeyboard = view.findViewById(R.id.btn_assistant_show_keyboard)
@@ -1311,6 +1332,7 @@ class AssistantFragment : BottomSheetDialogFragment() {
         assistantActionsLayout = view.findViewById(R.id.assistant_actions)
         assistantConversation = view.findViewById(R.id.assistant_conversation)
         assistantLoading = view.findViewById(R.id.assistant_loading)
+        ui = view.findViewById(R.id.ui)
 
         btnAssistantVoice?.setImageResource(R.drawable.ic_microphone)
         btnAssistantSettings?.setImageResource(R.drawable.ic_settings)
@@ -1318,6 +1340,8 @@ class AssistantFragment : BottomSheetDialogFragment() {
         btnAssistantHideKeyboard?.setImageResource(R.drawable.ic_keyboard_hide)
         btnAssistantSend?.setImageResource(R.drawable.ic_send)
 
+        reloadAmoled()
+
         assistantConversation?.isNestedScrollingEnabled = true
         assistantMessage?.isNestedScrollingEnabled = true
 
diff --git a/app/src/main/java/org/teslasoft/assistant/ui/fragments/TileFragment.kt b/app/src/main/java/org/teslasoft/assistant/ui/fragments/TileFragment.kt
index e9eeea0..58aad89 100644
--- a/app/src/main/java/org/teslasoft/assistant/ui/fragments/TileFragment.kt
+++ b/app/src/main/java/org/teslasoft/assistant/ui/fragments/TileFragment.kt
@@ -17,6 +17,7 @@
 package org.teslasoft.assistant.ui.fragments
 
 import android.content.Context
+import android.content.res.Configuration
 import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -32,12 +33,13 @@ import androidx.core.graphics.drawable.DrawableCompat
 import androidx.fragment.app.Fragment
 import com.google.android.material.elevation.SurfaceColors
 import org.teslasoft.assistant.R
+import org.teslasoft.assistant.preferences.Preferences
 
 
 class TileFragment : Fragment() {
 
     companion object {
-        fun newInstance(checked: Boolean, checkable: Boolean, enabledText: String, disabledText: String?, enabledDesc: String, disabledDesc: String?, icon: Int, disabled: Boolean): TileFragment {
+        fun newInstance(checked: Boolean, checkable: Boolean, enabledText: String, disabledText: String?, enabledDesc: String, disabledDesc: String?, icon: Int, disabled: Boolean, chatId: String): TileFragment {
 
             val tileFragment = TileFragment()
 
@@ -50,6 +52,7 @@ class TileFragment : Fragment() {
             args.putString("disabledDesc", disabledDesc)
             args.putInt("icon", icon)
             args.putBoolean("disabled", disabled)
+            args.putString("chatId", chatId)
 
             tileFragment.arguments = args
 
@@ -72,6 +75,8 @@ class TileFragment : Fragment() {
 
     private var onAttachedToActivity: Boolean = false
 
+    private var preferences: Preferences? = null
+
     fun setOnTileClickListener(onTileClickListener: OnTileClickListener) {
         this.onTileClickListener = onTileClickListener
     }
@@ -121,6 +126,16 @@ class TileFragment : Fragment() {
         tileSubtitle?.text = subtitle
     }
 
+    private fun isDarkThemeEnabled(): Boolean {
+        return when (resources.configuration.uiMode and
+                Configuration.UI_MODE_NIGHT_MASK) {
+            Configuration.UI_MODE_NIGHT_YES -> true
+            Configuration.UI_MODE_NIGHT_NO -> false
+            Configuration.UI_MODE_NIGHT_UNDEFINED -> false
+            else -> false
+        }
+    }
+
     fun setChecked(isChecked: Boolean) {
         this.isChecked = isChecked
 
@@ -128,12 +143,16 @@ class TileFragment : Fragment() {
             tileIcon?.imageTintList = ContextCompat.getColorStateList(requireActivity(), R.color.window_background)
             tileTitle?.setTextColor(requireActivity().getColor(R.color.text_title_inv))
             tileSubtitle?.setTextColor(requireActivity().getColor(R.color.text_subtitle_inv))
-            tileBg?.background = ContextCompat.getDrawable(requireActivity(), R.drawable.tile_active)!!
+            tileBg?.background = getEnabledDrawable(ContextCompat.getDrawable(requireActivity(), R.drawable.tile_active)!!)
+            tileTitle?.text = requireArguments().getString("enabledText").toString()
+            tileSubtitle?.text = requireArguments().getString("enabledDesc").toString()
         } else {
             tileIcon?.imageTintList = ContextCompat.getColorStateList(requireActivity(), R.color.accent_900)
             tileTitle?.setTextColor(requireActivity().getColor(R.color.text_title))
             tileSubtitle?.setTextColor(requireActivity().getColor(R.color.text_subtitle))
-            tileBg?.background = ContextCompat.getDrawable(requireActivity(), R.drawable.tile_inactive)!!
+            tileBg?.background = getDisabledDrawable(ContextCompat.getDrawable(requireActivity(), R.drawable.tile_inactive)!!)
+            tileTitle?.text = requireArguments().getString("disabledText") ?: requireArguments().getString("enabledText").toString()
+            tileSubtitle?.text = requireArguments().getString("disabledDesc") ?: requireArguments().getString("enabledDesc").toString()
         }
     }
 
@@ -168,6 +187,9 @@ class TileFragment : Fragment() {
         val disabledDesc = args.getString("disabledDesc")
         val icon = args.getInt("icon")
         val disabled = args.getBoolean("disabled")
+        val chatId: String = args.getString("chatId").toString()
+
+        preferences = Preferences.getPreferences(requireActivity(), chatId)
 
         isChecked = checked
         isEnabled = !disabled
@@ -282,7 +304,11 @@ class TileFragment : Fragment() {
     }
 
     private fun getDisabledColor() : Int {
-        return SurfaceColors.SURFACE_2.getColor(requireActivity())
+        return if (isDarkThemeEnabled() && preferences?.getAmoledPitchBlack() == true){
+            requireActivity().getColor(R.color.amoled_accent_50)
+        } else {
+            SurfaceColors.SURFACE_5.getColor(requireActivity())
+        }
     }
 
     private fun getEnabledDrawable(drawable: Drawable) : Drawable {
@@ -291,7 +317,11 @@ class TileFragment : Fragment() {
     }
 
     private fun getEnabledColor() : Int {
-        return requireActivity().getColor(R.color.accent_900)
+        return if (isDarkThemeEnabled() && preferences?.getAmoledPitchBlack() == true){
+            requireActivity().getColor(R.color.accent_500)
+        } else {
+            requireActivity().getColor(R.color.accent_900)
+        }
     }
 
     private fun getDisDrawable(drawable: Drawable) : Drawable {
diff --git a/app/src/main/java/org/teslasoft/assistant/ui/fragments/tabs/ChatsListFragment.kt b/app/src/main/java/org/teslasoft/assistant/ui/fragments/tabs/ChatsListFragment.kt
index 1345f64..70921ce 100644
--- a/app/src/main/java/org/teslasoft/assistant/ui/fragments/tabs/ChatsListFragment.kt
+++ b/app/src/main/java/org/teslasoft/assistant/ui/fragments/tabs/ChatsListFragment.kt
@@ -19,6 +19,8 @@ package org.teslasoft.assistant.ui.fragments.tabs
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import android.content.res.Configuration
+import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Bundle
 import android.provider.DocumentsContract
@@ -34,10 +36,14 @@ import android.widget.ListView
 import android.widget.Toast
 
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.res.ResourcesCompat
+import androidx.core.graphics.drawable.DrawableCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.elevation.SurfaceColors
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 
@@ -49,6 +55,7 @@ import org.teslasoft.assistant.preferences.ChatPreferences
 import org.teslasoft.assistant.preferences.Preferences
 import org.teslasoft.assistant.ui.activities.ChatActivity
 import org.teslasoft.assistant.ui.activities.SettingsActivity
+import org.teslasoft.assistant.ui.activities.SettingsV2Activity
 import org.teslasoft.assistant.ui.adapters.ChatListAdapter
 import org.teslasoft.assistant.ui.fragments.dialogs.AddChatDialogFragment
 import org.teslasoft.assistant.ui.onboarding.WelcomeActivity
@@ -70,6 +77,8 @@ class ChatsListFragment : Fragment() {
 
     private var btnImport: FloatingActionButton? = null
 
+    private var bgSearch: ConstraintLayout? = null
+
     private var selectedFile: String = ""
 
     private var fieldSearch: EditText? = null
@@ -141,20 +150,37 @@ class ChatsListFragment : Fragment() {
         initSettings()
     }
 
+    fun reloadAmoled() {
+        if (isDarkThemeEnabled() && Preferences.getPreferences(requireActivity(), "").getAmoledPitchBlack()) {
+            btnSettings?.background = ResourcesCompat.getDrawable(resources, R.drawable.btn_accent_tonal_amoled, requireActivity().theme)!!
+            bgSearch?.background = ResourcesCompat.getDrawable(resources, R.drawable.btn_accent_tonal_amoled, requireActivity().theme)!!
+            btnImport?.backgroundTintList = ResourcesCompat.getColorStateList(resources, R.color.amoled_accent_100, requireActivity().theme)
+            btnAdd?.backgroundTintList = ResourcesCompat.getColorStateList(resources, R.color.accent_500, requireActivity().theme)
+        } else {
+            btnSettings?.background = getDisabledDrawable(ResourcesCompat.getDrawable(resources, R.drawable.btn_accent_tonal, requireActivity().theme)!!)
+            bgSearch?.background = getDisabledDrawable(ResourcesCompat.getDrawable(resources, R.drawable.btn_accent_tonal, requireActivity().theme)!!)
+            btnImport?.backgroundTintList = ResourcesCompat.getColorStateList(resources, R.color.accent_100, requireActivity().theme)
+            btnAdd?.backgroundTintList = ResourcesCompat.getColorStateList(resources, R.color.accent_900, requireActivity().theme)
+        }
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        // Log.e("T_DEBUG", "Fragment created")
-
         chatsList = view.findViewById(R.id.chats)
         btnSettings = view.findViewById(R.id.btn_settings_)
         btnImport = view.findViewById(R.id.btn_import)
         fieldSearch = view.findViewById(R.id.field_search)
+        bgSearch = view.findViewById(R.id.bg_search)
 
         btnSettings?.setImageResource(R.drawable.ic_settings)
 
         btnSettings?.setOnClickListener {
-            startActivity(Intent(requireActivity(), SettingsActivity::class.java).setAction(Intent.ACTION_VIEW))
+            if (Preferences.getPreferences(requireActivity(), "").getExperimentalUI()) {
+                startActivity(Intent(requireActivity(), SettingsV2Activity::class.java).setAction(Intent.ACTION_VIEW))
+            } else {
+                startActivity(Intent(requireActivity(), SettingsActivity::class.java).setAction(Intent.ACTION_VIEW))
+            }
         }
 
         btnAdd = view.findViewById(R.id.btn_add)
@@ -176,6 +202,8 @@ class ChatsListFragment : Fragment() {
 
         chatsList?.adapter = adapter
 
+        reloadAmoled()
+
         adapter?.notifyDataSetChanged()
 
         fieldSearch?.addTextChangedListener(object : TextWatcher {
@@ -327,4 +355,27 @@ class ChatsListFragment : Fragment() {
             }
         })
     }
+
+    private fun getDisabledDrawable(drawable: Drawable) : Drawable {
+        DrawableCompat.setTint(DrawableCompat.wrap(drawable), getDisabledColor())
+        return drawable
+    }
+
+    private fun isDarkThemeEnabled(): Boolean {
+        return when (resources.configuration.uiMode and
+                Configuration.UI_MODE_NIGHT_MASK) {
+            Configuration.UI_MODE_NIGHT_YES -> true
+            Configuration.UI_MODE_NIGHT_NO -> false
+            Configuration.UI_MODE_NIGHT_UNDEFINED -> false
+            else -> false
+        }
+    }
+
+    private fun getDisabledColor() : Int {
+        return if (isDarkThemeEnabled() && Preferences.getPreferences(requireActivity(), "").getAmoledPitchBlack()) {
+            ResourcesCompat.getColor(requireActivity().resources, R.color.amoled_accent_100, requireActivity().theme)
+        } else {
+            SurfaceColors.SURFACE_5.getColor(requireActivity())
+        }
+    }
 }
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 f439d07..1d71ea5 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
@@ -16,6 +16,8 @@
 
 package org.teslasoft.assistant.ui.fragments.tabs
 
+import android.content.res.Configuration
+import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
@@ -29,6 +31,9 @@ import android.widget.LinearLayout
 import android.widget.ListView
 import android.widget.ProgressBar
 import android.widget.Toast
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.res.ResourcesCompat
+import androidx.core.graphics.drawable.DrawableCompat
 
 import androidx.fragment.app.Fragment
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -43,6 +48,7 @@ import com.google.gson.reflect.TypeToken
 
 import org.teslasoft.assistant.Api
 import org.teslasoft.assistant.R
+import org.teslasoft.assistant.preferences.Preferences
 import org.teslasoft.assistant.ui.adapters.PromptAdapter
 import org.teslasoft.assistant.ui.fragments.dialogs.PostPromptDialogFragment
 import org.teslasoft.core.api.network.RequestNetwork
@@ -114,6 +120,8 @@ class PromptsFragment : Fragment(), SwipeRefreshLayout.OnRefreshListener {
 
     private var catHealth: LinearLayout? = null
 
+    private var searchBar: ConstraintLayout? = null
+
     private val postPromptListener: PostPromptDialogFragment.StateChangesListener = object : PostPromptDialogFragment.StateChangesListener {
         override fun onFormFilled(
             name: String,
@@ -178,12 +186,6 @@ class PromptsFragment : Fragment(), SwipeRefreshLayout.OnRefreshListener {
             noInternetLayout?.visibility = View.VISIBLE
             promptsList?.visibility = View.GONE
             progressbar?.visibility = View.GONE
-
-//            MaterialAlertDialogBuilder(requireActivity(), R.style.App_MaterialAlertDialog)
-//                .setTitle("Error")
-//                .setMessage(message)
-//                .setPositiveButton("Close") { _, _ -> }
-//                .show()
         }
     }
 
@@ -255,6 +257,7 @@ class PromptsFragment : Fragment(), SwipeRefreshLayout.OnRefreshListener {
         catEntertainment = view.findViewById(R.id.cat_entertainment)
         catSport = view.findViewById(R.id.cat_sport)
         catHealth = view.findViewById(R.id.cat_health)
+        searchBar = view.findViewById(R.id.search_bar)
 
         initializeCat()
 
@@ -275,6 +278,7 @@ class PromptsFragment : Fragment(), SwipeRefreshLayout.OnRefreshListener {
                 }
             })
 
+        reloadAmoled()
 
         noInternetLayout?.visibility = View.GONE
         promptsList?.visibility = View.GONE
@@ -327,9 +331,29 @@ class PromptsFragment : Fragment(), SwipeRefreshLayout.OnRefreshListener {
             promptDialog.show(parentFragmentManager.beginTransaction(), "PromptDialog")
         }
 
+        fieldSearch?.background = getDisabledDrawable(fieldSearch?.background!!)
+
         loadData()
     }
 
+    private fun isDarkThemeEnabled(): Boolean {
+        return when (resources.configuration.uiMode and
+                Configuration.UI_MODE_NIGHT_MASK) {
+            Configuration.UI_MODE_NIGHT_YES -> true
+            Configuration.UI_MODE_NIGHT_NO -> false
+            Configuration.UI_MODE_NIGHT_UNDEFINED -> false
+            else -> false
+        }
+    }
+
+    fun reloadAmoled() {
+        if (isDarkThemeEnabled() && Preferences.getPreferences(requireActivity(), "").getAmoledPitchBlack()) {
+            searchBar?.background = ResourcesCompat.getDrawable(resources, R.drawable.btn_accent_tonal_amoled, requireActivity().theme)!!
+        } else {
+            searchBar?.background = getDisabledDrawable(ResourcesCompat.getDrawable(resources, R.drawable.btn_accent_tonal, requireActivity().theme)!!)
+        }
+    }
+
     private fun initializeCat() {
         catAll?.setOnClickListener {
             clearSelection()
@@ -461,4 +485,13 @@ class PromptsFragment : Fragment(), SwipeRefreshLayout.OnRefreshListener {
         refreshLayout?.isRefreshing = false
         loadData()
     }
+
+    private fun getDisabledDrawable(drawable: Drawable) : Drawable {
+        DrawableCompat.setTint(DrawableCompat.wrap(drawable), getDisabledColor())
+        return drawable
+    }
+
+    private fun getDisabledColor() : Int {
+        return SurfaceColors.SURFACE_5.getColor(requireActivity())
+    }
 }
diff --git a/app/src/main/res/drawable/assistant_amoled.xml b/app/src/main/res/drawable/assistant_amoled.xml
new file mode 100644
index 0000000..e488acf
--- /dev/null
+++ b/app/src/main/res/drawable/assistant_amoled.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/transparent"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:topLeftRadius="24dp" android:topRightRadius="24dp" android:bottomRightRadius="0dp" android:bottomLeftRadius="0dp"/>
+            <gradient android:type="linear" android:angle="315" android:startColor="@color/amoled_window_background" android:centerColor="@color/amoled_window_background" android:endColor="@color/amoled_window_background" android:useLevel="true"/>
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/drawable/btn_accent_24_amoled.xml b/app/src/main/res/drawable/btn_accent_24_amoled.xml
new file mode 100644
index 0000000..19a9605
--- /dev/null
+++ b/app/src/main/res/drawable/btn_accent_24_amoled.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/transparent"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="24dp" />
+            <solid android:color="@color/amoled_accent_100" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/drawable/btn_accent_50.xml b/app/src/main/res/drawable/btn_accent_50.xml
index ffed27e..7e1b6b6 100644
--- a/app/src/main/res/drawable/btn_accent_50.xml
+++ b/app/src/main/res/drawable/btn_accent_50.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/accent_50"
+<ripple android:color="@color/transparent"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
diff --git a/app/src/main/res/drawable/btn_accent_50_amoled.xml b/app/src/main/res/drawable/btn_accent_50_amoled.xml
new file mode 100644
index 0000000..900fa68
--- /dev/null
+++ b/app/src/main/res/drawable/btn_accent_50_amoled.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/transparent"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="200dp" />
+            <solid android:color="@color/amoled_accent_100" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_accent_icon_large_amoled.xml b/app/src/main/res/drawable/btn_accent_icon_large_amoled.xml
new file mode 100644
index 0000000..a1d96d6
--- /dev/null
+++ b/app/src/main/res/drawable/btn_accent_icon_large_amoled.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/amoled_accent_200"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="24dp" />
+            <solid android:color="@color/amoled_accent_50" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_accent_tonal_amoled.xml b/app/src/main/res/drawable/btn_accent_tonal_amoled.xml
new file mode 100644
index 0000000..1ccc68b
--- /dev/null
+++ b/app/src/main/res/drawable/btn_accent_tonal_amoled.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/amoled_accent_200"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="12dp" />
+            <solid android:color="@color/amoled_accent_50" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/drawable/btn_accent_tonal_selector_v6.xml b/app/src/main/res/drawable/btn_accent_tonal_selector_v6.xml
index 28bb6bc..5de55fa 100644
--- a/app/src/main/res/drawable/btn_accent_tonal_selector_v6.xml
+++ b/app/src/main/res/drawable/btn_accent_tonal_selector_v6.xml
@@ -4,7 +4,7 @@
     <item>
         <shape>
             <corners android:radius="16dp" />
-            <solid android:color="@color/accent_250" />
+            <solid android:color="@color/accent_300" />
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_accent_tonal_selector_v6_amoled.xml b/app/src/main/res/drawable/btn_accent_tonal_selector_v6_amoled.xml
new file mode 100644
index 0000000..b2320a5
--- /dev/null
+++ b/app/src/main/res/drawable/btn_accent_tonal_selector_v6_amoled.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/transparent"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="16dp" />
+            <solid android:color="@color/amoled_accent_300" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_accent_tonal_v4_amoled.xml b/app/src/main/res/drawable/btn_accent_tonal_v4_amoled.xml
new file mode 100644
index 0000000..2c7c651
--- /dev/null
+++ b/app/src/main/res/drawable/btn_accent_tonal_v4_amoled.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/amoled_accent_200"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="25dp" />
+            <solid android:color="@color/amoled_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
index 596f3a0..8fdedc8 100644
--- a/app/src/main/res/drawable/btn_accent_tonal_v5.xml
+++ b/app/src/main/res/drawable/btn_accent_tonal_v5.xml
@@ -4,7 +4,7 @@
     <item>
         <shape>
             <corners android:radius="16dp" />
-            <solid android:color="@color/accent_250" />
+            <solid android:color="@color/accent_400" />
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_accent_tonal_v5_amoled.xml b/app/src/main/res/drawable/btn_accent_tonal_v5_amoled.xml
new file mode 100644
index 0000000..82edf54
--- /dev/null
+++ b/app/src/main/res/drawable/btn_accent_tonal_v5_amoled.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/amoled_accent_400"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="16dp" />
+            <solid android:color="@color/amoled_accent_300" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bubble_in.xml b/app/src/main/res/drawable/bubble_in.xml
index 30b5201..e2faa60 100644
--- a/app/src/main/res/drawable/bubble_in.xml
+++ b/app/src/main/res/drawable/bubble_in.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/accent_100"
+<ripple android:color="@color/transparent"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
diff --git a/app/src/main/res/drawable/bubble_in_dark.xml b/app/src/main/res/drawable/bubble_in_dark.xml
new file mode 100644
index 0000000..4d6a1a3
--- /dev/null
+++ b/app/src/main/res/drawable/bubble_in_dark.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/transparent"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="16dp" />
+            <solid android:color="@color/amoled_accent_400" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bubble_out.xml b/app/src/main/res/drawable/bubble_out.xml
index fbad880..438b823 100644
--- a/app/src/main/res/drawable/bubble_out.xml
+++ b/app/src/main/res/drawable/bubble_out.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="@color/accent_900"
+<ripple android:color="@color/transparent"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
diff --git a/app/src/main/res/drawable/bubble_out_dark.xml b/app/src/main/res/drawable/bubble_out_dark.xml
new file mode 100644
index 0000000..6a9f60e
--- /dev/null
+++ b/app/src/main/res/drawable/bubble_out_dark.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/transparent"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="16dp" />
+            <solid android:color="@color/amoled_accent_50" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cat_all.xml b/app/src/main/res/drawable/cat_all.xml
index acc0c5e..98f31de 100644
--- a/app/src/main/res/drawable/cat_all.xml
+++ b/app/src/main/res/drawable/cat_all.xml
@@ -4,7 +4,7 @@
     <item>
         <shape>
             <corners android:radius="16dp" />
-            <solid android:color="@color/accent_100" />
+            <solid android:color="@color/accent_50" />
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cat_all_active.xml b/app/src/main/res/drawable/cat_all_active.xml
index e88333f..df6c413 100644
--- a/app/src/main/res/drawable/cat_all_active.xml
+++ b/app/src/main/res/drawable/cat_all_active.xml
@@ -4,7 +4,7 @@
     <item>
         <shape>
             <corners android:radius="16dp" />
-            <solid android:color="@color/accent_200" />
+            <solid android:color="@color/accent_250" />
             <stroke android:width="1dp" android:color="@color/border" />
         </shape>
     </item>
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 934e784..810582b 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -31,7 +31,7 @@
                 app:layout_constraintTop_toBottomOf="@+id/app_icon" />
 
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/constraintLayout3"
+                android:id="@+id/common_actions"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="36dp"
@@ -114,7 +114,7 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <LinearLayout
-                android:id="@+id/linearLayout"
+                android:id="@+id/links"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="36dp"
@@ -127,7 +127,7 @@
                 android:weightSum="2"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/constraintLayout6">
+                app:layout_constraintTop_toBottomOf="@+id/system_info">
 
                 <LinearLayout
                     android:id="@+id/btn_github"
@@ -170,7 +170,7 @@
             </LinearLayout>
 
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/constraintLayout6"
+                android:id="@+id/system_info"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="36dp"
@@ -179,7 +179,7 @@
                 android:background="@drawable/btn_accent_24"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/constraintLayout3">
+                app:layout_constraintTop_toBottomOf="@+id/common_actions">
 
                 <TextView
                     android:id="@+id/textView8"
@@ -244,7 +244,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/linearLayout">
+                app:layout_constraintTop_toBottomOf="@+id/links">
 
                 <TextView
                     android:id="@+id/textView28"
diff --git a/app/src/main/res/layout/activity_chat.xml b/app/src/main/res/layout/activity_chat.xml
index 8a2e4b9..c017660 100644
--- a/app/src/main/res/layout/activity_chat.xml
+++ b/app/src/main/res/layout/activity_chat.xml
@@ -17,6 +17,7 @@
         app:layout_constraintStart_toStartOf="parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/keyboard_frame"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
diff --git a/app/src/main/res/layout/activity_imageview.xml b/app/src/main/res/layout/activity_imageview.xml
index 4b1c84a..ac25a2b 100644
--- a/app/src/main/res/layout/activity_imageview.xml
+++ b/app/src/main/res/layout/activity_imageview.xml
@@ -21,8 +21,10 @@
         <ProgressBar
             android:id="@+id/progressBar2"
             style="?android:attr/progressBarStyle"
-            android:layout_width="72dp"
-            android:layout_height="72dp" />
+            android:layout_width="128dp"
+            android:layout_height="128dp"
+            android:background="@drawable/btn_accent_tonal_v5"
+            android:padding="24dp" />
     </LinearLayout>
 
     <ImageView
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 61ee970..e35f710 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -77,6 +77,7 @@
         android:id="@+id/navigation_bar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:background="@color/accent_100"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_report_prompt.xml b/app/src/main/res/layout/activity_report_prompt.xml
index e44248c..f641290 100644
--- a/app/src/main/res/layout/activity_report_prompt.xml
+++ b/app/src/main/res/layout/activity_report_prompt.xml
@@ -27,7 +27,9 @@
         android:layout_height="64dp"
         android:background="@color/accent_100"
         android:elevation="6dp"
-        android:gravity="center"
+        android:gravity="start|center_vertical"
+        android:paddingStart="64dp"
+        android:paddingEnd="8dp"
         android:text="@string/title_report_abuse"
         android:textColor="@color/text_title"
         android:textSize="20sp"
diff --git a/app/src/main/res/layout/activity_settings_new.xml b/app/src/main/res/layout/activity_settings_new.xml
index 77c5a9f..5e27df5 100644
--- a/app/src/main/res/layout/activity_settings_new.xml
+++ b/app/src/main/res/layout/activity_settings_new.xml
@@ -548,6 +548,37 @@
 
             </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/linearLayout112"
+                android:layout_width="0dp"
+                android:layout_height="84dp"
+                android:layout_marginStart="12dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="12dp"
+                android:orientation="horizontal"
+                android:weightSum="2"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/linearLayout11">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/tile_amoled_mode"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginHorizontal="4dp"
+                    android:layout_weight="1" />
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/tile_empty_3"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginHorizontal="4dp"
+                    android:layout_weight="1">
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </LinearLayout>
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/activity_view_prompt.xml b/app/src/main/res/layout/activity_view_prompt.xml
index a4bb52e..4a9e075 100644
--- a/app/src/main/res/layout/activity_view_prompt.xml
+++ b/app/src/main/res/layout/activity_view_prompt.xml
@@ -92,7 +92,7 @@
 
 
                         <LinearLayout
-                            android:id="@+id/constraintLayout5"
+                            android:id="@+id/prompt_actions"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="16dp"
@@ -108,7 +108,7 @@
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/constraintLayout4">
+                            app:layout_constraintTop_toBottomOf="@+id/prompt_bg">
 
                             <com.google.android.material.button.MaterialButton
                                 android:id="@+id/btn_try"
@@ -158,7 +158,7 @@
                         </LinearLayout>
 
                         <androidx.constraintlayout.widget.ConstraintLayout
-                            android:id="@+id/constraintLayout4"
+                            android:id="@+id/prompt_bg"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="16dp"
diff --git a/app/src/main/res/layout/fragment_assistant.xml b/app/src/main/res/layout/fragment_assistant.xml
index 1e99ad0..09a4daf 100644
--- a/app/src/main/res/layout/fragment_assistant.xml
+++ b/app/src/main/res/layout/fragment_assistant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/ui"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -16,12 +16,12 @@
             android:layout_height="64dp"
             android:layout_marginBottom="24dp"
             android:background="@drawable/btn_accent_tonal_v2"
+            android:contentDescription="@string/btn_speak"
             android:elevation="6dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:srcCompat="@drawable/ic_microphone"
-            android:contentDescription="@string/btn_speak" />
+            app:srcCompat="@drawable/ic_microphone" />
 
         <ProgressBar
             android:id="@+id/assistant_loading"
@@ -72,11 +72,11 @@
                     android:layout_height="36dp"
                     android:layout_marginStart="8dp"
                     android:background="@drawable/btn_accent_tonal"
+                    android:contentDescription="@string/btn_settings"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_settings"
-                    android:contentDescription="@string/btn_settings" />
+                    app:srcCompat="@drawable/ic_settings" />
 
                 <ImageButton
                     android:id="@+id/btn_assistant_show_keyboard"
@@ -84,11 +84,11 @@
                     android:layout_height="36dp"
                     android:layout_marginEnd="8dp"
                     android:background="@drawable/btn_accent_tonal"
+                    android:contentDescription="@string/btn_show_keyboard"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_keyboard"
-                    android:contentDescription="@string/btn_show_keyboard" />
+                    app:srcCompat="@drawable/ic_keyboard" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </LinearLayout>
 
@@ -117,11 +117,11 @@
                     android:layout_height="36dp"
                     android:layout_marginStart="8dp"
                     android:background="@drawable/btn_accent_tonal"
+                    android:contentDescription="@string/btn_hide_keyboard"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_keyboard_hide"
-                    android:contentDescription="@string/btn_hide_keyboard" />
+                    app:srcCompat="@drawable/ic_keyboard_hide" />
 
                 <ImageButton
                     android:id="@+id/btn_assistant_send"
@@ -129,11 +129,11 @@
                     android:layout_height="36dp"
                     android:layout_marginEnd="8dp"
                     android:background="@drawable/btn_accent_tonal"
+                    android:contentDescription="@string/btn_send"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_send"
-                    android:contentDescription="@string/btn_send" />
+                    app:srcCompat="@drawable/ic_send" />
 
                 <EditText
                     android:id="@+id/assistant_message"
@@ -173,8 +173,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:layout_marginBottom="160dp"
-                android:scrollbars="none"
                 android:listSelector="@android:color/transparent"
+                android:scrollbars="none"
                 android:transcriptMode="alwaysScroll" />
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_chats_list.xml b/app/src/main/res/layout/fragment_chats_list.xml
index 1460a7f..fbc8b8b 100644
--- a/app/src/main/res/layout/fragment_chats_list.xml
+++ b/app/src/main/res/layout/fragment_chats_list.xml
@@ -64,7 +64,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/constraintLayout2" />
+        app:layout_constraintTop_toBottomOf="@+id/bg_search" />
 
     <ImageButton
         android:id="@+id/btn_settings_"
@@ -80,7 +80,7 @@
         app:srcCompat="@drawable/ic_settings" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/constraintLayout2"
+        android:id="@+id/bg_search"
         android:layout_width="0dp"
         android:layout_height="56dp"
         android:layout_marginStart="16dp"
@@ -98,9 +98,13 @@
             android:id="@+id/field_search"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:layout_marginEnd="4dp"
             android:background="@color/transparent"
+            android:autofillHints="Search"
+            android:textColorHint="@color/text_hint"
+            android:textColor="@color/text_field"
             android:ems="10"
             android:hint="@string/hint_search"
             android:inputType="text"
@@ -111,13 +115,16 @@
 
         <ImageButton
             android:id="@+id/btn_search"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
-            android:background="@drawable/ic_search"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginEnd="4dp"
+            android:background="@color/transparent"
             android:contentDescription="@string/hint_search"
+            android:tooltipText="@string/hint_search"
+            android:src="@drawable/ic_search"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:srcCompat="@drawable/ic_search"
             app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_prompts.xml b/app/src/main/res/layout/fragment_prompts.xml
index 14e8e9d..98159f7 100644
--- a/app/src/main/res/layout/fragment_prompts.xml
+++ b/app/src/main/res/layout/fragment_prompts.xml
@@ -27,7 +27,7 @@
         android:id="@+id/activity_prompts_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
+        android:layout_marginTop="28dp"
         android:text="@string/title_prompts_store"
         android:textColor="@color/text_title"
         android:textSize="24sp"
@@ -54,8 +54,12 @@
             android:id="@+id/field_search"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:layout_marginEnd="4dp"
+            android:autofillHints="Search"
+            android:textColorHint="@color/text_hint"
+            android:textColor="@color/text_field"
             android:background="@color/transparent"
             android:ems="10"
             android:hint="@string/hint_search"
@@ -67,11 +71,13 @@
 
         <ImageButton
             android:id="@+id/btn_search"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginEnd="4dp"
             android:background="@color/transparent"
             android:contentDescription="@string/hint_search"
+            android:tooltipText="@string/hint_search"
+            android:src="@drawable/ic_search"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/fragment_tips.xml b/app/src/main/res/layout/fragment_tips.xml
index bcdea51..a1b5ca2 100644
--- a/app/src/main/res/layout/fragment_tips.xml
+++ b/app/src/main/res/layout/fragment_tips.xml
@@ -8,7 +8,7 @@
         android:id="@+id/activity_tips_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
+        android:layout_marginTop="28dp"
         android:text="@string/title_tips"
         android:textColor="@color/text_title"
         android:textSize="24sp"
diff --git a/app/src/main/res/layout/view_assistant_bot_message.xml b/app/src/main/res/layout/view_assistant_bot_message.xml
index e40a45c..064d0e4 100644
--- a/app/src/main/res/layout/view_assistant_bot_message.xml
+++ b/app/src/main/res/layout/view_assistant_bot_message.xml
@@ -85,19 +85,28 @@
 
             </LinearLayout>
 
-            <ImageButton
-                android:id="@+id/btn_copy"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="12dp"
                 android:layout_marginEnd="8dp"
                 android:layout_marginBottom="8dp"
-                android:background="@drawable/btn_accent_tonal"
-                android:contentDescription="@string/btn_copy"
-                android:descendantFocusability="blocksDescendants"
+                android:orientation="horizontal"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/message"
-                app:srcCompat="@drawable/ic_copy" />
+                app:layout_constraintTop_toBottomOf="@+id/message">
+
+                <ImageButton
+                    android:id="@+id/btn_copy"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:layout_marginStart="8dp"
+                    android:background="@drawable/btn_accent_tonal"
+                    android:contentDescription="@string/btn_copy"
+                    android:descendantFocusability="blocksDescendants"
+                    app:srcCompat="@drawable/ic_copy" />
+            </LinearLayout>
+
         </androidx.constraintlayout.widget.ConstraintLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/view_assistant_user_message.xml b/app/src/main/res/layout/view_assistant_user_message.xml
index e98d23d..4d679f2 100644
--- a/app/src/main/res/layout/view_assistant_user_message.xml
+++ b/app/src/main/res/layout/view_assistant_user_message.xml
@@ -18,7 +18,8 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/bubble_bg"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
@@ -37,8 +38,8 @@
                 android:textSize="18sp"
                 android:textStyle="bold"
                 android:visibility="gone"
-                tools:layout_editor_absoluteX="76dp"
-                tools:layout_editor_absoluteY="16dp" />
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
             <ImageView
                 android:id="@+id/icon"
@@ -53,15 +54,11 @@
                 android:id="@+id/message"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="12dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginBottom="12dp"
+                android:layout_marginTop="16dp"
+                android:paddingHorizontal="12dp"
                 android:textColor="@color/window_background"
                 android:textSize="16sp"
-                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <LinearLayout
@@ -82,20 +79,28 @@
                     app:srcCompat="@drawable/assistant" />
             </LinearLayout>
 
-            <ImageButton
-                android:id="@+id/btn_copy"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginBottom="8dp"
-                android:background="@drawable/btn_accent_tonal"
-                android:contentDescription="@string/btn_copy"
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/image_frame"
-                app:srcCompat="@drawable/ic_copy" />
-        </LinearLayout>
+                app:layout_constraintTop_toBottomOf="@+id/message">
+
+                <ImageButton
+                    android:id="@+id/btn_copy"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginTop="12dp"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:background="@drawable/btn_accent_tonal"
+                    android:contentDescription="@string/btn_copy"
+                    app:srcCompat="@drawable/ic_copy" />
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night-v31/colors.xml b/app/src/main/res/values-night-v31/colors.xml
index e3299a0..a3286d1 100644
--- a/app/src/main/res/values-night-v31/colors.xml
+++ b/app/src/main/res/values-night-v31/colors.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
     <color name="accent_50">@android:color/system_neutral1_800</color>
-    <color name="accent_100">@android:color/system_accent2_800</color>
+    <color name="accent_100">@android:color/system_neutral2_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_400">@android:color/system_accent2_700</color>
+    <color name="accent_300">@android:color/system_accent2_700</color>
     <color name="accent_500">@android:color/system_accent1_300</color>
     <color name="accent_900">@android:color/system_accent1_100</color>
     <color name="neutral_200">@android:color/system_neutral2_100</color>
diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml
index 8212181..2281765 100644
--- a/app/src/main/res/values-night-v31/themes.xml
+++ b/app/src/main/res/values-night-v31/themes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Theme.App" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Theme.App" parent="Theme.Material3.DynamicColors.DayNight">
         <item name="colorPrimary">@color/accent_900</item>
         <item name="colorOnPrimary">@color/window_background</item>
         <item name="colorSecondary">@color/accent_900</item>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 75ae0c3..467d885 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -4,6 +4,8 @@
     <color name="accent_100">#302f36</color>
     <color name="accent_200">#424250</color>
     <color name="accent_250">#424250</color>
+    <color name="accent_300">#424250</color>
+    <color name="accent_400">#424250</color>
     <color name="accent_500">#a895e9</color>
     <color name="accent_900">#c3b4ff</color>
     <color name="neutral_200">#ddd9e6</color>
@@ -22,13 +24,15 @@
     <color name="text_title">#FFFFFFFF</color>
     <color name="text_title_inv">#FF000000</color>
     <color name="text_subtitle">#99FFFFFF</color>
+    <color name="text_field">#DEFFFFFF</color>
+    <color name="text_hint">#66FFFFFF</color>
     <color name="text_subtitle_inv">#99000000</color>
     <color name="ripple">#4DFFFFFF</color>
     <color name="success">#9CE38F</color>
     <color name="text">#eeffffff</color>
     <color name="hint">#aaffffff</color>
     <color name="tip1">#ccfcb3</color>
-    <color name="tip">#20ccfcb3</color>
+    <color name="tip">#15D8FAC6</color>
     <color name="marker">#15FFFFFF</color>
 
     <color name="cat_development">#ffddad</color>
@@ -83,7 +87,7 @@
     <color name="disabled_background">#66999999</color>
     <color name="disabled_icon">#FF999999</color>
 
-    <color name="tint_red">#40824444</color>
+    <color name="tint_red">#40965050</color>
     <color name="gpt_icon_red">#CCB4B4</color>
 
     <color name="tint_yellow">#40877249</color>
@@ -92,10 +96,10 @@
     <color name="tint_green">#30739665</color>
     <color name="gpt_icon_green">#C2CCB4</color>
 
-    <color name="tint_blue">#405F71A7</color>
-    <color name="gpt_icon_blue">#B4B6CC</color>
+    <color name="tint_blue">#405F7CA7</color>
+    <color name="gpt_icon_blue">#B4BFCC</color>
 
-    <color name="tint_purple">#40855FA7</color>
+    <color name="tint_purple">#40795896</color>
     <color name="gpt_icon_purple">#C2B4CC</color>
 
     <color name="border">#38FFFFFF</color>
diff --git a/app/src/main/res/values-v31/colors.xml b/app/src/main/res/values-v31/colors.xml
index 45ca640..d3b0688 100644
--- a/app/src/main/res/values-v31/colors.xml
+++ b/app/src/main/res/values-v31/colors.xml
@@ -4,6 +4,8 @@
     <color name="accent_100">@android:color/system_neutral2_50</color>
     <color name="accent_200">@android:color/system_neutral2_200</color>
     <color name="accent_250">@android:color/system_accent2_100</color>
+    <color name="accent_300">@android:color/system_neutral1_10</color>
+    <color name="accent_400">@android:color/system_accent1_200</color>
     <color name="accent_500">@android:color/system_accent1_600</color>
     <color name="accent_900">@android:color/system_accent1_800</color>
     <color name="neutral_200">@android:color/system_neutral2_800</color>
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
index 0636bcd..55fb684 100644
--- a/app/src/main/res/values-v31/themes.xml
+++ b/app/src/main/res/values-v31/themes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Theme.App" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Theme.App" parent="Theme.Material3.DynamicColors.DayNight">
         <item name="colorPrimary">@color/accent_500</item>
         <item name="colorOnPrimary">@color/white</item>
         <item name="colorSecondary">@color/accent_100</item>
diff --git a/app/src/main/res/values/colors-amoled.xml b/app/src/main/res/values/colors-amoled.xml
new file mode 100644
index 0000000..ecdc033
--- /dev/null
+++ b/app/src/main/res/values/colors-amoled.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+<!--    <color name="accent_50">#0a0a0a</color>-->
+<!--    <color name="accent_100">#121212</color>-->
+<!--    <color name="accent_200">#181818</color>-->
+<!--    <color name="accent_250">#212121</color>-->
+<!--    <color name="accent_400">#262626</color>-->
+<!--    <color name="accent_300">#323232</color>-->
+<!--    <color name="bottom_navbar">@color/accent_50</color>-->
+<!--    <color name="button">@color/accent_100</color>-->
+<!--    <color name="window_background">#000000</color>-->
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 0d8109a..cf68324 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -16,10 +16,22 @@
     <color name="white">#ffffffff</color>
     <color name="warning">#ffff3d00</color>
 
+    <color name="amoled_accent_50">#0a0a0a</color>
+    <color name="amoled_accent_100">#121212</color>
+    <color name="amoled_accent_200">#181818</color>
+    <color name="amoled_accent_250">#212121</color>
+    <color name="amoled_accent_400">#262626</color>
+    <color name="amoled_accent_300">#323232</color>
+    <color name="amoled_bottom_navbar">@color/accent_50</color>
+    <color name="amoled_button">@color/accent_100</color>
+    <color name="amoled_window_background">#000000</color>
+
     <color name="accent_50">#F0EDF6</color>
     <color name="accent_100">#e3dfec</color>
     <color name="accent_200">#c7c4cf</color>
     <color name="accent_250">#9C8EC2</color>
+    <color name="accent_300">#fdfbff</color>
+    <color name="accent_400">#c7c4cf</color>
     <color name="accent_500">#361759</color>
     <color name="accent_900">#63488f</color>
     <color name="neutral_200">#312e36</color>
@@ -42,6 +54,8 @@
     <color name="text_title">#FF000000</color>
     <color name="text_title_inv">#FFFFFFFF</color>
     <color name="text_subtitle">#AA000000</color>
+    <color name="text_field">#CC000000</color>
+    <color name="text_hint">#99000000</color>
     <color name="text_subtitle_inv">#AAFFFFFF</color>
     <color name="ripple">#4D000000</color>
     <color name="mtrl_textinput_default_box_stroke_color" tools:override="true">@color/accent_900</color>
@@ -110,8 +124,8 @@
     <color name="tint_green">#250C7300</color>
     <color name="gpt_icon_green">#087300</color>
 
-    <color name="tint_blue">#250B0073</color>
-    <color name="gpt_icon_blue">#220073</color>
+    <color name="tint_blue">#25003873</color>
+    <color name="gpt_icon_blue">#003D73</color>
 
     <color name="tint_purple">#25540073</color>
     <color name="gpt_icon_purple">#5A0073</color>