diff --git a/.idea/deviceManager.xml b/.idea/deviceManager.xml
new file mode 100644
index 0000000..91f9558
--- /dev/null
+++ b/.idea/deviceManager.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DeviceTable">
+    <option name="columnSorters">
+      <list>
+        <ColumnSorterState>
+          <option name="column" value="Name" />
+          <option name="order" value="ASCENDING" />
+        </ColumnSorterState>
+      </list>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index cd2b502..700dcf7 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -7,6 +7,6 @@
     <option name="jvmTarget" value="23" />
   </component>
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.1.21" />
+    <option name="version" value="2.2.0" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ab803bc..7d0bf68 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id("com.android.application")
     kotlin("android")
@@ -14,10 +16,10 @@ android {
 
     defaultConfig {
         applicationId = "de.dertyp7214.rboardpatcher"
-        minSdk = 23
+        minSdk = 26
         targetSdk = 36
-        versionCode = 3406
-        versionName = "3.4"
+        versionCode = 3500
+        versionName = "3.5"
 
         testInstrumentationRunner  = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -37,16 +39,18 @@ android {
     }
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.current()
-        targetCompatibility = JavaVersion.current()
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.current().toString()
-        freeCompilerArgs += listOf(
-            "-P",
-            "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true"
-        )
+    kotlin {
+        compilerOptions {
+            freeCompilerArgs = freeCompilerArgs.get() + listOf(
+                "-P",
+                "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true",
+                "-Xsuppress-version-warnings"
+            )
+            jvmToolchain(23)
+            jvmTarget.set(JvmTarget.JVM_23)
+        }
     }
 
     packaging {
diff --git a/app/src/main/java/de/dertyp7214/rboardpatcher/adapter/MainOptionAdapter.kt b/app/src/main/java/de/dertyp7214/rboardpatcher/adapter/MainOptionAdapter.kt
index b269935..6c7b071 100644
--- a/app/src/main/java/de/dertyp7214/rboardpatcher/adapter/MainOptionAdapter.kt
+++ b/app/src/main/java/de/dertyp7214/rboardpatcher/adapter/MainOptionAdapter.kt
@@ -8,6 +8,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.card.MaterialCardView
+import de.dertyp7214.rboardcomponents.core.dpToPxRounded
 import de.dertyp7214.rboardpatcher.R
 import de.dertyp7214.rboardpatcher.screens.types.MainOption
 
@@ -30,6 +31,22 @@ class MainOptionAdapter(
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val item = list[position]
 
+        when (position) {
+            0 -> {
+                if (list.size == 1){
+                    holder.root.setBackgroundResource(R.drawable.color_surface_overlay_background_rounded)
+                }
+                else{
+                    holder.root.setBackgroundResource(R.drawable.color_surface_overlay_background_top)
+                }
+            }
+            list.lastIndex -> {
+                holder.root.setBackgroundResource(R.drawable.color_surface_overlay_background_bottom)
+            }
+            else -> {
+                holder.root.setBackgroundResource(R.drawable.color_surface_overlay_background)
+            }
+        }
         holder.icon.setImageResource(item.icon)
         holder.title.text = item.title
 
diff --git a/app/src/main/java/de/dertyp7214/rboardpatcher/adapter/PatchAdapter.kt b/app/src/main/java/de/dertyp7214/rboardpatcher/adapter/PatchAdapter.kt
index 8edb10e..02bbf94 100644
--- a/app/src/main/java/de/dertyp7214/rboardpatcher/adapter/PatchAdapter.kt
+++ b/app/src/main/java/de/dertyp7214/rboardpatcher/adapter/PatchAdapter.kt
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Color
 import android.graphics.Typeface
+import android.os.Build
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -11,6 +12,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.card.MaterialCardView
+import de.dertyp7214.rboardcomponents.core.dpToPxRounded
 import de.dertyp7214.rboardpatcher.R
 import de.dertyp7214.rboardpatcher.api.types.PatchMeta
 import de.dertyp7214.rboardpatcher.core.getAttr
@@ -100,7 +102,36 @@ class PatchAdapter(
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val patchMeta = list[position]
-
+        when (position) {
+            0 -> {
+                if (list.size == 1){
+                    holder.root.setBackgroundResource(R.drawable.color_surface_overlay_background_rounded)
+                    val param = holder.root.layoutParams as ViewGroup.MarginLayoutParams
+                    param.setMargins(16.dpToPxRounded(context), 4.dpToPxRounded(context), 16.dpToPxRounded(context), 0.dpToPxRounded(context))
+                    holder.root.layoutParams = param
+
+                }
+                else{
+                    holder.root.setBackgroundResource(R.drawable.color_surface_overlay_background_top)
+                    val param = holder.root.layoutParams as ViewGroup.MarginLayoutParams
+                    param.setMargins(16.dpToPxRounded(context), 4.dpToPxRounded(context), 16.dpToPxRounded(context), 0.dpToPxRounded(context))
+                    holder.root.layoutParams = param
+
+                }
+            }
+            list.lastIndex -> {
+                holder.root.setBackgroundResource(R.drawable.color_surface_overlay_background_bottom)
+                val param = holder.root.layoutParams as ViewGroup.MarginLayoutParams
+                param.setMargins(16.dpToPxRounded(context), 0.dpToPxRounded(context), 16.dpToPxRounded(context), 4.dpToPxRounded(context))
+                holder.root.layoutParams = param
+            }
+            else -> {
+                holder.root.setBackgroundResource(R.drawable.color_surface_overlay_background)
+                val param = holder.root.layoutParams as ViewGroup.MarginLayoutParams
+                param.setMargins(16.dpToPxRounded(context), 0.dpToPxRounded(context), 16.dpToPxRounded(context), 0.dpToPxRounded(context))
+                holder.root.layoutParams = param
+            }
+        }
         if (selected[patchMeta]) holder.root.setCardBackgroundColor(selectedColor)
         else holder.root.setCardBackgroundColor(Color.TRANSPARENT)
 
@@ -122,8 +153,43 @@ class PatchAdapter(
             if (isEnabled) {
                 selected[patchMeta] = !selected[patchMeta]
 
-                if (selected[patchMeta]) holder.root.setCardBackgroundColor(selectedColor)
-                else holder.root.setCardBackgroundColor(Color.TRANSPARENT)
+                if (selected[patchMeta]) {
+                    when (position) {
+                        0 -> {
+                            if (list.size == 1) {
+                                holder.root.setBackgroundResource(R.drawable.color_surface_overlay_background_rounded_colored)
+                            } else {
+                                holder.root.setBackgroundResource(R.drawable.color_surface_overlay_background_top_colored)
+                            }
+                        }
+
+                        list.lastIndex -> {
+                            holder.root.setBackgroundResource(R.drawable.color_surface_overlay_background_bottom_colored)
+                        }
+
+                        else -> {
+                            holder.root.setBackgroundResource(R.drawable.color_surface_overlay_background_colored)
+                        }
+                    }
+                }
+                else
+                    when (position) {
+                        0 -> {
+                            if (list.size == 1) {
+                                holder.root.setBackgroundResource(R.drawable.color_surface_overlay_background_rounded)
+                            } else {
+                                holder.root.setBackgroundResource(R.drawable.color_surface_overlay_background_top)
+                            }
+                        }
+
+                        list.lastIndex -> {
+                            holder.root.setBackgroundResource(R.drawable.color_surface_overlay_background_bottom)
+                        }
+
+                        else -> {
+                            holder.root.setBackgroundResource(R.drawable.color_surface_overlay_background)
+                        }
+                    }
             }
         }
     }
diff --git a/app/src/main/java/de/dertyp7214/rboardpatcher/core/String.kt b/app/src/main/java/de/dertyp7214/rboardpatcher/core/String.kt
index 13d12f2..0d36aa1 100644
--- a/app/src/main/java/de/dertyp7214/rboardpatcher/core/String.kt
+++ b/app/src/main/java/de/dertyp7214/rboardpatcher/core/String.kt
@@ -12,12 +12,7 @@ import java.util.Locale
 fun String.downloadFile(path: File): File {
     if (path.exists()) path.deleteRecursively()
     path.parentFile?.let { if (!it.exists()) it.mkdirs() }
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-        Files.copy(URL(this).openStream(), path.toPath(), StandardCopyOption.REPLACE_EXISTING)
-    } else {
-        URL(this).openStream()
-            .use { Files.copy(it, path.toPath()) }
-    }
+    Files.copy(URL(this).openStream(), path.toPath(), StandardCopyOption.REPLACE_EXISTING)
     return path
 }
 
diff --git a/app/src/main/java/de/dertyp7214/rboardpatcher/screens/LoadThemeActivity.kt b/app/src/main/java/de/dertyp7214/rboardpatcher/screens/LoadThemeActivity.kt
index 425ace4..578a226 100644
--- a/app/src/main/java/de/dertyp7214/rboardpatcher/screens/LoadThemeActivity.kt
+++ b/app/src/main/java/de/dertyp7214/rboardpatcher/screens/LoadThemeActivity.kt
@@ -70,7 +70,7 @@ class LoadThemeActivity : AppCompatActivity() {
         recyclerView.adapter = adapter
         recyclerView.layoutManager = LinearLayoutManager(this)
         recyclerView.setHasFixedSize(true)
-        recyclerView.addItemDecoration(MarginItemDecoration(2.dp(this), all = true))
+        recyclerView.addItemDecoration(MarginItemDecoration(2.dp(this)))
 
         when {
             scheme != "content" && data != null && data.scheme == "file" -> {
diff --git a/app/src/main/java/de/dertyp7214/rboardpatcher/screens/PatchActivity.kt b/app/src/main/java/de/dertyp7214/rboardpatcher/screens/PatchActivity.kt
index f173de2..6e0b352 100644
--- a/app/src/main/java/de/dertyp7214/rboardpatcher/screens/PatchActivity.kt
+++ b/app/src/main/java/de/dertyp7214/rboardpatcher/screens/PatchActivity.kt
@@ -33,6 +33,7 @@ import com.google.android.material.progressindicator.CircularProgressIndicator
 import com.google.android.material.progressindicator.LinearProgressIndicator
 import com.google.gson.Gson
 import de.dertyp7214.rboardcomponents.components.SearchBar
+import de.dertyp7214.rboardcomponents.core.dpToPxRounded
 import de.dertyp7214.rboardpatcher.Application
 import de.dertyp7214.rboardpatcher.R
 import de.dertyp7214.rboardpatcher.adapter.PatchAdapter
@@ -42,6 +43,7 @@ import de.dertyp7214.rboardpatcher.api.types.KeyValue
 import de.dertyp7214.rboardpatcher.api.types.PatchMeta
 import de.dertyp7214.rboardpatcher.components.BaseActivity
 import de.dertyp7214.rboardpatcher.components.ChipContainer
+import de.dertyp7214.rboardpatcher.components.MarginItemDecoration
 import de.dertyp7214.rboardpatcher.core.Observe
 import de.dertyp7214.rboardpatcher.core.app
 import de.dertyp7214.rboardpatcher.core.decodeBitmap
@@ -332,6 +334,7 @@ class PatchActivity : BaseActivity() {
             recyclerView.adapter = adapter
             recyclerView.setHasFixedSize(true)
             recyclerView.layoutManager = LinearLayoutManager(this)
+            recyclerView.addItemDecoration(MarginItemDecoration(2.dpToPxRounded(this)))
 
             doAsync({
                 val patches: List<PatchMeta> = GitHub.GboardThemes.Patches["patches.json"]
@@ -424,11 +427,7 @@ class PatchActivity : BaseActivity() {
             progress = { progress, stage ->
                 CoroutineScope(Dispatchers.Main).launch {
                     patchTheme.text = "Applying: $stage"
-                    if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N) {
                         progressBar.setProgress(progress.roundToInt(), true)
-                    } else {
-                        progressBar.progress = progress.roundToInt()
-                    }
                 }
             }) {
             patchTheme.isEnabled = true
diff --git a/app/src/main/java/de/dertyp7214/rboardpatcher/screens/PickThemeActivity.kt b/app/src/main/java/de/dertyp7214/rboardpatcher/screens/PickThemeActivity.kt
index bc91b0f..1ec4112 100644
--- a/app/src/main/java/de/dertyp7214/rboardpatcher/screens/PickThemeActivity.kt
+++ b/app/src/main/java/de/dertyp7214/rboardpatcher/screens/PickThemeActivity.kt
@@ -96,7 +96,7 @@ class PickThemeActivity : AppCompatActivity() {
         recyclerView.adapter = adapter
         recyclerView.layoutManager = LinearLayoutManager(this)
         recyclerView.setHasFixedSize(true)
-        recyclerView.addItemDecoration(MarginItemDecoration(2.dp(this), all = true))
+        recyclerView.addItemDecoration(MarginItemDecoration(2.dp(this)))
 
         Application.rboardService?.apply {
             doAsync({
diff --git a/app/src/main/java/de/dertyp7214/rboardpatcher/screens/types/MainOption.kt b/app/src/main/java/de/dertyp7214/rboardpatcher/screens/types/MainOption.kt
index f7e7e23..d20dd07 100644
--- a/app/src/main/java/de/dertyp7214/rboardpatcher/screens/types/MainOption.kt
+++ b/app/src/main/java/de/dertyp7214/rboardpatcher/screens/types/MainOption.kt
@@ -3,7 +3,7 @@ package de.dertyp7214.rboardpatcher.screens.types
 import androidx.annotation.DrawableRes
 
 data class MainOption(
-    @DrawableRes val icon: Int,
+    @param:DrawableRes val icon: Int,
     val title: String,
     val action: () -> Unit
 )
\ No newline at end of file
diff --git a/app/src/main/res/drawable/color_surface_overlay_background.xml b/app/src/main/res/drawable/color_surface_overlay_background.xml
new file mode 100644
index 0000000..8e24333
--- /dev/null
+++ b/app/src/main/res/drawable/color_surface_overlay_background.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="?attr/colorSurface" />
+            <corners android:radius="5dp"/>
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/color_primary_0_10_overlay" />
+            <corners android:radius="5dp"/>
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/drawable/color_surface_overlay_background_bottom.xml b/app/src/main/res/drawable/color_surface_overlay_background_bottom.xml
new file mode 100644
index 0000000..5678912
--- /dev/null
+++ b/app/src/main/res/drawable/color_surface_overlay_background_bottom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="?attr/colorSurface" />
+            <corners android:topLeftRadius="5dp" android:topRightRadius="5dp"
+                android:bottomLeftRadius="20dp" android:bottomRightRadius="20dp"/>
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/color_primary_0_10_overlay" />
+            <corners android:topLeftRadius="5dp" android:topRightRadius="5dp"
+                android:bottomLeftRadius="20dp" android:bottomRightRadius="20dp"/>
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/drawable/color_surface_overlay_background_bottom_colored.xml b/app/src/main/res/drawable/color_surface_overlay_background_bottom_colored.xml
new file mode 100644
index 0000000..100a9bd
--- /dev/null
+++ b/app/src/main/res/drawable/color_surface_overlay_background_bottom_colored.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="?attr/colorSurfaceContainerHighest" />
+            <corners android:topLeftRadius="5dp" android:topRightRadius="5dp"
+                android:bottomLeftRadius="20dp" android:bottomRightRadius="20dp"/>
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/color_primary_0_10_overlay" />
+            <corners android:topLeftRadius="5dp" android:topRightRadius="5dp"
+                android:bottomLeftRadius="20dp" android:bottomRightRadius="20dp"/>
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/drawable/color_surface_overlay_background_colored.xml b/app/src/main/res/drawable/color_surface_overlay_background_colored.xml
new file mode 100644
index 0000000..ae23400
--- /dev/null
+++ b/app/src/main/res/drawable/color_surface_overlay_background_colored.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="?attr/colorSurfaceContainerHighest" />
+            <corners android:radius="5dp"/>
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/color_primary_0_10_overlay" />
+            <corners android:radius="5dp"/>
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/drawable/color_surface_overlay_background_rounded.xml b/app/src/main/res/drawable/color_surface_overlay_background_rounded.xml
new file mode 100644
index 0000000..35ca2c2
--- /dev/null
+++ b/app/src/main/res/drawable/color_surface_overlay_background_rounded.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="?attr/colorSurface" />
+            <corners android:radius="20dp"/>
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/color_primary_0_10_overlay" />
+            <corners android:radius="20dp"/>
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/drawable/color_surface_overlay_background_rounded_colored.xml b/app/src/main/res/drawable/color_surface_overlay_background_rounded_colored.xml
new file mode 100644
index 0000000..eb87a22
--- /dev/null
+++ b/app/src/main/res/drawable/color_surface_overlay_background_rounded_colored.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="?attr/colorSurfaceContainerHighest" />
+            <corners android:radius="20dp"/>
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/color_primary_0_10_overlay" />
+            <corners android:radius="20dp"/>
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/drawable/color_surface_overlay_background_top.xml b/app/src/main/res/drawable/color_surface_overlay_background_top.xml
new file mode 100644
index 0000000..66a48eb
--- /dev/null
+++ b/app/src/main/res/drawable/color_surface_overlay_background_top.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="?attr/colorSurface" />
+            <corners android:topLeftRadius="20dp"
+                android:topRightRadius="20dp" android:bottomLeftRadius="5dp"
+                android:bottomRightRadius="5dp"/>
+            </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/color_primary_0_10_overlay" />
+            <corners android:topLeftRadius="20dp"
+                android:topRightRadius="20dp" android:bottomLeftRadius="5dp"
+                android:bottomRightRadius="5dp"/>
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/drawable/color_surface_overlay_background_top_colored.xml b/app/src/main/res/drawable/color_surface_overlay_background_top_colored.xml
new file mode 100644
index 0000000..78f8f1c
--- /dev/null
+++ b/app/src/main/res/drawable/color_surface_overlay_background_top_colored.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="?attr/colorSurfaceContainerHighest" />
+            <corners android:topLeftRadius="20dp"
+                android:topRightRadius="20dp" android:bottomLeftRadius="5dp"
+                android:bottomRightRadius="5dp"/>
+            </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/color_primary_0_10_overlay" />
+            <corners android:topLeftRadius="20dp"
+                android:topRightRadius="20dp" android:bottomLeftRadius="5dp"
+                android:bottomRightRadius="5dp"/>
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9b01fcd..3e6634a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -170,7 +170,7 @@
             android:layout_marginBottom="32dp"
             android:translationZ="0dp"
             app:cardBackgroundColor="?android:attr/colorBackground"
-            app:cardCornerRadius="@dimen/roundCorners"
+            app:cardCornerRadius="20dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_patch.xml b/app/src/main/res/layout/activity_patch.xml
index dd5a492..0240d5e 100644
--- a/app/src/main/res/layout/activity_patch.xml
+++ b/app/src/main/res/layout/activity_patch.xml
@@ -18,6 +18,8 @@
     <de.dertyp7214.rboardpatcher.components.ChipContainer
         android:id="@+id/chipContainer"
         android:layout_width="0dp"
+        android:paddingBottom="8dp"
+        android:layout_marginHorizontal="10dp"
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -46,6 +48,7 @@
     <com.google.android.material.button.MaterialButton
         android:id="@+id/patchTheme"
         android:layout_width="0dp"
+        style="@style/Widget.Material3Expressive.Button"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="24dp"
@@ -79,6 +82,7 @@
         android:id="@+id/progressBar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        style="@style/Widget.Material3Expressive.LinearProgressIndicator.Wavy"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/activity_pick_theme.xml b/app/src/main/res/layout/activity_pick_theme.xml
index 4b38da9..17fe236 100644
--- a/app/src/main/res/layout/activity_pick_theme.xml
+++ b/app/src/main/res/layout/activity_pick_theme.xml
@@ -1,34 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".screens.PickThemeActivity"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"
+    android:orientation="vertical">
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recyclerView"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:listitem="@layout/theme_grid_item" />
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
+        tools:context=".screens.PickThemeActivity">
 
-    <com.google.android.material.progressindicator.CircularProgressIndicator
-        android:id="@+id/progressBar"
-        style="@style/Widget.Material3.CircularProgressIndicator.Medium"
-        android:layout_width="64dp"
-        android:layout_height="64dp"
-        android:indeterminate="true"
-        android:visibility="visible"
-        app:indicatorColor="?attr/colorAccent"
-        app:indicatorSize="64dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/cardView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginVertical="8dp"
+            android:translationZ="0dp"
+            app:cardBackgroundColor="?android:attr/colorBackground"
+            app:cardCornerRadius="@dimen/roundCorners"
+            app:cardElevation="0dp"
+            app:elevation="0dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:strokeWidth="0dp">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recyclerView"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:listitem="@layout/theme_grid_item" />
+
+                <com.google.android.material.progressindicator.CircularProgressIndicator
+                    android:id="@+id/progressBar"
+                    style="@style/Widget.Material3Expressive.CircularProgressIndicator.Wavy"
+                    android:layout_width="64dp"
+                    android:layout_height="64dp"
+                    android:indeterminate="true"
+                    android:visibility="visible"
+                    app:indicatorColor="?attr/colorAccent"
+                    app:indicatorSize="64dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </com.google.android.material.card.MaterialCardView>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/custom_image_patch_layout.xml b/app/src/main/res/layout/custom_image_patch_layout.xml
index e4c2fcf..5cacd8d 100644
--- a/app/src/main/res/layout/custom_image_patch_layout.xml
+++ b/app/src/main/res/layout/custom_image_patch_layout.xml
@@ -76,6 +76,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/replaceImageButton"
+        style="@style/Widget.Material3Expressive.Button.TonalButton"
         android:layout_width="0dp"
         android:layout_height="64dp"
         android:layout_marginStart="24dp"
@@ -104,7 +105,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/ok"
-            style="@style/Widget.Material3.Button.TextButton.Dialog"
+            style="@style/Widget.Material3Expressive.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
diff --git a/app/src/main/res/layout/custom_value_patch_layout.xml b/app/src/main/res/layout/custom_value_patch_layout.xml
index 3736d21..8b3ee7d 100644
--- a/app/src/main/res/layout/custom_value_patch_layout.xml
+++ b/app/src/main/res/layout/custom_value_patch_layout.xml
@@ -91,7 +91,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/ok"
-            style="@style/Widget.Material3.Button.TextButton.Dialog"
+            style="@style/Widget.Material3Expressive.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
diff --git a/app/src/main/res/layout/patch_info_popup.xml b/app/src/main/res/layout/patch_info_popup.xml
index ce08965..ece348d 100644
--- a/app/src/main/res/layout/patch_info_popup.xml
+++ b/app/src/main/res/layout/patch_info_popup.xml
@@ -66,7 +66,7 @@
 
         <com.google.android.material.progressindicator.CircularProgressIndicator
             android:id="@+id/progressBar"
-            style="@style/Widget.Material3.CircularProgressIndicator"
+            style="@style/Widget.Material3Expressive.CircularProgressIndicator.Wavy"
             android:layout_width="80dp"
             android:layout_height="80dp"
             android:layout_gravity="center"
@@ -105,7 +105,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/ok"
-            style="@style/Widget.Material3.Button.TextButton.Dialog"
+            style="@style/Widget.Material3Expressive.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
diff --git a/app/src/main/res/layout/patch_layout.xml b/app/src/main/res/layout/patch_layout.xml
index 5db9bdc..390daf3 100644
--- a/app/src/main/res/layout/patch_layout.xml
+++ b/app/src/main/res/layout/patch_layout.xml
@@ -2,77 +2,86 @@
 <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_margin="4dp"
-    app:cardBackgroundColor="@android:color/transparent"
-    app:cardCornerRadius="8dp"
-    app:cardElevation="0dp"
-    app:strokeWidth="0dp">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/card"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="73dp"
+        android:layout_marginHorizontal="16dp"
+        app:cardElevation="0dp"
+        app:strokeWidth="0dp">
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <LinearLayout
+                android:id="@+id/root"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:padding="7dp"
+                android:paddingStart="16dp"
+                android:paddingEnd="16dp">
 
-        <ImageView
-            android:id="@+id/imageView"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="16dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_patch"
-            tools:ignore="ContentDescription" />
+                <ImageView
+                    android:id="@+id/imageView"
+                    android:layout_width="40dp"
+                    android:layout_height="match_parent"
+                    android:paddingEnd="16dp"
+                    app:srcCompat="@drawable/ic_patch"
+                    app:tint="?android:attr/textColorPrimary"
+                    tools:ignore="ContentDescription,RtlSymmetry" />
 
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:orientation="vertical"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/newTag"
-            app:layout_constraintStart_toEndOf="@+id/imageView"
-            app:layout_constraintTop_toTopOf="parent">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal">
 
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:maxLines="1"
-                android:textSize="16sp"
-                tools:text="Title" />
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:orientation="vertical"
+                        android:layout_gravity="start|center_vertical"
+                        android:gravity="start|center_vertical"
+                        android:layout_weight="1">
+                        <TextView
+                            android:id="@+id/title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="?android:attr/textColorPrimary"
+                            android:textSize="16sp"
+                            tools:text="Title" />
 
-            <TextView
-                android:id="@+id/author"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:maxLines="1"
-                android:textColor="?android:attr/textColorLink"
-                android:textSize="13sp"
-                tools:text="Author" />
-        </LinearLayout>
+                        <TextView
+                            android:id="@+id/author"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="?android:attr/textColorLink"
+                            android:textSize="13sp"
+                            tools:text="Author" />
+
+                    </LinearLayout>
 
-        <TextView
-            android:id="@+id/newTag"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
-            android:background="@drawable/bg_round_6"
-            android:backgroundTint="?attr/colorPrimary"
-            android:paddingHorizontal="4dp"
-            android:paddingVertical="2dp"
-            android:text="@string/newTag"
-            android:textAllCaps="true"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body2"
-            android:textColor="?attr/colorOnPrimary"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:visibility="visible" />
+                    <LinearLayout
+                        android:id="@+id/newTagLinearLayout"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:gravity="center_vertical|end"
+                        android:orientation="vertical"
+                        android:visibility="gone"
+                        tools:visibility="visible">
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+                        <TextView
+                            android:id="@+id/newTag"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="@drawable/bg_round_6"
+                            android:backgroundTint="?attr/colorPrimary"
+                            android:paddingHorizontal="4dp"
+                            android:paddingVertical="2dp"
+                            android:text="@string/newTag"
+                            android:textAllCaps="true"
+                            android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+                            android:textColor="?attr/colorOnPrimary"/>
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
+        </FrameLayout>
+    </com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/share_popup.xml b/app/src/main/res/layout/share_popup.xml
index c1b381e..3feb24c 100644
--- a/app/src/main/res/layout/share_popup.xml
+++ b/app/src/main/res/layout/share_popup.xml
@@ -53,16 +53,17 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/cancel"
-            style="@style/Widget.Material3.Button.TextButton.Dialog"
+            style="@style/Widget.Material3Expressive.Button.TonalButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
+            android:backgroundTint="?attr/colorSurfaceVariant"
             android:text="@android:string/cancel"
             app:cornerRadius="@dimen/roundCorners" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/ok"
-            style="@style/Widget.Material3.Button.TextButton.Dialog"
+            style="@style/Widget.Material3Expressive.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml
index a3e4608..2a35d53 100644
--- a/app/src/main/res/values-v27/themes.xml
+++ b/app/src/main/res/values-v27/themes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.RboardPatcher" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Theme.RboardPatcher" parent="Theme.Material3Expressive.DayNight.NoActionBar">
         <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
 
         <item name="android:statusBarColor">?android:attr/colorBackground</item>
diff --git a/app/src/main/res/values-v30/themes.xml b/app/src/main/res/values-v30/themes.xml
index 5973b52..573b68c 100644
--- a/app/src/main/res/values-v30/themes.xml
+++ b/app/src/main/res/values-v30/themes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.RboardPatcher" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Theme.RboardPatcher" parent="Theme.Material3Expressive.DayNight.NoActionBar">
         <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
 
         <item name="android:statusBarColor">?android:attr/colorBackground</item>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 735cedc..e2ace62 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Dialog.RboardPatcher.MaterialAlertDialog" parent="@style/ThemeOverlay.Material3.MaterialAlertDialog">
+    <style name="Dialog.RboardPatcher.MaterialAlertDialog" parent="@style/ThemeOverlay.Material3Expressive.MaterialAlertDialog">
         <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.MyApp.Dialog.Rounded
         </item>
     </style>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a3e4608..2a35d53 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.RboardPatcher" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Theme.RboardPatcher" parent="Theme.Material3Expressive.DayNight.NoActionBar">
         <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
 
         <item name="android:statusBarColor">?android:attr/colorBackground</item>
diff --git a/build.gradle.kts b/build.gradle.kts
index 44dbf37..329b45a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,7 +16,7 @@ buildscript {
     dependencies {
         classpath(libs.gradle)
         //noinspection DifferentKotlinGradleVersion
-        classpath(kotlin("gradle-plugin", version = "2.1.21"))
+        classpath(kotlin("gradle-plugin", version = "2.2.0"))
     }
 }
 
diff --git a/colorutilsc b/colorutilsc
index bda25ab..bae847f 160000
--- a/colorutilsc
+++ b/colorutilsc
@@ -1 +1 @@
-Subproject commit bda25ab9fde131ec27a188970f0709f2714bb0bb
+Subproject commit bae847f6b4cc2102d82ae58a1c6453fcc3cff534
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f275c91..ce46827 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,23 +1,23 @@
 [versions]
 androidx-junit = "1.2.1"
 appcompat = "1.7.1"
-browser = "1.9.0-alpha04"
+browser = "1.9.0-rc01"
 constraintlayout = "2.2.1"
-coreKtx = "1.16.0"
+coreKtx = "1.17.0-beta01"
 desugar_jdk_libs_nio = "2.1.5"
-espressoCore = "3.7.0-alpha03"
-gradle = "8.12.0-alpha04"
+espressoCore = "3.7.0-rc01"
+gradle = "8.12.0-alpha09"
 gson = "2.13.1"
 junit = "4.13.2"
-kotlinreflect = "2.1.21"
-kotlinStdlib = "2.1.21"
+kotlinreflect = "2.2.0"
+kotlinStdlib = "2.2.0"
 kotlinxCoroutinesAndroid = "1.10.2"
-kspPlugin = "2.1.21-2.0.2"
-material = "1.14.0-alpha01"
+kspPlugin = "2.2.0-2.0.2"
+material = "1.14.0-alpha02"
 preferenceKtx = "1.2.1"
 storage = "2.1.0"
-kotlin = "2.1.21"
-activity = "1.12.0-alpha02"
+kotlin = "2.2.0"
+activity = "1.12.0-alpha04"
 
 [libraries]
 appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0b37f8c..904295b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jun 11 21:35:19 CEST 2025
+#Wed Jul 16 21:11:42 CEST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/rboardcomponents b/rboardcomponents
index 7470482..fbd9a47 160000
--- a/rboardcomponents
+++ b/rboardcomponents
@@ -1 +1 @@
-Subproject commit 747048229dfea9305bfbe2458c42535a484b655a
+Subproject commit fbd9a475a480c166270cb944da81c1c23d847b53