diff --git a/README.md b/README.md
index 0e940f9..0dbe456 100644
--- a/README.md
+++ b/README.md
@@ -10,13 +10,19 @@ git submodule update --init --recursive
 ```
 
 Add in the app's `settings.gradle`:
-```groovy
-include(":app", ":bohio")
-project(":bohio").projectDir = file("bohio")
+```kotlin
+include(":app")
+include(":bohio")
+
+// Activate For Release
+//project(":bohio").projectDir = file("bohio")
+
+// Activate For Bohio Development (and locate your local source)
+project(":bohio").projectDir = file("../git-mod_bohio")
 ```
 
 Add in the app's `app/build.gradle`:
-```groovy
+```kotlin
 dependencies {
     implementation(project(":bohio"))
 }
@@ -33,9 +39,9 @@ Make sure the app's theme extends `Theme.Rama.Base` in `themes.xml`.
 
 For F-Droid, add `submodules: true` to the relevant build entry in the app's metadata so `git submodule update --init --recursive` runs after checkout. Keep the `bohio` repo public and avoid rewriting history on any commit a published app version's submodule pointer references.
 
-## Maintanence
+## Maintenance
 
 Update submodule
 ```bash
 git submodule update --remote bohio
-```
\ No newline at end of file
+```
diff --git a/build.gradle b/build.gradle
index 0e8d660..f01e2c9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,9 +29,5 @@ android {
 }
 
 dependencies {
-    // 'api' so consuming apps get these transitively without redeclaring.
-    // CsActivity extends AppCompatActivity and uses OnBackPressedCallback
-    // (from androidx.activity, pulled in transitively by appcompat).
     api 'androidx.appcompat:appcompat:1.6.1'
-    api 'androidx.fragment:fragment-ktx:1.6.2'
 }
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
deleted file mode 100644
index bed3e93..0000000
--- a/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <application>
-        <!--
-          AboutActivity is declared here so manifest merging adds it to every
-          consuming app automatically. Theme/exported can be overridden per-app
-          via a matching <activity> entry with tools:node="merge" if needed.
-        -->
-        <activity
-            android:name=".ui.AboutActivity"
-            android:exported="false"
-            android:theme="@style/Theme.Rama.Base" />
-    </application>
-
-</manifest>
diff --git a/src/main/java/com/rama/bohio/activity/BohioActivity.kt b/src/main/java/com/rama/bohio/activity/BohioActivity.kt
new file mode 100644
index 0000000..deefd1b
--- /dev/null
+++ b/src/main/java/com/rama/bohio/activity/BohioActivity.kt
@@ -0,0 +1,192 @@
+package com.rama.bohio.activity
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.content.pm.ActivityInfo
+import android.content.res.Configuration
+import android.os.Build
+import android.os.Bundle
+import android.view.View
+import android.view.WindowInsets
+import android.view.WindowManager
+import androidx.activity.ComponentActivity
+import com.rama.bohio.managers.FontManager
+import com.rama.bohio.managers.ThemeManager
+import com.rama.bohio.objects.PrefKeys
+import com.rama.bohio.util.Dimens.dpToPx
+import com.rama.bohio.util.LocaleHelper
+
+abstract class BohioActivity : ComponentActivity() {
+
+    private var lastKnownLanguage: String? = null
+    private var lastKnownTheme: String? = null
+    private var lastKnownUiScale: Float = -1f
+
+    // Context wrapping (locale + UI scale)
+
+    override fun attachBaseContext(newBase: Context) {
+        val localeContext = LocaleHelper.wrapContext(newBase)
+
+        val scale = rawPrefs(localeContext).getFloat(PrefKeys.APP_UI_SCALE, 1f)
+
+        val context = if (scale != 1f) {
+            val config = Configuration(localeContext.resources.configuration)
+            config.densityDpi =
+                (localeContext.resources.displayMetrics.densityDpi * scale).toInt()
+            localeContext.createConfigurationContext(config)
+        } else {
+            localeContext
+        }
+
+        super.attachBaseContext(context)
+    }
+
+    // Lifecycle
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val p = rawPrefs(this)
+        lastKnownLanguage = p.getString(PrefKeys.APP_LANGUAGE, "")
+        lastKnownTheme = p.getString(PrefKeys.APP_THEME_NAME, "")
+        lastKnownUiScale = p.getFloat(PrefKeys.APP_UI_SCALE, 1f)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            window.setDecorFitsSystemWindows(false)
+        } else {
+            @Suppress("DEPRECATION")
+            window.decorView.systemUiVisibility =
+                View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or
+                        View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
+                        View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            window.attributes.layoutInDisplayCutoutMode =
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        val p = rawPrefs(this)
+
+        val lang = p.getString(PrefKeys.APP_LANGUAGE, "") ?: ""
+        if (lang != lastKnownLanguage) {
+            lastKnownLanguage = lang
+            if (shouldRecreateOnSettingsChange()) {
+                recreate(); return
+            }
+        }
+
+        val theme = p.getString(PrefKeys.APP_THEME_NAME, "") ?: ""
+        if (theme != lastKnownTheme) {
+            lastKnownTheme = theme
+            if (shouldRecreateOnSettingsChange()) {
+                recreate(); return
+            }
+        }
+
+        val scale = p.getFloat(PrefKeys.APP_UI_SCALE, 1f)
+        if (scale != lastKnownUiScale) {
+            lastKnownUiScale = scale
+            if (shouldRecreateOnSettingsChange()) {
+                recreate(); return
+            }
+        }
+
+        val preventRotation = p.getBoolean(PrefKeys.SYSTEM_PREVENT_ROTATION, false)
+        applyRotationLock(preventRotation)
+
+        ThemeManager.applyTheme(this, contentRoot())
+    }
+
+    override fun onWindowFocusChanged(hasFocus: Boolean) {
+        super.onWindowFocusChanged(hasFocus)
+        if (hasFocus) applySystemBarVisibility()
+    }
+
+    // Public API
+
+    protected open fun shouldRecreateOnSettingsChange(): Boolean = true
+
+    fun applyCurrentTheme(root: View? = null) {
+        ThemeManager.applyTheme(this, root ?: contentRoot())
+        applyNavBarColor()
+    }
+
+    fun refreshFont() {
+        FontManager.applyFont(this, contentRoot())
+    }
+
+    fun applyRotationLock(lock: Boolean) {
+        requestedOrientation =
+            if (lock) ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+            else ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
+    }
+
+    protected fun applyEdgeToEdgePadding(root: View) {
+        val paddingInline = dpToPx(this, 16f)
+        val paddingBlock = dpToPx(this, 8f)
+
+        root.setOnApplyWindowInsetsListener { view, insets ->
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                val sysBars = insets.getInsets(
+                    WindowInsets.Type.systemBars() or WindowInsets.Type.displayCutout()
+                )
+                val ime = insets.getInsets(WindowInsets.Type.ime())
+                val bottomInset = if (insets.isVisible(WindowInsets.Type.ime())) ime.bottom
+                else sysBars.bottom
+                view.setPadding(
+                    sysBars.left + paddingInline,
+                    sysBars.top + paddingBlock,
+                    sysBars.right + paddingInline,
+                    bottomInset + paddingBlock,
+                )
+            } else {
+                @Suppress("DEPRECATION")
+                view.setPadding(
+                    insets.systemWindowInsetLeft + paddingInline,
+                    insets.systemWindowInsetTop + paddingBlock,
+                    insets.systemWindowInsetRight + paddingInline,
+                    insets.systemWindowInsetBottom + paddingBlock,
+                )
+            }
+            insets
+        }
+    }
+
+    // Private helpers
+
+    protected fun applyNavBarColor() {
+        val theme = rawPrefs(this).getString(PrefKeys.APP_THEME_NAME, "") ?: ""
+        val palette = ThemeManager.paletteFor(theme, this)
+        window.navigationBarColor = palette.bg_1
+    }
+
+    protected open fun isSystemBarVisible(): Boolean {
+        return rawPrefs(this)
+            .getBoolean(PrefKeys.SYSTEM_BAR_VISIBLE, true)
+    }
+
+    private fun applySystemBarVisibility() {
+        if (isSystemBarVisible()) {
+            @Suppress("DEPRECATION")
+            window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+        } else {
+            @Suppress("DEPRECATION")
+            window.decorView.systemUiVisibility =
+                View.SYSTEM_UI_FLAG_FULLSCREEN or
+                        View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
+                        View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or
+                        View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+        }
+        contentRoot().requestApplyInsets()
+    }
+
+    private fun contentRoot(): View = findViewById(android.R.id.content)
+
+    private fun rawPrefs(context: Context): SharedPreferences =
+        context.getSharedPreferences("settings", Context.MODE_PRIVATE)
+}
\ No newline at end of file
diff --git a/src/main/java/com/rama/bohio/dialogs/ColorPickerDialog.kt b/src/main/java/com/rama/bohio/dialogs/ColorPickerDialog.kt
new file mode 100644
index 0000000..db06e08
--- /dev/null
+++ b/src/main/java/com/rama/bohio/dialogs/ColorPickerDialog.kt
@@ -0,0 +1,92 @@
+package com.rama.bohio.dialogs
+
+import android.app.Activity
+import android.app.Dialog
+import android.graphics.Color
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup.LayoutParams.MATCH_PARENT
+import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
+import android.widget.Button
+import android.widget.EditText
+import android.widget.Toast
+import com.rama.bohio.R
+import com.rama.bohio.managers.ThemeManager
+import com.rama.bohio.widgets.HSVSquareView
+import com.rama.bohio.widgets.HueStripView
+
+object ColorPickerDialog {
+
+    fun show(
+        activity: Activity,
+        initialColor: Int,
+        onColorSelected: (Int) -> Unit
+    ) {
+        val dialog = Dialog(activity)
+        val view = LayoutInflater.from(activity).inflate(R.layout.wd_color_picker_dialog, null)
+
+        dialog.setContentView(view)
+        dialog.window?.setLayout(MATCH_PARENT, WRAP_CONTENT)
+
+        ThemeManager.applyTheme(activity, view)
+
+        val preview = view.findViewById<View>(R.id.preview)
+        val hexInput = view.findViewById<EditText>(R.id.hex_input)
+        val applyButton = view.findViewById<Button>(R.id.apply_button)
+        val closeButton = view.findViewById<Button>(R.id.close_button)
+        val hsvSquare = view.findViewById<HSVSquareView>(R.id.hsv_square)
+        val hueSlider = view.findViewById<HueStripView>(R.id.hue_slider)
+
+        // HSV state (single source of truth)
+        val hsv = floatArrayOf(0f, 0f, 0f)
+        Color.colorToHSV(initialColor, hsv)
+        var hue = hsv[0]
+        var saturation = hsv[1]
+        var value = hsv[2]
+
+        fun updateUI() {
+            val color = Color.HSVToColor(floatArrayOf(hue, saturation, value))
+            preview.background.setTint(color)
+            hexInput.setText(String.format("#%06X", 0xFFFFFF and color))
+            hsvSquare.setHue(hue)
+        }
+        updateUI()
+
+        hueSlider.onHueChanged = { newHue ->
+            hue = newHue
+            updateUI()
+        }
+
+        hsvSquare.onSaturationValueChanged = { s, v ->
+            saturation = s
+            value = v
+            updateUI()
+        }
+
+        hexInput.setOnEditorActionListener { _, _, _ ->
+            try {
+                val color = Color.parseColor(hexInput.text.toString())
+                Color.colorToHSV(color, hsv)
+                hue = hsv[0]
+                saturation = hsv[1]
+                value = hsv[2]
+                updateUI()
+            } catch (_: Exception) {
+                Toast.makeText(
+                    activity,
+                    activity.getString(R.string.toast_invalid_color),
+                    Toast.LENGTH_SHORT
+                ).show()
+            }
+            true
+        }
+
+        applyButton.setOnClickListener {
+            onColorSelected(Color.HSVToColor(floatArrayOf(hue, saturation, value)))
+            dialog.dismiss()
+        }
+        closeButton.setOnClickListener { dialog.dismiss() }
+
+        dialog.show()
+    }
+}
diff --git a/src/main/java/com/rama/bohio/managers/FontManager.kt b/src/main/java/com/rama/bohio/managers/FontManager.kt
new file mode 100644
index 0000000..75d2e9e
--- /dev/null
+++ b/src/main/java/com/rama/bohio/managers/FontManager.kt
@@ -0,0 +1,63 @@
+package com.rama.bohio.managers
+
+import android.content.Context
+import android.graphics.Typeface
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import com.rama.bohio.objects.PrefFontStyle
+import java.io.File
+
+object FontManager {
+
+    private val cache = mutableMapOf<String, Typeface?>()
+
+    fun applyFont(context: Context, root: View) {
+        val prefs = PrefsManager.getInstance(context)
+        val fontStyle = prefs.getFontStyle().ifBlank { "system" }
+
+        val typeface = getTypeface(context, fontStyle)
+        applyRecursively(root, typeface)
+    }
+
+    fun getTypeface(context: Context, style: String): Typeface? {
+        if (style == PrefFontStyle.DEFAULT) return null
+
+        // Custom font: always reload from path (don't cache by style key alone)
+        if (style == PrefFontStyle.CUSTOM) {
+            val path = PrefsManager.getInstance(context).getCustomFontPath()
+            if (path.isBlank()) return null
+            val cacheKey = "custom:$path"
+            if (cache.containsKey(cacheKey)) return cache[cacheKey]
+            val tf = runCatching { Typeface.createFromFile(File(path)) }.getOrNull()
+            cache[cacheKey] = tf
+            return tf
+        }
+
+        if (cache.containsKey(style)) return cache[style]
+
+        val tf = when (style) {
+            PrefFontStyle.JERSEY_25 ->
+                Typeface.createFromAsset(context.assets, "fonts/jersey25_regular.otf")
+
+            else -> null
+        }
+        cache[style] = tf
+        return tf
+    }
+
+    // Call this after saving a new custom font so the old cached entry is evicted.
+    fun clearCustomCache() {
+        cache.keys.filter { it.startsWith("custom:") }.forEach { cache.remove(it) }
+    }
+
+    private fun applyRecursively(view: View, typeface: Typeface?) {
+        if (view is TextView) view.typeface = typeface ?: Typeface.DEFAULT
+        if (view is ViewGroup) {
+            for (i in 0 until view.childCount) applyRecursively(view.getChildAt(i), typeface)
+        }
+    }
+
+    // Public single-view entry point used by adapters to theme individual rows.
+    fun applyTypefaceToView(view: View, typeface: Typeface?) = applyRecursively(view, typeface)
+}
diff --git a/src/main/java/com/rama/bohio/managers/PrefsManager.kt b/src/main/java/com/rama/bohio/managers/PrefsManager.kt
index c18a6ef..2490c9d 100644
--- a/src/main/java/com/rama/bohio/managers/PrefsManager.kt
+++ b/src/main/java/com/rama/bohio/managers/PrefsManager.kt
@@ -9,34 +9,13 @@ import com.rama.bohio.objects.PrefKeys
 import com.rama.bohio.objects.PrefLanguage
 import com.rama.bohio.objects.PrefTheme
 
-/**
- * Shared preferences base for all Rama apps.
- *
- * Holds the common keys/enums, shared getters/setters, and export/import/clear
- * logic. Each app provides its own subclass + singleton (see Teyin's
- * PrefsManager for the pattern):
- *
- *   class PrefsManager private constructor(context: Context) : BohioPrefsManager(context) {
- *       override val defaultTheme = BohioPrefsManager.Theme.TEYIN
- *       object FileKeys { ... app-specific keys ... }
- *       override fun applyAppDefaults(editor: SharedPreferences.Editor) { ... }
- *       companion object { fun getInstance(context: Context): PrefsManager = ... }
- *   }
- */
 abstract class PrefsManager protected constructor(context: Context) {
 
     val prefs: SharedPreferences =
         context.getSharedPreferences("settings", Context.MODE_PRIVATE)
 
-    /**
-     * Theme applied on first run. Override per app, e.g.
-     * `override val defaultTheme = Theme.TEYIN`.
-     */
     protected open val defaultTheme: String = PrefTheme.RAMA
 
-    fun isSystemBarVisible(): Boolean =
-        prefs.getBoolean(PrefKeys.SYSTEM_BAR_VISIBLE, true)
-
     fun getFontStyle(): String =
         prefs.getString(PrefKeys.FONT_STYLE, "") ?: ""
 
@@ -90,15 +69,6 @@ abstract class PrefsManager protected constructor(context: Context) {
     fun setString(key: String, value: String) =
         prefs.edit().putString(key, value).apply()
 
-    /**
-     * Populates first-run defaults shared by every app, then delegates to
-     * [applyAppDefaults] for app-specific ones — both in the same editor
-     * transaction. Guarded by [PrefKeys.APP_LANGUAGE] so it's a no-op after
-     * the first run.
-     *
-     * @param sync if true, commits synchronously (used by [clearAllPrefs],
-     *   which needs the defaults written before returning).
-     */
     open fun initPrefs(sync: Boolean = false) {
         if (prefs.contains(PrefKeys.APP_LANGUAGE)) return
 
@@ -106,7 +76,6 @@ abstract class PrefsManager protected constructor(context: Context) {
             .putString(PrefKeys.FONT_STYLE, PrefFontStyle.JERSEY_25)
             .putString(PrefKeys.APP_LANGUAGE, PrefLanguage.SYSTEM)
             .putFloat(PrefKeys.APP_UI_SCALE, 1f)
-            .putBoolean(PrefKeys.APPS_ICONS, false)
             .putBoolean(PrefKeys.SYSTEM_BAR_VISIBLE, true)
             .putBoolean(PrefKeys.SYSTEM_PREVENT_ROTATION, false)
             .putString(PrefKeys.APP_THEME_NAME, defaultTheme)
@@ -120,10 +89,6 @@ abstract class PrefsManager protected constructor(context: Context) {
         if (sync) editor.commit() else editor.apply()
     }
 
-    /**
-     * Override to add app-specific first-run defaults to the same
-     * editor/transaction used by [initPrefs]. No-op by default.
-     */
     protected open fun applyAppDefaults(editor: SharedPreferences.Editor) {
     }
 
@@ -230,5 +195,19 @@ abstract class PrefsManager protected constructor(context: Context) {
         private val FLOAT_PREF_KEYS = setOf(
             PrefKeys.APP_UI_SCALE
         )
+
+        @Volatile
+        private var instance: PrefsManager? = null
+
+        fun register(prefs: PrefsManager) {
+            instance = prefs
+        }
+
+        fun getInstance(context: Context): PrefsManager =
+            instance ?: error(
+                "PrefsManager.register() has not been called. " +
+                        "Make sure your app's PrefsManager.getInstance() is called before " +
+                        "FontManager or ThemeManager."
+            )
     }
 }
diff --git a/src/main/java/com/rama/bohio/managers/ThemeManager.kt b/src/main/java/com/rama/bohio/managers/ThemeManager.kt
new file mode 100644
index 0000000..cdb4987
--- /dev/null
+++ b/src/main/java/com/rama/bohio/managers/ThemeManager.kt
@@ -0,0 +1,205 @@
+package com.rama.bohio.managers
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.drawable.ColorDrawable
+import android.view.View
+import android.view.ViewGroup
+import android.widget.CheckBox
+import android.widget.ImageView
+import android.widget.RadioButton
+import android.widget.TextView
+import com.rama.bohio.R
+import com.rama.bohio.objects.PrefKeys
+import com.rama.bohio.objects.PrefTheme
+import com.rama.bohio.objects.Themes
+
+object ThemeManager {
+
+    fun paletteFor(theme: String, context: Context? = null): Themes.Palette =
+        when (theme) {
+            PrefTheme.MAKO -> Themes.MAKO
+            PrefTheme.RAMA -> Themes.RAMA
+            PrefTheme.CATPPUCCIN_MOCHA -> Themes.CATPPUCCIN_MOCHA
+            PrefTheme.CATPPUCCIN_LATTE -> Themes.CATPPUCCIN_LATTE
+            PrefTheme.DRACULA -> Themes.DRACULA
+            PrefTheme.MELANGE -> Themes.MELANGE
+            PrefTheme.TOKYO_NIGHT -> Themes.TOKYO_NIGHT
+            PrefTheme.CUSTOM -> if (context != null) buildCustomPalette(context) else Themes.TEYIN
+            else -> Themes.TEYIN
+        }
+
+    private fun buildCustomPalette(context: Context): Themes.Palette {
+        val prefs = PrefsManager.getInstance(context)
+        val base = Themes.TEYIN
+        fun get(key: String, fallback: Int) = prefs.getCustomThemeColor(key, fallback)
+        return Themes.Palette(
+            h1 = get(PrefKeys.APP_THEME_H1, base.h1),
+            foreground = get(PrefKeys.APP_THEME_FOREGROUND, base.foreground),
+            bg_1 = get(PrefKeys.APP_THEME_BG_1, base.bg_1),
+            bg_2 = get(PrefKeys.APP_THEME_BG_2, base.bg_2),
+            bg_3 = get(PrefKeys.APP_THEME_BG_3, base.bg_3),
+            bg_4 = get(PrefKeys.APP_THEME_BG_4, base.bg_4),
+            bg_display = get(PrefKeys.APP_THEME_BG_DISPLAY, base.bg_display),
+            media_background = get(PrefKeys.APP_THEME_MEDIA_BACKGROUND, base.media_background),
+            accent_1 = get(PrefKeys.APP_THEME_ACCENT_1, base.accent_1),
+            accent_2 = get(PrefKeys.APP_THEME_ACCENT_2, base.accent_2),
+            accent_3 = get(PrefKeys.APP_THEME_ACCENT_3, base.accent_3),
+            accent_4 = get(PrefKeys.APP_THEME_ACCENT_4, base.accent_4),
+            disabled = get(PrefKeys.APP_THEME_DISABLED, base.disabled),
+            input = get(PrefKeys.APP_THEME_INPUT, base.input),
+            button_1 = get(PrefKeys.APP_THEME_BUTTON_1, base.button_1),
+            button_1_selected = get(PrefKeys.APP_THEME_BUTTON_1_SELECTED, base.button_1_selected),
+            button_2 = get(PrefKeys.APP_THEME_BUTTON_2, base.button_2),
+            danger = get(PrefKeys.APP_THEME_DANGER, base.danger),
+            collapsible_header = get(
+                PrefKeys.APP_THEME_COLLAPSIBLE_HEADER,
+                base.collapsible_header
+            ),
+            icon = get(PrefKeys.APP_THEME_ICON, base.icon),
+            progressbar = get(PrefKeys.APP_THEME_PROGRESS_BAR, base.progressbar),
+            progressbar_rest = get(PrefKeys.APP_THEME_PROGRESS_BAR_REST, base.progressbar_rest),
+            suggestion = get(
+                PrefKeys.APP_THEME_SUGGESTION,
+                base.suggestion
+            ),
+        )
+    }
+
+    fun applyTheme(context: Context, root: View) {
+        val prefs = PrefsManager.getInstance(context)
+        val palette = paletteFor(prefs.getTheme(), context)
+        val typeface = FontManager.getTypeface(context, prefs.getFontStyle())
+        applyRecursively(context, root, palette, typeface)
+    }
+
+    private fun applyRecursively(
+        context: Context,
+        view: View,
+        palette: Themes.Palette,
+        typeface: android.graphics.Typeface?
+    ) {
+        applyToView(context, view, palette, typeface)
+        if (view is ViewGroup) {
+            for (i in 0 until view.childCount)
+                applyRecursively(context, view.getChildAt(i), palette, typeface)
+        }
+    }
+
+    private fun applyToView(
+        context: Context,
+        view: View,
+        palette: Themes.Palette,
+        typeface: android.graphics.Typeface?
+    ) {
+        if (view is TextView) {
+            typeface?.let { view.typeface = it }
+            when (view) {
+                is RadioButton, is CheckBox -> {
+                    view.setTextColor(palette.foreground)
+                    view.buttonTintList = ColorStateList(
+                        arrayOf(
+                            intArrayOf(android.R.attr.state_checked),
+                            intArrayOf(-android.R.attr.state_checked)
+                        ),
+                        intArrayOf(palette.accent_1, palette.disabled)
+                    )
+                }
+
+                else -> {
+                    val mapped = mapColor(context, view.currentTextColor, palette)
+                    if (mapped != null) view.setTextColor(mapped)
+                }
+            }
+        }
+
+        if (view is ImageView) {
+            val tint = view.imageTintList?.defaultColor
+            if (tint != null) {
+                val mapped = mapColor(context, tint, palette) ?: palette.icon
+                view.imageTintList = ColorStateList.valueOf(mapped)
+            }
+        }
+
+        val currentColor = resolveDrawableColor(view.background ?: return) ?: return
+        val mapped = mapColor(context, currentColor, palette) ?: return
+        view.setBackgroundColor(mapped)
+    }
+
+    private val builtInThemes = listOf(
+        Themes.TEYIN, Themes.MAKO, Themes.RAMA,
+        Themes.CATPPUCCIN_MOCHA, Themes.CATPPUCCIN_LATTE,
+        Themes.DRACULA, Themes.MELANGE, Themes.TOKYO_NIGHT,
+    )
+
+    private fun createColorMap(context: Context, target: Themes.Palette): Map<Int, Int> {
+        val custom = buildCustomPalette(context)
+        val res = context.resources
+        val palettes = builtInThemes + custom
+
+        return buildMap {
+            fun slot(selector: (Themes.Palette) -> Int, dest: Int) {
+                palettes.forEach { put(selector(it), dest) }
+            }
+
+            slot({ it.h1 }, target.h1)
+            slot({ it.foreground }, target.foreground)
+            slot({ it.icon }, target.icon)
+
+            slot({ it.bg_1 }, target.bg_1)
+            slot({ it.bg_2 }, target.bg_2)
+            slot({ it.bg_3 }, target.bg_3)
+            slot({ it.bg_4 }, target.bg_4)
+            slot({ it.bg_display }, target.bg_display)
+
+            slot({ it.accent_1 }, target.accent_1)
+            slot({ it.accent_2 }, target.accent_2)
+            slot({ it.accent_3 }, target.accent_3)
+            slot({ it.accent_4 }, target.accent_4)
+
+            slot({ it.disabled }, target.disabled)
+            slot({ it.input }, target.input)
+
+            slot({ it.button_1 }, target.button_1)
+            slot({ it.button_1_selected }, target.button_1_selected)
+            slot({ it.button_2 }, target.button_2)
+
+            slot({ it.danger }, target.danger)
+            slot({ it.collapsible_header }, target.collapsible_header)
+            slot({ it.media_background }, target.media_background)
+            slot({ it.progressbar }, target.progressbar)
+            slot({ it.progressbar_rest }, target.progressbar_rest)
+            slot({ it.suggestion }, target.suggestion)
+
+            put(res.getColor(R.color.h1), target.h1)
+            put(res.getColor(R.color.foreground), target.foreground)
+            put(res.getColor(R.color.icon), target.icon)
+            put(res.getColor(R.color.bg_1), target.bg_1)
+            put(res.getColor(R.color.bg_2), target.bg_2)
+            put(res.getColor(R.color.bg_3), target.bg_3)
+            put(res.getColor(R.color.bg_4), target.bg_4)
+            put(res.getColor(R.color.bg_display), target.bg_display)
+            put(res.getColor(R.color.accent_1), target.accent_1)
+            put(res.getColor(R.color.accent_2), target.accent_2)
+            put(res.getColor(R.color.accent_3), target.accent_3)
+            put(res.getColor(R.color.accent_4), target.accent_4)
+            put(res.getColor(R.color.disabled), target.disabled)
+            put(res.getColor(R.color.input), target.input)
+            put(res.getColor(R.color.button_1), target.button_1)
+            put(res.getColor(R.color.button_1_selected), target.button_1_selected)
+            put(res.getColor(R.color.button_2), target.button_2)
+            put(res.getColor(R.color.danger), target.danger)
+            put(res.getColor(R.color.collapsible_header), target.collapsible_header)
+            put(res.getColor(R.color.media_background), target.media_background)
+            put(res.getColor(R.color.progressbar), target.progressbar)
+            put(res.getColor(R.color.progressbar_2), target.progressbar_rest)
+            put(res.getColor(R.color.suggestion), target.suggestion)
+        }
+    }
+
+    private fun mapColor(context: Context, color: Int, palette: Themes.Palette): Int? =
+        createColorMap(context, palette)[color]
+
+    private fun resolveDrawableColor(drawable: android.graphics.drawable.Drawable): Int? =
+        (drawable as? ColorDrawable)?.color
+}
diff --git a/src/main/java/com/rama/bohio/obejcts/PrefKeys.kt b/src/main/java/com/rama/bohio/obejcts/PrefKeys.kt
index a77924e..c215ef5 100644
--- a/src/main/java/com/rama/bohio/obejcts/PrefKeys.kt
+++ b/src/main/java/com/rama/bohio/obejcts/PrefKeys.kt
@@ -1,29 +1,37 @@
 package com.rama.bohio.objects
 
 object PrefKeys {
-    val APPS_ICONS = "apps:icons"
     val FONT_STYLE = "font:style"
     val FONT_CUSTOM_PATH = "font:custom_path"
     val APP_LANGUAGE = "app:language"
     val SYSTEM_BAR_VISIBLE = "system:bar:visible"
     val SYSTEM_PREVENT_ROTATION = "system:prevent_rotation"
+    val SYSTEM_PREVENT_SLEEP = "system:prevent_sleeping"
 
+    val APP_THEME_PROGRESS_BAR = "app:theme:progress"
+    val APP_THEME_PROGRESS_BAR_REST = "app:theme:progress_rest"
+    val APP_THEME_MEDIA_BACKGROUND = "app:theme:media_background"
+    val APP_THEME_BG_DISPLAY = "app:theme:bg_display"
     val APP_THEME_NAME = "app:theme:name"
     val APP_THEME_H1 = "app:theme:clock"
     val APP_THEME_FOREGROUND = "app:theme:foreground"
     val APP_THEME_BG_1 = "app:theme:bg_1"
     val APP_THEME_BG_2 = "app:theme:bg_2"
     val APP_THEME_BG_3 = "app:theme:bg_3"
+    val APP_THEME_BG_4 = "app:theme:bg_4"
     val APP_THEME_ACCENT_1 = "app:theme:accent_1"
     val APP_THEME_ACCENT_2 = "app:theme:accent_2"
     val APP_THEME_ACCENT_3 = "app:theme:accent_3"
+    val APP_THEME_ACCENT_4 = "app:theme:accent_4"
     val APP_THEME_DISABLED = "app:theme:disabled"
     val APP_THEME_INPUT = "app:theme:input"
     val APP_THEME_BUTTON_1 = "app:theme:button_1"
+    val APP_THEME_BUTTON_1_SELECTED = "app:theme:button_1_selected"
     val APP_THEME_BUTTON_2 = "app:theme:button_2"
     val APP_THEME_DANGER = "app:theme:danger"
     val APP_THEME_COLLAPSIBLE_HEADER = "app:theme:collapsible_header"
     val APP_THEME_ICON = "app:theme:icon"
+    val APP_THEME_SUGGESTION = "app:theme:suggestion"
 
     val SETTINGS_SECTION_FONTS = "settings:section:fonts"
     val SETTINGS_SECTION_SYSTEM = "settings:section:system"
diff --git a/src/main/java/com/rama/bohio/obejcts/Themes.kt b/src/main/java/com/rama/bohio/obejcts/Themes.kt
index 679efc4..96033ef 100644
--- a/src/main/java/com/rama/bohio/obejcts/Themes.kt
+++ b/src/main/java/com/rama/bohio/obejcts/Themes.kt
@@ -2,40 +2,56 @@ package com.rama.bohio.objects
 
 object Themes {
     data class Palette(
+        val h1: Int,
         val foreground: Int,
         val bg_1: Int,
         val bg_2: Int,
         val bg_3: Int,
+        val bg_4: Int,
+        val bg_display: Int,
         val accent_1: Int,
         val accent_2: Int,
         val accent_3: Int,
+        val accent_4: Int,
         val disabled: Int,
         val input: Int,
         val button_1: Int,
+        val button_1_selected: Int,
         val button_2: Int,
         val danger: Int,
         val collapsible_header: Int,
         val icon: Int,
-        val h1: Int,
+        val media_background: Int,
+        val progressbar: Int,
+        val progressbar_rest: Int,
+        val suggestion: Int,
     )
 
     // Teyin (default)
     val TEYIN = Palette(
+        h1 = 0xFFEAE6DE.toInt(),
         foreground = 0xFFEAE6DF.toInt(),
         bg_1 = 0xFF0E181A.toInt(),
         bg_2 = 0xFF162A2E.toInt(),
         bg_3 = 0xFF1E383D.toInt(),
+        bg_4 = 0xFF28484D.toInt(),
+        bg_display = 0xFF081012.toInt(),
         accent_1 = 0xFF4DA8AC.toInt(),
         accent_2 = 0xFFD4AF37.toInt(),
         accent_3 = 0xFFC77D4D.toInt(),
+        accent_4 = 0xFF6A9FCF.toInt(),
         disabled = 0xFF5D7A7C.toInt(),
         input = 0xFF0C1416.toInt(),
         button_1 = 0xFF3A9DA0.toInt(),
+        button_1_selected = 0xFF6BC1C4.toInt(),
         button_2 = 0xFFC49B2E.toInt(),
         danger = 0xFFB83A2D.toInt(),
         collapsible_header = 0xFF7A9495.toInt(),
         icon = 0xFFC8C2B8.toInt(),
-        h1 = 0xFFEAE6DF.toInt(),
+        media_background = 0xFF5E9FA3.toInt(),
+        progressbar = 0xFF31585B.toInt(),
+        progressbar_rest = 0xFF3F7268.toInt(),
+        suggestion = 0xFF6A9FCF.toInt(),
     )
 
     // Mako
@@ -47,6 +63,7 @@ object Themes {
         accent_1 = 0xFFABD68E.toInt(),
         accent_2 = 0xFFCDC58B.toInt(),
         accent_3 = 0xFFDCD07C.toInt(),
+        accent_4 = 0xFF7CB1DC.toInt(),
         disabled = 0xFF888888.toInt(),
         input = 0xFF16161F.toInt(),
         button_1 = 0xFF459984.toInt(),
@@ -55,6 +72,13 @@ object Themes {
         collapsible_header = 0xFF878787.toInt(),
         icon = 0xFFCBCBCB.toInt(),
         h1 = 0xFFCACACA.toInt(),
+        bg_4 = 0xFF2E324D.toInt(),
+        bg_display = 0xFF000010.toInt(),
+        media_background = 0xFF6D8C99.toInt(),
+        button_1_selected = 0xFF5DB89F.toInt(),
+        progressbar = 0xFF3D4E36.toInt(),
+        progressbar_rest = 0xFF4A6E3A.toInt(),
+        suggestion = 0xFF71ACC7.toInt(),
     )
 
     // Rama
@@ -66,14 +90,22 @@ object Themes {
         accent_1 = 0xFFABD68E.toInt(),
         accent_2 = 0xFFCDC58B.toInt(),
         accent_3 = 0xFFDCD07C.toInt(),
+        accent_4 = 0xFF6D9978.toInt(),
         disabled = 0xFF888888.toInt(),
         input = 0xFF161f16.toInt(),
         button_1 = 0xFF45995a.toInt(),
         button_2 = 0xFFb8e39d.toInt(),
         danger = 0xFFDC6364.toInt(),
-        collapsible_header = 0xff8cde285.toInt(),
+        collapsible_header = 0xFF8DE285.toInt(),
         icon = 0xFFd4efc3.toInt(),
         h1 = 0xFFABD68E.toInt(),
+        bg_4 = 0xFF3A4D2E.toInt(),
+        bg_display = 0xFF000A00.toInt(),
+        media_background = 0xFF6D9978.toInt(),
+        button_1_selected = 0xFFC4E7AD.toInt(),
+        progressbar = 0xFF4F6B45.toInt(),
+        progressbar_rest = 0xFF4D7A4E.toInt(),
+        suggestion = 0xFF7CCF8E.toInt(),
     )
 
     // Catppuccin Mocha
@@ -85,6 +117,7 @@ object Themes {
         accent_1 = 0xFFA6E3A1.toInt(),
         accent_2 = 0xFFF9E2AF.toInt(),
         accent_3 = 0xFFFFD700.toInt(),
+        accent_4 = 0xFF89B4FA.toInt(),
         disabled = 0xFF6C7086.toInt(),
         input = 0xFF181825.toInt(),
         button_1 = 0xFF89B4FA.toInt(),
@@ -93,6 +126,13 @@ object Themes {
         collapsible_header = 0xFFB4BEFE.toInt(),
         icon = 0xFFCDD6F4.toInt(),
         h1 = 0xFFCBA6F7.toInt(),
+        bg_4 = 0xFF585B70.toInt(),
+        bg_display = 0xFF11111B.toInt(),
+        media_background = 0xFF89B4FA.toInt(),
+        button_1_selected = 0xFFDDBBFF.toInt(),
+        progressbar = 0xFF5E4A73.toInt(),
+        progressbar_rest = 0xFF587D52.toInt(),
+        suggestion = 0xFF89DCEB.toInt(),
     )
 
     val CATPPUCCIN_LATTE = Palette(
@@ -100,21 +140,25 @@ object Themes {
         bg_1 = 0xFFEFF1F5.toInt(),
         bg_2 = 0xFFCCD0DA.toInt(),
         bg_3 = 0xFFBCC0CC.toInt(),
-
         accent_1 = 0xFF40A02B.toInt(),
         accent_2 = 0xFFDF8E1D.toInt(),
         accent_3 = 0xFFFE640B.toInt(),
-
+        accent_4 = 0xFF04A5E5.toInt(),
         disabled = 0xFF9CA0B0.toInt(),
         input = 0xFFE6E9EF.toInt(),
-
         button_1 = 0xFF1E66F5.toInt(),
         button_2 = 0xFF04A5E5.toInt(),
-
         danger = 0xFFD20F39.toInt(),
         collapsible_header = 0xFF7287FD.toInt(),
         icon = 0xFF4C4F69.toInt(),
-        h1 = 0xFF8839EF.toInt()
+        h1 = 0xFF8839EF.toInt(),
+        bg_4 = 0xFFBCC0CC.toInt(),
+        bg_display = 0xFFDCE0E8.toInt(),
+        media_background = 0xFF04A5E5.toInt(),
+        button_1_selected = 0xFFA16CF5.toInt(),
+        progressbar = 0xFFB7D6A8.toInt(),
+        progressbar_rest = 0xFF8CCB9A.toInt(),
+        suggestion = 0xFF04A5E5.toInt(),
     )
 
 
@@ -127,6 +171,7 @@ object Themes {
         accent_1 = 0xFF50FA7B.toInt(),
         accent_2 = 0xFFF1FA8C.toInt(),
         accent_3 = 0xFFFFB86C.toInt(),
+        accent_4 = 0xFF8BE9FD.toInt(),
         disabled = 0xFF6272A4.toInt(),
         input = 0xFF21222C.toInt(),
         button_1 = 0xFFBD93F9.toInt(),
@@ -135,9 +180,16 @@ object Themes {
         collapsible_header = 0xFFBD93F9.toInt(),
         icon = 0xFFF8F8F2.toInt(),
         h1 = 0xFFBD93F9.toInt(),
+        bg_4 = 0xFF4F5163.toInt(),
+        bg_display = 0xFF1A1B26.toInt(),
+        media_background = 0xFF8BE9FD.toInt(),
+        button_1_selected = 0xFFD1B3FF.toInt(),
+        progressbar = 0xFF5A4A75.toInt(),
+        progressbar_rest = 0xFF3E5F4A.toInt(),
+        suggestion = 0xFF8BE9FD.toInt(),
     )
 
-    // Melange Dark
+    // Mélange Dark
     val MELANGE = Palette(
         foreground = 0xFFECE1D7.toInt(),
         bg_1 = 0xFF292522.toInt(),
@@ -146,6 +198,7 @@ object Themes {
         accent_1 = 0xFF78997A.toInt(),
         accent_2 = 0xFFEBC06D.toInt(),
         accent_3 = 0xFFE49B5D.toInt(),
+        accent_4 = 0xFF8CBBA3.toInt(),
         disabled = 0xFF867462.toInt(),
         input = 0xFF211E1B.toInt(),
         button_1 = 0xFF7F91B2.toInt(),
@@ -154,6 +207,13 @@ object Themes {
         collapsible_header = 0xFFEBC06D.toInt(),
         icon = 0xFFECE1D7.toInt(),
         h1 = 0xFFEBC06D.toInt(),
+        bg_4 = 0xFF4D463E.toInt(),
+        bg_display = 0xFF161311.toInt(),
+        media_background = 0xFF8CBBA3.toInt(),
+        button_1_selected = 0xFFF4D18D.toInt(),
+        progressbar = 0xFF5C4A2B.toInt(),
+        progressbar_rest = 0xFF5A6650.toInt(),
+        suggestion = 0xFF8CBBA3.toInt(),
     )
 
     // Tokyo Night
@@ -165,6 +225,7 @@ object Themes {
         accent_1 = 0xFF9ECE6A.toInt(),
         accent_2 = 0xFFE0AF68.toInt(),
         accent_3 = 0xFFFF9E64.toInt(),
+        accent_4 = 0xFF2AC3DE.toInt(),
         disabled = 0xFF565F89.toInt(),
         input = 0xFF16161E.toInt(),
         button_1 = 0xFF7AA2F7.toInt(),
@@ -173,5 +234,12 @@ object Themes {
         collapsible_header = 0xFF7AA2F7.toInt(),
         icon = 0xFFC0CAF5.toInt(),
         h1 = 0xFF7AA2F7.toInt(),
+        bg_4 = 0xFF2E324D.toInt(),
+        bg_display = 0xFF0D0E17.toInt(),
+        media_background = 0xFF73DACA.toInt(),
+        button_1_selected = 0xFFA3C1FF.toInt(),
+        progressbar = 0xFF34456B.toInt(),
+        progressbar_rest = 0xFF3B5A4F.toInt(),
+        suggestion = 0xFF73DACA.toInt(),
     )
 }
\ No newline at end of file
diff --git a/src/main/java/com/rama/bohio/util/LocaleHelper.kt b/src/main/java/com/rama/bohio/util/LocaleHelper.kt
new file mode 100644
index 0000000..317959f
--- /dev/null
+++ b/src/main/java/com/rama/bohio/util/LocaleHelper.kt
@@ -0,0 +1,60 @@
+package com.rama.bohio.util
+
+import android.content.Context
+import android.content.res.Configuration
+import android.os.Build
+import com.rama.bohio.objects.PrefLanguage
+import java.util.Locale
+
+object LocaleHelper {
+
+    fun wrapContext(context: Context): Context {
+        val langCode = readLanguagePref(context)
+
+        if (langCode == PrefLanguage.SYSTEM || langCode.isBlank()) return context
+
+        val locale = Locale(langCode)
+        Locale.setDefault(locale)
+
+        val config = Configuration(context.resources.configuration)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            config.setLocale(locale)
+        } else {
+            @Suppress("DEPRECATION")
+            config.locale = locale
+        }
+
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            context.createConfigurationContext(config)
+        } else {
+            @Suppress("DEPRECATION")
+            context.resources.updateConfiguration(config, context.resources.displayMetrics)
+            context
+        }
+    }
+
+    // Returns the BCP-47 tag for the currently active locale.
+    fun currentLanguageTag(context: Context): String =
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+            context.resources.configuration.locales[0].toLanguageTag()
+        else
+            @Suppress("DEPRECATION")
+            context.resources.configuration.locale.toLanguageTag()
+
+    fun getCurrentLocale(configuration: Configuration): Locale {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            configuration.locales[0]
+        } else {
+            @Suppress("DEPRECATION")
+            configuration.locale
+        }
+    }
+
+    private fun readLanguagePref(context: Context): String {
+        return context
+            .getSharedPreferences("settings", Context.MODE_PRIVATE)
+            .getString("app:language", PrefLanguage.SYSTEM)
+            ?: PrefLanguage.SYSTEM
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/rama/bohio/widgets/HSVSquareView.kt b/src/main/java/com/rama/bohio/widgets/HSVSquareView.kt
index b284fc7..07d1b38 100644
--- a/src/main/java/com/rama/bohio/widgets/HSVSquareView.kt
+++ b/src/main/java/com/rama/bohio/widgets/HSVSquareView.kt
@@ -1,4 +1,4 @@
-package com.rama.bohio.widgets.color
+package com.rama.bohio.widgets
 
 import android.content.Context
 import android.graphics.Bitmap
@@ -85,6 +85,7 @@ class HSVSquareView @JvmOverloads constructor(
                 onSaturationValueChanged?.invoke(s, v)
                 return true
             }
+
             MotionEvent.ACTION_UP -> {
                 performClick()
                 return true
diff --git a/src/main/java/com/rama/bohio/widgets/HueStripView.kt b/src/main/java/com/rama/bohio/widgets/HueStripView.kt
index 7ea6a02..18eb1b2 100644
--- a/src/main/java/com/rama/bohio/widgets/HueStripView.kt
+++ b/src/main/java/com/rama/bohio/widgets/HueStripView.kt
@@ -1,4 +1,4 @@
-package com.rama.bohio.widgets.color
+package com.rama.bohio.widgets
 
 import android.content.Context
 import android.graphics.*
@@ -56,6 +56,7 @@ class HueStripView @JvmOverloads constructor(
                 invalidate()
                 return true
             }
+
             MotionEvent.ACTION_UP -> {
                 performClick()
                 return true
diff --git a/src/main/java/com/rama/bohio/widgets/WDColorPickerDialog.kt_temp b/src/main/java/com/rama/bohio/widgets/WDColorPickerDialog.kt_temp
deleted file mode 100644
index db41aed..0000000
--- a/src/main/java/com/rama/bohio/widgets/WDColorPickerDialog.kt_temp
+++ /dev/null
@@ -1,121 +0,0 @@
-// package com.rama.teyin.dialogs
-
-// import android.app.Activity
-// import android.app.Dialog
-// import android.graphics.Color
-// import android.view.LayoutInflater
-// import android.view.View
-// import android.view.ViewGroup.LayoutParams.MATCH_PARENT
-// import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
-// import android.widget.Button
-// import android.widget.EditText
-// import android.widget.Toast
-// import com.rama.teyin.R
-// import com.rama.teyin.managers.ThemeManager
-// import com.rama.teyin.widgets.color.HSVSquareView
-// import com.rama.teyin.widgets.color.HueStripView
-
-// object ColorPickerDialog {
-
-//     fun show(
-//         activity: Activity,
-//         initialColor: Int,
-//         onColorSelected: (Int) -> Unit
-//     ) {
-
-//         val dialog = Dialog(activity)
-
-//         val view = LayoutInflater.from(activity)
-//             .inflate(R.layout.wd_color_picker_dialog, null)
-
-//         dialog.setContentView(view)
-//         dialog.window?.setLayout(
-//             MATCH_PARENT,
-//             WRAP_CONTENT
-//         )
-
-//         ThemeManager.applyTheme(activity, view)
-
-//         // Views
-//         val preview = view.findViewById<View>(R.id.preview)
-//         val hexInput = view.findViewById<EditText>(R.id.hex_input)
-//         val applyButton = view.findViewById<Button>(R.id.apply_button)
-//         val closeButton = view.findViewById<Button>(R.id.close_button)
-
-//         val hsvSquare = view.findViewById<HSVSquareView>(R.id.hsv_square)
-//         val hueSlider = view.findViewById<HueStripView>(R.id.hue_slider)
-
-//         // HSV state (single source of truth)
-//         val hsv = floatArrayOf(0f, 0f, 0f)
-//         Color.colorToHSV(initialColor, hsv)
-
-//         var hue = hsv[0]
-//         var saturation = hsv[1]
-//         var value = hsv[2]
-
-//         fun updateUI() {
-//             val color = Color.HSVToColor(floatArrayOf(hue, saturation, value))
-
-//             preview.background.setTint(color)
-
-//             hexInput.setText(
-//                 String.format("#%06X", 0xFFFFFF and color)
-//             )
-
-//             hsvSquare.setHue(hue)
-//         }
-
-//         // init
-//         updateUI()
-
-//         // Hue slider → updates square + preview
-//         hueSlider.onHueChanged = { newHue ->
-//             hue = newHue
-//             updateUI()
-//         }
-
-//         // HSV square → updates S/V + preview
-//         hsvSquare.onSaturationValueChanged = { s, v ->
-//             saturation = s
-//             value = v
-//             updateUI()
-//         }
-
-//         // Hex input sync (optional manual override)
-//         hexInput.setOnEditorActionListener { _, _, _ ->
-//             try {
-//                 val color = Color.parseColor(hexInput.text.toString())
-//                 Color.colorToHSV(color, hsv)
-
-//                 hue = hsv[0]
-//                 saturation = hsv[1]
-//                 value = hsv[2]
-
-//                 updateUI()
-
-//             } catch (_: Exception) {
-//                 Toast.makeText(
-//                     activity,
-//                     activity.getString(R.string.toast_invalid_color),
-//                     Toast.LENGTH_SHORT
-//                 ).show()
-//             }
-
-//             true
-//         }
-
-//         // Apply
-//         applyButton.setOnClickListener {
-//             val color = Color.HSVToColor(floatArrayOf(hue, saturation, value))
-//             onColorSelected(color)
-//             dialog.dismiss()
-//         }
-
-//         // Close
-//         closeButton.setOnClickListener {
-//             dialog.dismiss()
-//         }
-
-//         dialog.show()
-//     }
-// }
\ No newline at end of file
diff --git a/src/main/java/com/rama/bohio/widgets/WdCollapsibleSection.kt b/src/main/java/com/rama/bohio/widgets/WdCollapsibleSection.kt
new file mode 100644
index 0000000..3a8664e
--- /dev/null
+++ b/src/main/java/com/rama/bohio/widgets/WdCollapsibleSection.kt
@@ -0,0 +1,108 @@
+package com.rama.bohio.widgets
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.HapticFeedbackConstants
+import android.view.KeyEvent
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.LinearLayout
+import android.widget.TextView
+import com.rama.bohio.R
+import com.rama.bohio.managers.PrefsManager
+import com.rama.bohio.objects.PrefKeys
+
+class WdCollapsibleSection @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null
+) : LinearLayout(context, attrs) {
+
+    private val header: LinearLayout
+    private val indicator: TextView
+    private val labelView: TextView
+    private val content: LinearLayout
+
+    private var key: String? = null
+    private var defaultExpanded = true
+    private val prefs = PrefsManager.getInstance(context)
+
+    init {
+        orientation = VERTICAL
+        LayoutInflater.from(context).inflate(R.layout.wd_collapsible_section, this, true)
+
+        header = findViewById(R.id.section_header)
+        indicator = findViewById(R.id.section_indicator)
+        labelView = findViewById(R.id.section_label)
+        content = findViewById(R.id.section_content)
+
+        attrs?.let {
+            val ta = context.obtainStyledAttributes(it, R.styleable.WdCollapsibleSection)
+            labelView.text = ta.getString(R.styleable.WdCollapsibleSection_header) ?: ""
+            key = resolveKey(ta.getString(R.styleable.WdCollapsibleSection_key))
+            defaultExpanded = ta.getBoolean(R.styleable.WdCollapsibleSection_defaultExpanded, true)
+            ta.recycle()
+        }
+
+        applyState(loadState())
+
+        header.setOnClickListener {
+            it.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP)
+            val next = !isExpanded()
+            applyState(next)
+            saveState(next)
+        }
+
+        header.isFocusable = true
+        header.isFocusableInTouchMode = false
+        header.setOnKeyListener { v, keyCode, event ->
+            if (event.action == KeyEvent.ACTION_DOWN &&
+                (keyCode == KeyEvent.KEYCODE_ENTER || keyCode == KeyEvent.KEYCODE_DPAD_CENTER)
+            ) {
+                v.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP)
+                val next = !isExpanded()
+                applyState(next)
+                saveState(next)
+                true
+            } else false
+        }
+    }
+
+    private fun resolveKey(raw: String?): String? {
+        if (raw == null) return null
+        return try {
+            PrefKeys::class.java.getDeclaredField(raw).get(null) as? String
+        } catch (_: Exception) {
+            null
+        }
+    }
+
+    override fun onFinishInflate() {
+        super.onFinishInflate()
+        val children = (0 until childCount)
+            .map { getChildAt(it) }
+            .filter { it.id != R.id.section_root }
+        children.forEach { removeView(it); content.addView(it) }
+    }
+
+    fun addItem(view: View) {
+        content.addView(view)
+    }
+
+    fun clearItems() {
+        content.removeAllViews()
+    }
+
+    private fun isExpanded() = content.visibility == View.VISIBLE
+
+    private fun applyState(expanded: Boolean) {
+        content.visibility = if (expanded) View.VISIBLE else View.GONE
+        indicator.text = context.getString(
+            if (expanded) R.string.settings_section_collapse_indicator
+            else R.string.settings_section_expand_indicator
+        )
+    }
+
+    private fun saveState(expanded: Boolean) = key?.let { prefs.setBoolean(it, expanded) }
+
+    private fun loadState() = key?.let { prefs.getBoolean(it, defaultExpanded) } ?: defaultExpanded
+}
diff --git a/src/main/java/com/rama/bohio/widgets/WdCollapsibleSection.kt_temp b/src/main/java/com/rama/bohio/widgets/WdCollapsibleSection.kt_temp
deleted file mode 100644
index cee2b57..0000000
--- a/src/main/java/com/rama/bohio/widgets/WdCollapsibleSection.kt_temp
+++ /dev/null
@@ -1,142 +0,0 @@
-// package com.rama.teyin.widgets
-
-// import android.content.Context
-// import android.util.AttributeSet
-// import android.view.HapticFeedbackConstants
-// import android.view.KeyEvent
-// import android.view.LayoutInflater
-// import android.view.View
-// import android.widget.LinearLayout
-// import android.widget.TextView
-// import com.rama.bohio.R as BohioR
-// import com.rama.teyin.R
-// import com.rama.teyin.managers.PrefsManager
-
-// class WdCollapsibleSection @JvmOverloads constructor(
-//     context: Context,
-//     attrs: AttributeSet? = null
-// ) : LinearLayout(context, attrs) {
-
-//     private val header: LinearLayout
-//     private val indicator: TextView
-//     private val labelView: TextView
-//     private val content: LinearLayout
-
-//     private var key: String? = null
-//     private var defaultExpanded: Boolean = true
-//     private val prefs = PrefsManager.getInstance(context)
-
-//     init {
-//         orientation = VERTICAL
-
-//         LayoutInflater.from(context)
-//             .inflate(R.layout.wd_collapsible_section, this, true)
-
-//         header = findViewById(R.id.section_header)
-//         indicator = findViewById(R.id.section_indicator)
-//         labelView = findViewById(R.id.section_label)
-//         content = findViewById(R.id.section_content)
-
-//         // Read XML attrs
-//         attrs?.let {
-//             val ta = context.obtainStyledAttributes(it, BohioR.styleable.WdCollapsibleSection)
-
-//             labelView.text = ta.getString(BohioR.styleable.WdCollapsibleSection_header) ?: ""
-
-//             key = resolveKey(
-//                 ta.getString(BohioR.styleable.WdCollapsibleSection_key)
-//             )
-
-//             defaultExpanded = ta.getBoolean(
-//                 BohioR.styleable.WdCollapsibleSection_defaultExpanded,
-//                 true
-//             )
-
-//             ta.recycle()
-//         }
-
-//         val expanded = loadState()
-
-//         applyState(expanded)
-
-//         header.setOnClickListener {
-//             it.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP)
-
-//             val newState = !isExpanded()
-//             applyState(newState)
-//             saveState(newState)
-//         }
-
-//         header.isFocusable = true
-//         header.isFocusableInTouchMode = false
-//         header.setOnKeyListener { v, keyCode, event ->
-//             if (event.action == KeyEvent.ACTION_DOWN &&
-//                 (keyCode == KeyEvent.KEYCODE_ENTER || keyCode == KeyEvent.KEYCODE_DPAD_CENTER)
-//             ) {
-//                 v.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP)
-//                 val newState = !isExpanded()
-//                 applyState(newState)
-//                 saveState(newState)
-//                 true
-//             } else {
-//                 false
-//             }
-//         }
-//     }
-
-//     private fun resolveKey(raw: String?): String? {
-//         if (raw == null) return null
-
-//         return try {
-//             PrefsManager.PrefKeys::class.java
-//                 .getDeclaredField(raw)
-//                 .get(null) as? String
-//         } catch (e: Exception) {
-//             null
-//         }
-//     }
-
-//     // Inflate children inside component
-//     override fun onFinishInflate() {
-//         super.onFinishInflate()
-
-//         // Move all children (except internal layout) into content
-//         val children = mutableListOf<View>()
-
-//         for (i in 0 until childCount) {
-//             val child = getChildAt(i)
-//             if (child.id != R.id.section_root) {
-//                 children.add(child)
-//             }
-//         }
-
-//         children.forEach {
-//             removeView(it)
-//             content.addView(it)
-//         }
-//     }
-
-//     private fun isExpanded(): Boolean {
-//         return content.visibility == View.VISIBLE
-//     }
-
-//     private fun applyState(expanded: Boolean) {
-//         content.visibility = if (expanded) View.VISIBLE else View.GONE
-//         indicator.text =
-//             if (expanded) context.getString(R.string.settings_section_collapse_indicator) else context.getString(
-//                 R.string.settings_section_expand_indicator
-//             )
-//     }
-
-//     private fun saveState(expanded: Boolean) {
-//         key?.let {
-//             prefs.setBoolean("$it", expanded)
-//         }
-//     }
-
-//     private fun loadState(): Boolean {
-//         return key?.let {
-//             prefs.getBoolean("$it", defaultExpanded)
-//         } ?: defaultExpanded
-//     }
-// }
\ No newline at end of file
diff --git a/src/main/java/com/rama/bohio/widgets/WdColorPicker.kt b/src/main/java/com/rama/bohio/widgets/WdColorPicker.kt
new file mode 100644
index 0000000..498568b
--- /dev/null
+++ b/src/main/java/com/rama/bohio/widgets/WdColorPicker.kt
@@ -0,0 +1,71 @@
+package com.rama.bohio.widgets
+
+import android.app.Activity
+import android.content.Context
+import android.graphics.Color
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.LinearLayout
+import android.widget.TextView
+import com.rama.bohio.R
+import com.rama.bohio.dialogs.ColorPickerDialog
+
+class WdColorPicker @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null
+) : LinearLayout(context, attrs) {
+
+    private val title: TextView
+    private val hexValue: TextView
+    private val colorPreview: View
+
+    private var currentColor = Color.WHITE
+    private var listener: ((Int) -> Unit)? = null
+    private var useDefaultPicker = true
+
+    init {
+        orientation = HORIZONTAL
+        LayoutInflater.from(context).inflate(R.layout.wd_color_picker, this, true)
+
+        title        = findViewById(R.id.title)
+        hexValue     = findViewById(R.id.hexValue)
+        colorPreview = findViewById(R.id.colorPreview)
+
+        attrs?.let {
+            val ta = context.obtainStyledAttributes(it, intArrayOf(R.attr.text))
+            title.text = ta.getString(0) ?: ""
+            ta.recycle()
+        }
+
+        isClickable = true
+        isFocusable = true
+        isFocusableInTouchMode = false
+
+        updateUI()
+        setOnClickListener { handleClick() }
+    }
+
+    private fun handleClick() {
+        val activity = context as? Activity ?: return
+        if (useDefaultPicker) {
+            ColorPickerDialog.show(activity, currentColor) { color ->
+                setColor(color)
+                listener?.invoke(color)
+            }
+        } else {
+            listener?.invoke(currentColor)
+        }
+    }
+
+    fun setUseDefaultPicker(enabled: Boolean) { useDefaultPicker = enabled }
+    fun setTitle(text: String)                { title.text = text }
+    fun setColor(color: Int)                  { currentColor = color; updateUI() }
+    fun getColor(): Int                       = currentColor
+    fun setOnColorClickListener(cb: (Int) -> Unit) { listener = cb }
+
+    private fun updateUI() {
+        hexValue.text = String.format("#%06X", 0xFFFFFF and currentColor)
+        colorPreview.background.setTint(currentColor)
+    }
+}
diff --git a/src/main/java/com/rama/bohio/widgets/WdColorPicker.kt_temp b/src/main/java/com/rama/bohio/widgets/WdColorPicker.kt_temp
deleted file mode 100644
index ec4a554..0000000
--- a/src/main/java/com/rama/bohio/widgets/WdColorPicker.kt_temp
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.rama.bohio.widgets
-
-import android.app.Activity
-import android.content.Context
-import android.graphics.Color
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.view.View
-import android.widget.LinearLayout
-import android.widget.TextView
-import com.rama.bohio.R
-import com.rama.bohio.dialogs.ColorPickerDialog
-
-class WdColorPicker @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null
-) : LinearLayout(context, attrs) {
-
-    private val title: TextView
-    private val hexValue: TextView
-    private val colorPreview: View
-
-    private var currentColor: Int = Color.WHITE
-
-    // external override (optional)
-    private var listener: ((Int) -> Unit)? = null
-
-    // enables internal default picker
-    private var useDefaultPicker: Boolean = true
-
-    init {
-        orientation = HORIZONTAL
-
-        LayoutInflater.from(context)
-            .inflate(R.layout.wd_color_picker, this, true)
-
-        title = findViewById(R.id.title)
-        hexValue = findViewById(R.id.hexValue)
-        colorPreview = findViewById(R.id.colorPreview)
-
-        attrs?.let {
-            val ta = context.obtainStyledAttributes(
-                it,
-                intArrayOf(BohioR.attr.text)
-            )
-
-            title.text = ta.getString(0) ?: ""
-
-            ta.recycle()
-        }
-
-        isClickable = true
-        isFocusable = true
-        isFocusableInTouchMode = false
-
-        updateUI()
-
-        setOnClickListener {
-            handleClick()
-        }
-    }
-
-    private fun handleClick() {
-
-        val activity = context as? Activity ?: return
-
-        if (useDefaultPicker) {
-
-            ColorPickerDialog.show(
-                activity = activity,
-                initialColor = currentColor
-            ) { selectedColor ->
-
-                setColor(selectedColor)
-                listener?.invoke(selectedColor)
-            }
-
-        } else {
-            listener?.invoke(currentColor)
-        }
-    }
-
-    fun setUseDefaultPicker(enabled: Boolean) {
-        useDefaultPicker = enabled
-    }
-
-    fun setTitle(text: String) {
-        title.text = text
-    }
-
-    fun setColor(color: Int) {
-        currentColor = color
-        updateUI()
-    }
-
-    fun getColor(): Int {
-        return currentColor
-    }
-
-    fun setOnColorClickListener(callback: (Int) -> Unit) {
-        listener = callback
-    }
-
-    private fun updateUI() {
-        val hex = String.format("#%06X", 0xFFFFFF and currentColor)
-
-        hexValue.text = hex
-        colorPreview.background.setTint(currentColor)
-    }
-}
\ No newline at end of file
diff --git a/src/main/res/drawable/px_battery_full_alt.xml b/src/main/res/drawable/px_battery_full_alt.xml
new file mode 100644
index 0000000..e9a5d22
--- /dev/null
+++ b/src/main/res/drawable/px_battery_full_alt.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@color/foreground"
+        android:pathData="M200,680q-17,0 -28.5,-11.5T160,640v-80L80,560v-160h80v-80q0,-17 11.5,-28.5T200,280h640q17,0 28.5,11.5T880,320v320q0,17 -11.5,28.5T840,680L200,680Z" />
+</vector>
diff --git a/src/main/res/drawable/px_bullet_list.xml b/src/main/res/drawable/px_bullet_list.xml
new file mode 100644
index 0000000..d1c89be
--- /dev/null
+++ b/src/main/res/drawable/px_bullet_list.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/foreground"
+        android:pathData="M2,5L2,8L5,8L5,5L2,5zM10,5L10,6L9,6L9,7L10,7L10,8L22,8L22,7L23,7L23,6L22,6L22,5L10,5zM2,11L2,14L5,14L5,11L2,11zM10,11L10,12L9,12L9,13L10,13L10,14L22,14L22,13L23,13L23,12L22,12L22,11L10,11zM2,17L2,20L5,20L5,17L2,17zM10,17L10,18L9,18L9,19L10,19L10,20L22,20L22,19L23,19L23,18L22,18L22,17L10,17z" />
+</vector>
diff --git a/src/main/res/drawable/px_calendar_today.xml b/src/main/res/drawable/px_calendar_today.xml
new file mode 100644
index 0000000..8855613
--- /dev/null
+++ b/src/main/res/drawable/px_calendar_today.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@color/foreground"
+        android:pathData="M200,880q-33,0 -56.5,-23.5T120,800v-560q0,-33 23.5,-56.5T200,160h40v-80h80v80h320v-80h80v80h40q33,0 56.5,23.5T840,240v560q0,33 -23.5,56.5T760,880L200,880ZM200,800h560v-400L200,400v400Z" />
+</vector>
diff --git a/src/main/res/drawable/px_chevron_down.xml b/src/main/res/drawable/px_chevron_down.xml
new file mode 100644
index 0000000..b1d3fa2
--- /dev/null
+++ b/src/main/res/drawable/px_chevron_down.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/foreground"
+        android:pathData="M23,8l0,1l-1,0l0,1l-1,0l0,1l-1,0l0,1l-1,0l0,1l-1,0l0,1l-1,0l0,1l-1,0l0,1l-1,0l0,1l-1,0l0,1l-1,0l0,1l-2,0l0,-1l-1,0l0,-1l-1,0l0,-1l-1,0l0,-1l-1,0l0,-1l-1,0l0,-1l-1,0l0,-1l-1,0l0,-1l-1,0l0,-1l-1,0l0,-1l-1,0l0,-1l1,0l0,-1l1,0l0,-1l1,0l0,1l1,0l0,1l1,0l0,1l1,0l0,1l1,0l0,1l1,0l0,1l1,0l0,1l1,0l0,1l2,0l0,-1l1,0l0,-1l1,0l0,-1l1,0l0,-1l1,0l0,-1l1,0l0,-1l1,0l0,-1l1,0l0,-1l1,0l0,1l1,0l0,1l1,0z" />
+</vector>
diff --git a/src/main/res/drawable/px_chevron_up.xml b/src/main/res/drawable/px_chevron_up.xml
new file mode 100644
index 0000000..e30071e
--- /dev/null
+++ b/src/main/res/drawable/px_chevron_up.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/foreground"
+        android:pathData="M23,16l0,1l-1,0l0,1l-1,0l0,1l-1,0l0,-1l-1,0l0,-1l-1,0l0,-1l-1,0l0,-1l-1,0l0,-1l-1,0l0,-1l-1,0l0,-1l-1,0l0,-1l-2,0l0,1l-1,0l0,1l-1,0l0,1l-1,0l0,1l-1,0l0,1l-1,0l0,1l-1,0l0,1l-1,0l0,1l-1,0l0,-1l-1,0l0,-1l-1,0l0,-1l1,0l0,-1l1,0l0,-1l1,0l0,-1l1,0l0,-1l1,0l0,-1l1,0l0,-1l1,0l0,-1l1,0l0,-1l1,0l0,-1l1,0l0,-1l2,0l0,1l1,0l0,1l1,0l0,1l1,0l0,1l1,0l0,1l1,0l0,1l1,0l0,1l1,0l0,1l1,0l0,1l1,0l0,1l1,0z" />
+</vector>
diff --git a/src/main/res/drawable/px_disc.xml b/src/main/res/drawable/px_disc.xml
new file mode 100644
index 0000000..be7d197
--- /dev/null
+++ b/src/main/res/drawable/px_disc.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/accent_4"
+        android:pathData="M9,1L9,2L7,2L7,3L5,3L5,4L4,4L4,5L3,5L3,7L2,7L2,9L1,9L1,15L2,15L2,17L3,17L3,19L4,19L4,20L5,20L5,21L7,21L7,22L9,22L9,23L15,23L15,22L17,22L17,21L19,21L19,20L20,20L20,19L21,19L21,17L22,17L22,15L23,15L23,9L22,9L22,7L21,7L21,5L20,5L20,4L19,4L19,3L17,3L17,2L15,2L15,1L9,1zM9.641,8.461L14.359,8.461L14.359,9.641L15.539,9.641L15.539,14.359L14.359,14.359L14.359,15.539L9.641,15.539L9.641,14.359L8.461,14.359L8.461,9.641L9.641,9.641L9.641,8.461zM11.135,10.27L11.135,11.135L10.27,11.135L10.27,12.865L11.135,12.865L11.135,13.73L12.865,13.73L12.865,12.865L13.73,12.865L13.73,11.135L12.865,11.135L12.865,10.27L11.135,10.27z" />
+</vector>
diff --git a/src/main/res/drawable/px_eye_cross.xml b/src/main/res/drawable/px_eye_cross.xml
new file mode 100644
index 0000000..312b15c
--- /dev/null
+++ b/src/main/res/drawable/px_eye_cross.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/foreground"
+        android:pathData="M20,2L20,3L19,3L19,4L18,4L18,5L17,5L17,6L16,6L16,7L15,7L15,8L14,8L14,9L13,9L13,10L12,10L12,11L11,11L11,12L10,12L10,13L9,13L9,14L8,14L8,15L7,15L7,16L6,16L6,17L5,17L5,18L4,18L4,19L3,19L3,20L2,20L2,21L3,21L3,22L4,22L4,21L5,21L5,20L6,20L6,19L7,19L7,18L8,18L8,17L9,17L9,16L10,16L10,15L11,15L11,14L12,14L12,13L13,13L13,12L14,12L14,11L15,11L15,10L16,10L16,9L17,9L17,8L18,8L18,7L19,7L19,6L20,6L20,5L21,5L21,4L22,4L22,3L21,3L21,2L20,2zM7,5L7,6L5,6L5,7L4,7L4,8L3,8L3,9L2,9L2,11L1,11L1,13L2,13L2,15L3,15L3,16L5,16L5,15L6,15L6,14L7,14L7,13L6,13L6,11L7,11L7,9L8,9L8,8L9,8L9,7L11,7L11,6L13,6L13,7L14,7L14,6L15,6L15,5L7,5zM11,8L11,9L12,9L12,8L11,8zM19,8L19,9L18,9L18,10L17,10L17,11L18,11L18,13L17,13L17,15L16,15L16,16L15,16L15,17L13,17L13,18L11,18L11,17L10,17L10,18L9,18L9,19L17,19L17,18L19,18L19,17L20,17L20,16L21,16L21,15L22,15L22,13L23,13L23,11L22,11L22,9L21,9L21,8L19,8zM8,11L8,12L9,12L9,11L8,11zM15,12L15,13L16,13L16,12L15,12zM15,13L14,13L14,14L15,14L15,13zM14,14L13,14L13,15L14,15L14,14zM13,15L12,15L12,16L13,16L13,15z" />
+</vector>
diff --git a/src/main/res/drawable/px_lock.xml b/src/main/res/drawable/px_lock.xml
new file mode 100644
index 0000000..f014eb5
--- /dev/null
+++ b/src/main/res/drawable/px_lock.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@color/foreground"
+      android:pathData="m21,12v-1h-3v-6h-1v-2h-1v-1h-2v-1h-4v1h-2v1h-1v2h-1v6h-3v1h-1v10h1v1h18v-1h1v-10h-1ZM15,11h-6v-6h1v-1h4v1h1v6Z"/>
+</vector>
diff --git a/src/main/res/drawable/px_lock_open.xml b/src/main/res/drawable/px_lock_open.xml
new file mode 100644
index 0000000..bcaa3ec
--- /dev/null
+++ b/src/main/res/drawable/px_lock_open.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@color/foreground"
+      android:pathData="M23,6l0,5l-3,0l0,-5l-1,0l0,-1l-4,0l0,1l-1,0l0,5l3,0l0,1l1,0l0,9l-1,0l0,1l-15,0l0,-1l-1,0l0,-9l1,0l0,-1l9,0l0,-5l1,0l0,-2l1,0l0,-1l2,0l0,-1l4,0l0,1l2,0l0,1l1,0l0,2l1,0z"/>
+</vector>
diff --git a/src/main/res/drawable/px_music.xml b/src/main/res/drawable/px_music.xml
new file mode 100644
index 0000000..2b7907c
--- /dev/null
+++ b/src/main/res/drawable/px_music.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/foreground"
+        android:pathData="M20.559,18.657l0,0.951l-3.804,0l0,-0.951l-0.951,0l0,-0.951l-0.951,0l0,-2.853l0.951,0l0,-0.951l0.951,0l0,-0.951l2.853,0l0,-4.755l-1.902,0l0,0.951l-2.853,0l0,0.951l-3.804,0l0,0.951l-1.902,0l0,9.51l-0.951,0l0,0.951l-0.951,0l0,0.951l-3.804,0l0,-0.951l-0.951,0l0,-0.951l-0.951,0l0,-2.853l0.951,0l0,-0.951l0.951,0l0,-0.951l2.853,0l0,-9.51l1.902,0l0,-0.951l2.853,0l0,-0.951l3.804,0l0,-0.951l2.853,0l0,-0.951l2.853,0l0,-0.951l1.902,0l0,16.167l-0.951,0l0,0.951z" />
+</vector>
diff --git a/src/main/res/drawable/px_next.xml b/src/main/res/drawable/px_next.xml
new file mode 100644
index 0000000..52d6543
--- /dev/null
+++ b/src/main/res/drawable/px_next.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@color/foreground"
+      android:pathData="M2.521,3.437L2.521,4.216L1.742,4.216v15.57h0.779v0.777h2.334v-0.777h1.559v-0.779h1.557v-0.777h0.777v-0.779h1.559v-0.779h1.557v-0.777h0.777v-0.779h1.559v-0.777h1.557v-0.779h0.777L16.533,12.778L17.313,12.778L17.313,11.222L16.533,11.222L16.533,10.444L15.756,10.444L15.756,9.665h-1.557L14.199,8.886L12.641,8.886L12.641,8.108L11.863,8.108L11.863,7.329h-1.557L10.307,6.552L8.748,6.552L8.748,5.772L7.971,5.772L7.971,4.993L6.414,4.993L6.414,4.216L4.855,4.216L4.855,3.437ZM19.199,3.437L19.199,4.216h-0.383v15.57h0.383v0.777L21.875,20.563v-0.777h0.383L22.258,4.216L21.875,4.216L21.875,3.437Z"
+      />
+</vector>
diff --git a/src/main/res/drawable/px_pause.xml b/src/main/res/drawable/px_pause.xml
new file mode 100644
index 0000000..7bbc2ba
--- /dev/null
+++ b/src/main/res/drawable/px_pause.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/foreground"
+        android:pathData="M2,1L2,2L1,2L1,22L2,22L2,23L9,23L9,22L10,22L10,2L9,2L9,1L2,1zM15,1L15,2L14,2L14,22L15,22L15,23L22,23L22,22L23,22L23,2L22,2L22,1L15,1z" />
+</vector>
diff --git a/src/main/res/drawable/px_pause_circle.xml b/src/main/res/drawable/px_pause_circle.xml
new file mode 100644
index 0000000..d006cd3
--- /dev/null
+++ b/src/main/res/drawable/px_pause_circle.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@color/foreground"
+      android:pathData="M9,1L9,2L7,2L7,3L5,3L5,4L4,4L4,5L3,5L3,7L2,7L2,9L1,9L1,15L2,15L2,17L3,17L3,19L4,19L4,20L5,20L5,21L7,21L7,22L9,22L9,23L15,23L15,22L17,22L17,21L19,21L19,20L20,20L20,19L21,19L21,17L22,17L22,15L23,15L23,9L22,9L22,7L21,7L21,5L20,5L20,4L19,4L19,3L17,3L17,2L15,2L15,1L9,1zM8.182,7.799L10.854,7.799L10.854,8.182L11.236,8.182L11.236,15.818L10.854,15.818L10.854,16.201L8.182,16.201L8.182,15.818L7.799,15.818L7.799,8.182L8.182,8.182L8.182,7.799zM13.146,7.799L15.818,7.799L15.818,8.182L16.201,8.182L16.201,15.818L15.818,15.818L15.818,16.201L13.146,16.201L13.146,15.818L12.764,15.818L12.764,8.182L13.146,8.182L13.146,7.799z"/>
+</vector>
diff --git a/src/main/res/drawable/px_play.xml b/src/main/res/drawable/px_play.xml
new file mode 100644
index 0000000..c6509da
--- /dev/null
+++ b/src/main/res/drawable/px_play.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/foreground"
+        android:pathData="M22,11l0,2l-1,0l0,1l-1,0l0,1l-2,0l0,1l-2,0l0,1l-1,0l0,1l-2,0l0,1l-2,0l0,1l-1,0l0,1l-2,0l0,1l-2,0l0,1l-3,0l0,-1l-1,0l0,-20l1,0l0,-1l3,0l0,1l2,0l0,1l2,0l0,1l1,0l0,1l2,0l0,1l2,0l0,1l1,0l0,1l2,0l0,1l2,0l0,1l1,0l0,1l1,0z" />
+</vector>
diff --git a/src/main/res/drawable/px_play_circle.xml b/src/main/res/drawable/px_play_circle.xml
new file mode 100644
index 0000000..c509b24
--- /dev/null
+++ b/src/main/res/drawable/px_play_circle.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@color/foreground"
+      android:pathData="M9,1L9,2L7,2L7,3L5,3L5,4L4,4L4,5L3,5L3,7L2,7L2,9L1,9v6h1v2h1v2h1v1h1v1h2v1h2v1h6v-1h2v-1h2v-1h1v-1h1v-2h1v-2h1L23,9L22,9L22,7L21,7L21,5L20,5L20,4L19,4L19,3L17,3L17,2L15,2L15,1ZM9.34,7.814h1.143v0.381h0.762v0.379h0.76v0.381h0.381v0.381h0.762v0.381h0.762v0.381h0.379v0.381h0.762v0.379h0.762v0.381h0.381v0.381h0.379v0.762h-0.379v0.381h-0.381v0.381h-0.762v0.379h-0.762v0.381h-0.379v0.381h-0.762v0.381h-0.762v0.381h-0.381v0.381h-0.76v0.379h-0.762v0.381L9.34,16.186L9.34,15.805L8.961,15.805L8.961,8.195h0.379z"/>
+</vector>
diff --git a/src/main/res/drawable/px_plus.xml b/src/main/res/drawable/px_plus.xml
new file mode 100644
index 0000000..c3ae7a2
--- /dev/null
+++ b/src/main/res/drawable/px_plus.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/foreground"
+        android:pathData="M23,11l0,2l-1,0l0,1l-8,0l0,8l-1,0l0,1l-2,0l0,-1l-1,0l0,-8l-8,0l0,-1l-1,0l0,-2l1,0l0,-1l8,0l0,-8l1,0l0,-1l2,0l0,1l1,0l0,8l8,0l0,1l1,0z" />
+</vector>
diff --git a/src/main/res/drawable/px_prev.xml b/src/main/res/drawable/px_prev.xml
new file mode 100644
index 0000000..f1f27a9
--- /dev/null
+++ b/src/main/res/drawable/px_prev.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@color/foreground"
+      android:pathData="M21.479,3.437L21.479,4.216h0.779v15.57h-0.779v0.777h-2.334v-0.777h-1.559v-0.779h-1.557v-0.777h-0.777v-0.779h-1.559v-0.779h-1.557L12.137,15.894L11.359,15.894L11.359,15.114L9.801,15.114v-0.777h-1.557L8.244,13.558L7.467,13.558L7.467,12.778h-0.779v-1.557h0.779v-0.777h0.777L8.244,9.665h1.557L9.801,8.886L11.359,8.886L11.359,8.108h0.777L12.137,7.329h1.557L13.693,6.552h1.559L15.252,5.772h0.777L16.029,4.993h1.557L17.586,4.216h1.559L19.145,3.437ZM4.801,3.437L4.801,4.216h0.383v15.57h-0.383v0.777L2.125,20.563L2.125,19.786L1.742,19.786L1.742,4.216h0.383L2.125,3.437Z"
+      />
+</vector>
diff --git a/src/main/res/drawable/px_queue_music.xml b/src/main/res/drawable/px_queue_music.xml
new file mode 100644
index 0000000..8192388
--- /dev/null
+++ b/src/main/res/drawable/px_queue_music.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/foreground"
+        android:pathData="M21,1L21,2L19,2L19,3L17,3L17,4L16,4L16,16L12,16L12,17L10,17L10,18L9,18L9,21L10,21L10,22L12,22L12,23L17,23L17,22L18,22L18,21L19,21L19,8L21,8L21,7L23,7L23,1L21,1zM1,3L1,6L13,6L13,3L1,3zM1,9L1,12L13,12L13,9L1,9zM1,15L1,18L7,18L7,15L1,15z" />
+</vector>
diff --git a/src/main/res/drawable/px_refresh.xml b/src/main/res/drawable/px_refresh.xml
new file mode 100644
index 0000000..cb6ebca
--- /dev/null
+++ b/src/main/res/drawable/px_refresh.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/foreground"
+        android:pathData="M9,1L9,2L7,2L7,3L5,3L5,4L4,4L4,5L3,5L3,7L2,7L2,9L1,9L1,10L5,10L5,9L6,9L6,7L7,7L7,6L8,6L8,5L10,5L10,4L14,4L14,5L16,5L16,6L17,6L17,8L16,8L16,9L15,9L15,10L23,10L23,2L22,2L22,3L21,3L21,4L19,4L19,3L17,3L17,2L15,2L15,1L9,1zM1,14L1,22L2,22L2,21L3,21L3,20L5,20L5,21L7,21L7,22L9,22L9,23L15,23L15,22L17,22L17,21L19,21L19,20L20,20L20,19L21,19L21,17L22,17L22,15L23,15L23,14L19,14L19,15L18,15L18,17L17,17L17,18L16,18L16,19L14,19L14,20L10,20L10,19L8,19L8,18L7,18L7,16L8,16L8,15L9,15L9,14L1,14z" />
+</vector>
diff --git a/src/main/res/drawable/px_repeat.xml b/src/main/res/drawable/px_repeat.xml
new file mode 100644
index 0000000..e590b51
--- /dev/null
+++ b/src/main/res/drawable/px_repeat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@color/foreground"
+      android:pathData="M18,2L18,5L15.297,5L15.297,4.996L1,4.996L1,8L1,11L4.004,11L4.004,8L15.297,8L15.352,8L18,8L18,11L19,11L19,10L20,10L20,9L21,9L21,8L22,8L22,7L23,7L23,6L22,6L22,5L21,5L21,4L20,4L20,3L19,3L19,2L18,2zM5,13L5,14L4,14L4,15L3,15L3,16L2,16L2,17L1,17L1,18L2,18L2,19L3,19L3,20L4,20L4,21L5,21L5,22L6,22L6,19L8.703,19L8.703,19.004L19.996,19.004L23,19.004L23,16L23,13L19.996,13L19.996,16L10,16L8.648,16L6,16L6,13L5,13z"/>
+</vector>
diff --git a/src/main/res/drawable/px_shuffle.xml b/src/main/res/drawable/px_shuffle.xml
new file mode 100644
index 0000000..e15cff4
--- /dev/null
+++ b/src/main/res/drawable/px_shuffle.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@color/foreground"
+      android:pathData="M18,2L18,5L14,5L14,6L13,6L13,7L12,7L12,10L13,10L13,9L14,9L14,8L18,8L18,11L19,11L19,10L20,10L20,9L21,9L21,8L22,8L22,7L23,7L23,6L22,6L22,5L21,5L21,4L20,4L20,3L19,3L19,2L18,2zM1,5L1,8L7,8L7,9L8,9L8,11L9,11L9,12L10,12L10,14L11,14L11,15L12,15L12,17L13,17L13,18L14,18L14,19L18,19L18,22L19,22L19,21L20,21L20,20L21,20L21,19L22,19L22,18L23,18L23,17L22,17L22,16L21,16L21,15L20,15L20,14L19,14L19,13L18,13L18,16L14,16L14,14L13,14L13,13L12,13L12,11L11,11L11,10L10,10L10,8L9,8L9,6L8,6L8,5L1,5zM8,14L8,15L7,15L7,16L1,16L1,19L7,19L7,18L8,18L8,17L9,17L9,14L8,14z"/>
+</vector>
diff --git a/src/main/res/drawable/px_star.xml b/src/main/res/drawable/px_star.xml
new file mode 100644
index 0000000..7470cbe
--- /dev/null
+++ b/src/main/res/drawable/px_star.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/foreground"
+        android:pathData="M23,8l0,2l-1,0l0,1l-1,0l0,1l-1,0l0,1l-1,0l0,1l-1,0l0,5l1,0l0,4l-2,0l0,-1l-2,0l0,-1l-2,0l0,-1l-2,0l0,1l-2,0l0,1l-2,0l0,1l-2,0l0,-4l1,0l0,-5l-1,0l0,-1l-1,0l0,-1l-1,0l0,-1l-1,0l0,-1l-1,0l0,-2l7,0l0,-2l1,0l0,-2l1,0l0,-2l1,0l0,-1l2,0l0,1l1,0l0,2l1,0l0,2l1,0l0,2l7,0z" />
+</vector>
diff --git a/src/main/res/drawable/px_stopwatch.xml b/src/main/res/drawable/px_stopwatch.xml
new file mode 100644
index 0000000..dca6665
--- /dev/null
+++ b/src/main/res/drawable/px_stopwatch.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/foreground"
+        android:pathData="M6,1.387L6,2.387L5,2.387L5,3.387L6,3.387L6,4.387L9.545,4.387L9.545,5.818L7.908,5.818L7.908,6.637L6.273,6.637L6.273,7.455L5.455,7.455L5.455,8.273L4.637,8.273L4.637,9.908L3.818,9.908L3.818,11.545L3,11.545L3,16.455L3.818,16.455L3.818,18.092L4.637,18.092L4.637,19.727L5.455,19.727L5.455,20.545L6.273,20.545L6.273,21.363L7.908,21.363L7.908,22.182L9.545,22.182L9.545,23L14.455,23L14.455,22.182L16.092,22.182L16.092,21.363L17.727,21.363L17.727,20.545L18.545,20.545L18.545,19.727L19.363,19.727L19.363,18.092L20.182,18.092L20.182,16.455L21,16.455L21,11.545L20.182,11.545L20.182,9.908L19.363,9.908L19.363,8.273L18.545,8.273L18.545,7.455L17.727,7.455L17.727,6.637L16.092,6.637L16.092,5.818L14.455,5.818L14.455,4.387L18,4.387L18,3.387L19,3.387L19,2.387L18,2.387L18,1.387L6,1.387z" />
+</vector>
diff --git a/src/main/res/drawable/px_timer.xml b/src/main/res/drawable/px_timer.xml
new file mode 100644
index 0000000..3d240b2
--- /dev/null
+++ b/src/main/res/drawable/px_timer.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/foreground"
+        android:pathData="M1.818,1L1.818,4L2.818,4L2.818,5L3.818,5L3.818,6L4.818,6L4.818,7L5.818,7L5.818,8L6.818,8L6.818,9L7.818,9L7.818,10L7.818,14L7.818,15L6.818,15L6.818,16L5.818,16L5.818,17L4.818,17L4.818,18L3.818,18L3.818,19L2.818,19L2.818,20L1.818,20L1.818,23L21.818,23L21.818,20L20.818,20L20.818,19L19.818,19L19.818,18L18.818,18L18.818,17L17.818,17L17.818,16L16.818,16L16.818,15L15.818,15L15.818,14L15.818,10L15.818,9L16.818,9L16.818,8L17.818,8L17.818,7L18.818,7L18.818,6L19.818,6L19.818,5L20.818,5L20.818,4L21.818,4L21.818,1L1.818,1z" />
+</vector>
diff --git a/src/main/res/drawable/px_timer_30.xml b/src/main/res/drawable/px_timer_30.xml
new file mode 100644
index 0000000..12c06b1
--- /dev/null
+++ b/src/main/res/drawable/px_timer_30.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/foreground"
+        android:pathData="M6,1.387L6,2.387L5,2.387L5,3.387L6,3.387L6,4.387L9.545,4.387L9.545,5.818L7.908,5.818L7.908,6.637L6.273,6.637L6.273,7.455L5.455,7.455L5.455,8.273L18.545,8.273L18.545,7.455L17.727,7.455L17.727,6.637L16.092,6.637L16.092,5.818L14.455,5.818L14.455,4.387L18,4.387L18,3.387L19,3.387L19,2.387L18,2.387L18,1.387L6,1.387zM4.43,9.758L4.43,10.088L3.77,10.088L3.77,10.418L3.441,10.418L3.441,11.076L3.111,11.076L3.111,12.063L4.758,12.063L4.758,11.734L5.088,11.734L5.088,11.404L6.404,11.404L6.404,11.734L6.732,11.734L6.732,12.721L6.404,12.721L6.404,13.051L4.758,13.051L4.758,14.367L6.404,14.367L6.404,14.697L6.732,14.697L6.732,16.014L6.404,16.014L6.404,16.342L5.088,16.342L5.088,16.014L4.758,16.014L4.758,15.684L3.111,15.684L3.111,16.672L3.441,16.672L3.441,17.33L3.77,17.33L3.77,17.66L4.43,17.66L4.43,17.988L7.063,17.988L7.063,17.66L7.721,17.66L7.721,17.33L8.049,17.33L8.049,16.672L8.379,16.672L8.379,14.367L8.049,14.367L8.049,14.039L7.721,14.039L7.721,13.379L8.049,13.379L8.049,13.051L8.379,13.051L8.379,11.076L8.049,11.076L8.049,10.418L7.721,10.418L7.721,10.088L7.063,10.088L7.063,9.758L4.43,9.758zM11.012,9.758L11.012,10.088L10.354,10.088L10.354,10.418L10.025,10.418L10.025,11.076L9.695,11.076L9.695,16.672L10.025,16.672L10.025,17.33L10.354,17.33L10.354,17.66L11.012,17.66L11.012,17.988L13.316,17.988L13.316,17.66L13.975,17.66L13.975,17.33L14.305,17.33L14.305,16.672L14.633,16.672L14.633,11.076L14.305,11.076L14.305,10.418L13.975,10.418L13.975,10.088L13.316,10.088L13.316,9.758L11.012,9.758zM11.67,11.404L12.658,11.404L12.658,11.734L12.988,11.734L12.988,16.014L12.658,16.014L12.658,16.342L11.67,16.342L11.67,16.014L11.342,16.014L11.342,11.734L11.67,11.734L11.67,11.404zM16.938,11.734L16.938,12.063L16.279,12.063L16.279,12.393L15.951,12.393L15.951,13.051L15.621,13.051L15.621,14.039L15.951,14.039L15.951,14.697L16.279,14.697L16.279,15.025L16.938,15.025L16.938,15.355L18.912,15.355L18.912,15.684L19.242,15.684L19.242,16.342L18.912,16.342L18.912,16.672L17.596,16.672L17.596,16.342L17.268,16.342L17.268,16.014L15.621,16.014L15.621,16.672L15.951,16.672L15.951,17.33L16.279,17.33L16.279,17.66L16.938,17.66L16.938,17.988L19.57,17.988L19.57,17.66L20.23,17.66L20.23,17.33L20.559,17.33L20.559,16.672L20.889,16.672L20.889,15.355L20.559,15.355L20.559,14.697L20.23,14.697L20.23,14.367L19.57,14.367L19.57,14.039L17.596,14.039L17.596,13.709L17.268,13.709L17.268,13.379L17.596,13.379L17.596,13.051L18.912,13.051L18.912,13.379L20.559,13.379L20.559,12.393L20.23,12.393L20.23,12.063L19.57,12.063L19.57,11.734L16.938,11.734zM5.455,19.857L5.455,20.545L6.273,20.545L6.273,21.363L7.908,21.363L7.908,22.182L9.545,22.182L9.545,23L14.455,23L14.455,22.182L16.092,22.182L16.092,21.363L17.727,21.363L17.727,20.545L18.545,20.545L18.545,19.857L5.455,19.857z" />
+</vector>
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index e292210..1c44385 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -1,27 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <attr name="bgColor" format="color" />
+    <attr name="foregroundColor" format="color" />
+    <attr name="text" format="string" />
+    <attr name="icon" format="reference" />
 
-  <!--
-      Theme-level attrs. Each app's theme assigns its own values to these
-      (see themes.xml for the defaults). CsActivity / ThemeManager / shared
-      widgets resolve colors through these attrs only — never via direct
-      @color/... references — so per-app palettes are respected.
-    -->
+    <declare-styleable name="WdCollapsibleSection">
+        <attr name="header" format="string" />
+        <attr name="key" format="string" />
+        <attr name="defaultExpanded" format="boolean" />
+    </declare-styleable>
 
-  <attr name="bgColor" format="color" />
-  <attr name="foregroundColor" format="color" />
-  <attr name="text" format="string" />
-  <attr name="icon" format="reference" />
-
-  <declare-styleable name="WdCollapsibleSection">
-    <attr name="header" format="string" />
-    <attr name="key" format="string" />
-    <attr name="defaultExpanded" format="boolean" />
-  </declare-styleable>
-
-  <declare-styleable name="WdRange">
-    <attr name="values" format="string" />
-    <attr name="valuesArray" format="reference" />
-  </declare-styleable>
+    <declare-styleable name="WdRange">
+        <attr name="values" format="string" />
+        <attr name="valuesArray" format="reference" />
+    </declare-styleable>
 
 </resources>
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 12c2710..f846bf6 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -1,27 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <!--
-      Neutral fallback palette used by Theme.Rama.Base. Apps normally
-      override the corresponding theme attrs (ramaWindowBg, etc.) in their
-      own themes.xml rather than redefining these colors directly.
-    -->
-
-    <color name="h1">#EAE6DF</color>
-    <color name="foreground">#CCCCCC</color>
+    <color name="h1">#EAE6DE</color>
+    <color name="foreground">#EAE6DF</color>
     <color name="icon">#C8C2B8</color>
+
     <color name="bg_1">#0E181A</color>
     <color name="bg_2">#162A2E</color>
     <color name="bg_3">#1E383D</color>
+    <color name="bg_4">#28484D</color>
+    <color name="bg_display">#081012</color>
+
     <color name="accent_1">#4DA8AC</color>
     <color name="accent_2">#D4AF37</color>
     <color name="accent_3">#C77D4D</color>
+    <color name="accent_4">#6A9FCF</color>
+
     <color name="disabled">#5D7A7C</color>
     <color name="input">#0C1416</color>
+
     <color name="button_1">#3A9DA0</color>
+    <color name="button_1_selected">#6BC1C4</color>
     <color name="button_2">#C49B2E</color>
-    <color name="button_selected">#1E383D</color>
+
     <color name="danger">#B83A2D</color>
     <color name="collapsible_header">#7A9495</color>
 
+    <color name="media_background">#5E9FA3</color>
+    <color name="progressbar">#31585B</color>
+    <color name="progressbar_2">#4A6E3A</color>
+    <color name="suggestion">#71ACC7</color>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 5330b77..26531a0 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1,27 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <!-- Product -->
+    <!-- Person/Entity -->
     <string name="app_creator" translatable="false">Pombo</string>
-    <string name="product_teyin_url" translatable="false">github.com/rama-io/teyin</string>
+    <string name="contributor_isotjs" translatable="false">isotjs</string>
+    <string name="product_jersey_creator" translatable="false">Sarah Cadigan-Fried</string>
+    <string name="product_dracula_creator" translatable="false">Zeno Rocha</string>
+    <string name="product_catppuccin_creator" translatable="false">Pocco</string>
+    <string name="product_tokyo_creator" translatable="false">Enkia</string>
+    <string name="product_melange_creator" translatable="false">Savq</string>
     <string name="product_hackernoon_creator" translatable="false">HackerNoon</string>
+
+    <!-- Product -->
+    <string name="product_rama" translatable="false">Rama</string>
+    <string name="product_mako" translatable="false">Mako</string>
+    <string name="product_teyin" translatable="false">Teyin</string>
+    <string name="product_tui" translatable="false">Tui</string>
+    <string name="product_txori" translatable="false">Txori</string>
     <string name="product_hackernoon_name" translatable="false">Pixel Icon Library</string>
-    <string name="product_hackernoon_url" translatable="false">github.com/hackernoon/pixel-icon-library</string>
-    <string name="product_jersey_creator" translatable="false">Sarah Cadigan-Fried</string>
     <string name="product_jersey_name" translatable="false">Jersey 25</string>
-    <string name="product_jersey_url" translatable="false">github.com/scfried/soft-type-jersey</string>
-    <string name="product_dracula_creator" translatable="false">Zeno Rocha</string>
     <string name="product_dracula_name" translatable="false">Dracula</string>
-    <string name="product_dracula_url" translatable="false">github.com/dracula</string>
-    <string name="product_catppuccin_creator" translatable="false">Pocco</string>
     <string name="product_catppuccin_name" translatable="false">Catppuccin Moccha</string>
     <string name="product_catppuccin_latte_name" translatable="false">Catppuccin Latte</string>
-    <string name="product_catppuccin_url" translatable="false">github.com/catppuccin</string>
-    <string name="product_tokyo_creator" translatable="false">Enkia</string>
     <string name="product_tokyo_name" translatable="false">Tokyo Night</string>
-    <string name="product_tokyo_url" translatable="false">github.com/enkia/tokyo-night-vscode-theme</string>
-    <string name="product_melange_creator" translatable="false">Savq</string>
     <string name="product_melange_name" translatable="false">Mélange Dark</string>
+
+    <!-- URL -->
+    <string name="contributor_isotjs_url" translatable="false">github.com/isotjs</string>
+    <string name="product_mako_url" translatable="false">github.com/rama-io/mako</string>
+    <string name="product_txori_url" translatable="false">github.com/rama-io/txori</string>
+    <string name="product_tui_url" translatable="false">github.com/rama-io/tui</string>
+    <string name="product_teyin_url" translatable="false">github.com/rama-io/teyin</string>
+    <string name="product_hackernoon_url" translatable="false">github.com/hackernoon/pixel-icon-library</string>
+    <string name="product_jersey_url" translatable="false">github.com/scfried/soft-type-jersey</string>
+    <string name="product_dracula_url" translatable="false">github.com/dracula</string>
+    <string name="product_catppuccin_url" translatable="false">github.com/catppuccin</string>
+    <string name="product_tokyo_url" translatable="false">github.com/enkia/tokyo-night-vscode-theme</string>
     <string name="product_melange_url" translatable="false">github.com/savq/melange-nvim</string>
 
     <!-- License -->
@@ -30,12 +43,14 @@
     <string name="license_cc_4" translatable="false">CC 4.0</string>
     <string name="license_mit" translatable="false">MIT</string>
 
-    <!-- Contributors -->
-    <string name="contributor_isotjs" translatable="false">isotjs</string>
-    <string name="contributor_isotjs_url" translatable="false">github.com/isotjs</string>
+    <!-- Dialog -->
+    <string name="toast_invalid_color">Invalid color</string>
+    <string name="hint_hex_color" translatable="false">#RRGGBB</string>
 
-    <!-- Groups -->
+    <!-- Group -->
     <string name="settings_section_expand_indicator" translatable="false">[+]</string>
     <string name="settings_section_collapse_indicator" translatable="false">[-]</string>
 
+    <!-- Formatting -->
+    <string name="name_version" translatable="false">%1$s %2$d</string>
 </resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 505f0c5..d7dcb15 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -1,28 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <!--
-      Every app theme should extend this (directly or via its own
-      Theme.<AppName> -> Theme.Rama.Base chain) and override the
-      ramaXxx attrs below with its own palette.
-
-      Example, in an app's themes.xml:
-
-        <style name="Theme.Txori" parent="Theme.Rama.Base">
-            <item name="ramaWindowBg">@color/txori_bg</item>
-            <item name="ramaCardBackground">@color/txori_card</item>
-            <item name="ramaAccentColor">@color/txori_accent</item>
-        </style>
-    -->
     <style name="Theme.Rama.Base" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="android:windowBackground">?attr/bgColor</item>
         <item name="android:textColor">?attr/foregroundColor</item>
-        <item name="android:isLightTheme">false</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowFullscreen">false</item>
     </style>
 
-     <!-- Global -->
+    <!-- Global -->
 
     <style name="BlockFlow">
         <item name="android:layout_width">match_parent</item>
@@ -44,6 +30,11 @@
         <item name="android:divider">@drawable/list_divider</item>
     </style>
 
+    <style name="HorizontalListDivided_BG2" parent="HorizontalList_BG2">
+        <item name="android:showDividers">middle</item>
+        <item name="android:divider">@drawable/list_divider</item>
+    </style>
+
     <style name="HorizontalListDividedSmall" parent="HorizontalList">
         <item name="android:showDividers">middle</item>
         <item name="android:divider">@drawable/list_divider_small</item>
@@ -63,14 +54,14 @@
         <item name="android:divider">@drawable/list_divider</item>
     </style>
 
-    <style name="VerticalListDividedSmall" parent="VerticalListDivided">
+    <style name="VerticalListDivided_BG2" parent="VerticalList_BG2">
         <item name="android:showDividers">middle</item>
-        <item name="android:divider">@drawable/list_divider_small</item>
+        <item name="android:divider">@drawable/list_divider</item>
     </style>
 
-    <style name="VerticalListDivided_BG2" parent="VerticalList_BG2">
+    <style name="VerticalListDividedSmall" parent="VerticalListDivided">
         <item name="android:showDividers">middle</item>
-        <item name="android:divider">@drawable/list_divider</item>
+        <item name="android:divider">@drawable/list_divider_small</item>
     </style>
 
     <style name="H1" parent="BlockFlow">
@@ -181,6 +172,12 @@
         <item name="android:tint">@color/icon</item>
     </style>
 
+    <style name="Icon32">
+        <item name="android:layout_width">32sp</item>
+        <item name="android:layout_height">32sp</item>
+        <item name="android:layout_gravity">center</item>
+    </style>
+
     <style name="ColorPickerBtn" parent="BlockFlow">
         <item name="android:layout_marginBottom">8sp</item>
     </style>