diff --git a/app/build.gradle b/app/build.gradle
index 2e0a0248..5683d8e9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -69,10 +69,10 @@ dependencies {
 
     implementation "com.google.android.material:material:1.4.0"
 
-    implementation "androidx.activity:activity-ktx:1.3.1"
+    implementation "androidx.activity:activity-ktx:1.4.0"
     implementation "androidx.appcompat:appcompat:1.3.1"
     implementation "androidx.constraintlayout:constraintlayout:2.1.1"
-    implementation "androidx.core:core-ktx:1.6.0"
+    implementation "androidx.core:core-ktx:1.7.0"
     implementation "androidx.palette:palette-ktx:1.0.0"
     implementation "androidx.preference:preference-ktx:1.1.1"
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
@@ -88,7 +88,7 @@ dependencies {
     implementation "com.google.android.exoplayer:exoplayer:$exoplayerVersion"
     implementation "com.google.android.exoplayer:extension-mediasession:$exoplayerVersion"
 
-    implementation "com.google.code.gson:gson:2.8.8"
+    implementation "com.google.code.gson:gson:2.8.9"
     implementation 'com.android.volley:volley:1.2.1'
 
 }
diff --git a/app/src/main/java/org/y20k/transistor/helpers/UiHelper.kt b/app/src/main/java/org/y20k/transistor/helpers/UiHelper.kt
index d6d6b2e4..0667d1cf 100644
--- a/app/src/main/java/org/y20k/transistor/helpers/UiHelper.kt
+++ b/app/src/main/java/org/y20k/transistor/helpers/UiHelper.kt
@@ -156,7 +156,7 @@ object UiHelper {
      */
     abstract class SwipeToMarkStarredCallback(context: Context): ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.RIGHT) {
 
-        private val starIcon = ContextCompat.getDrawable(context, R.drawable.ic_star_24dp)
+        private val starIcon = ContextCompat.getDrawable(context, R.drawable.ic_marked_starred_star_24dp)
         private val intrinsicWidth: Int = starIcon?.intrinsicWidth ?: 0
         private val intrinsicHeight: Int = starIcon?.intrinsicHeight ?: 0
         private val background: ColorDrawable = ColorDrawable()
diff --git a/app/src/main/res/drawable/circular_progressbar.xml b/app/src/main/res/drawable/circular_progressbar.xml
deleted file mode 100644
index d5bb78ac..00000000
--- a/app/src/main/res/drawable/circular_progressbar.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rotate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fromDegrees="0"
-    android:toDegrees="0">
-    <shape
-        android:shape="ring"
-        android:thickness="3dp"
-        android:useLevel="true">
-
-        <gradient
-            android:angle="0"
-            android:endColor="@color/icon_default"
-            android:startColor="@color/icon_default"
-            android:type="sweep"
-            android:useLevel="false" />
-    </shape>
-</rotate>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circular_progressbar_background.xml b/app/src/main/res/drawable/circular_progressbar_background.xml
deleted file mode 100644
index 0a799bd5..00000000
--- a/app/src/main/res/drawable/circular_progressbar_background.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="ring"
-    android:thickness="3dp"
-    android:useLevel="false">
-
-    <solid android:color="@color/list_card_station_buffering_progress_background" />
-
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_star_24dp.xml b/app/src/main/res/drawable/ic_marked_starred_star_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_star_24dp.xml
rename to app/src/main/res/drawable/ic_marked_starred_star_24dp.xml
diff --git a/app/src/main/res/drawable/ic_star_default_24dp.xml b/app/src/main/res/drawable/ic_star_default_24dp.xml
new file mode 100644
index 00000000..b8750ed3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_star_default_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/icon_default"
+        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
+</vector>
diff --git a/app/src/main/res/layout/card_add_new_station.xml b/app/src/main/res/layout/card_add_new_station.xml
index 148e29d0..f9662d71 100644
--- a/app/src/main/res/layout/card_add_new_station.xml
+++ b/app/src/main/res/layout/card_add_new_station.xml
@@ -10,7 +10,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="16dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="16dp"
         app:cardBackgroundColor="@color/list_card_background"
@@ -36,7 +36,7 @@
         android:id="@+id/card_settings"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="16dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="16dp"
         app:cardBackgroundColor="@color/list_card_background"
diff --git a/app/src/main/res/layout/card_station.xml b/app/src/main/res/layout/card_station.xml
index e33cc1aa..340b2480 100644
--- a/app/src/main/res/layout/card_station.xml
+++ b/app/src/main/res/layout/card_station.xml
@@ -5,7 +5,10 @@
     android:id="@+id/station_card"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="8dp"
+    android:layout_marginStart="8dp"
+    android:layout_marginTop="16dp"
+    android:layout_marginEnd="8dp"
+    android:layout_marginBottom="0dp"
     app:cardBackgroundColor="@color/list_card_background"
     app:cardCornerRadius="4dp">
 
@@ -55,7 +58,7 @@
             app:layout_constraintStart_toEndOf="@+id/station_icon"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_bias="0.535"
-            app:srcCompat="@drawable/ic_star_24dp"
+            app:srcCompat="@drawable/ic_star_default_24dp"
             tools:visibility="visible" />
 
         <ImageView
diff --git a/app/src/main/res/layout/dialog_find_station.xml b/app/src/main/res/layout/dialog_find_station.xml
index 733aae35..fa365e92 100644
--- a/app/src/main/res/layout/dialog_find_station.xml
+++ b/app/src/main/res/layout/dialog_find_station.xml
@@ -51,10 +51,12 @@
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:paddingTop="16dp"
-        android:paddingBottom="44dp"
+        app:layout_constrainedHeight="true"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@+id/station_search_box_view"
         app:layout_constraintStart_toStartOf="@+id/station_search_box_view"
-        app:layout_constraintTop_toBottomOf="@+id/no_results_text_view" />
+        app:layout_constraintTop_toBottomOf="@+id/no_results_text_view"
+        app:layout_constraintVertical_bias="0" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 10e5e1a8..49c5c3d5 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -3,36 +3,32 @@
 
     <!-- NIGHT THEME COLORS -->
     <color name="app_window_background">@color/transistor_neutral_black</color>
-    <color name="status_bar_background">@color/transistor_neutral_black</color>
+    <color name="status_bar_background">@color/transistor_neutral_darker</color>
     <color name="app_onboarding_icons">@color/transistor_neutral_white</color>
 
-    <color name="toolbar_background">@color/transistor_neutral_black</color>
-    <!-- <color name="toolbar_text">@color/transistor_white</color> -->
+    <color name="toolbar_background">@color/transistor_neutral_darker</color>
 
-    <color name="text_default">@color/transistor_neutral_white</color>
+    <color name="text_default">@color/transistor_neutral_lighter</color>
     <color name="text_lightweight">@color/transistor_neutral_light</color>
     <color name="text_link">@color/transistor_accent_intense</color>
 
-    <color name="icon_default">@color/transistor_neutral_white</color>
-    <color name="icon_lightweight">@color/transistor_neutral_very_light</color>
-    <color name="icon_very_lightweight">@color/transistor_neutral_light</color>
+    <color name="icon_default">@color/transistor_neutral_lighter</color>
+    <color name="icon_lightweight">@color/transistor_neutral_light</color>
 
     <color name="player_play_pause_icon">@color/transistor_neutral_very_light</color>
     <color name="player_button_background">@color/transistor_accent_intense</color>
     <color name="player_button_buffering">@color/transistor_accent_light</color>
-    <color name="player_sheet_text_main">@color/transistor_neutral_white</color>
     <color name="player_sheet_background">@color/transistor_neutral_very_dark</color>
     <color name="player_sheet_background_border">@color/transistor_neutral_darker</color>
-    <color name="list_card_mark_starred_star">@color/transistor_neutral_very_light</color>
-    <color name="player_sheet_text_details">@color/transistor_neutral_white</color>
-    <color name="player_sheet_icon">@color/transistor_neutral_white</color>
+    <color name="player_sheet_text_main">@color/transistor_neutral_lighter</color>
+    <color name="player_sheet_text_details">@color/transistor_neutral_lighter</color>
+    <color name="player_sheet_icon">@color/transistor_neutral_lighter</color>
 
     <color name="list_card_background">@color/transistor_neutral_very_dark</color>
-    <color name="list_card_background_starred">@color/transistor_accent_dimmed</color>
     <color name="list_card_cover_background">@color/transistor_neutral_very_dark</color>
-    <color name="list_card_delete_background">@color/escapepod_red</color>
-    <color name="list_card_mark_starred_background">@color/transistor_accent_dimmed</color>
-    <color name="list_card_station_buffering_progress_background">@color/transistor_neutral_medium_light</color>
+    <color name="list_card_delete_background">@color/transistor_red</color>
+    <color name="list_card_mark_starred_background">@color/transistor_neutral_medium_light</color>
+    <color name="list_card_mark_starred_star">@color/transistor_neutral_very_light</color>
 
     <color name="search_result_background">@color/transistor_neutral_darker</color>
     <color name="search_result_background_selected">@color/transistor_neutral_dark</color>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 49e1e186..f352faf4 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -9,7 +9,7 @@
         <item name="colorPrimaryDark">@color/transistor_neutral_white</item>
         <item name="colorAccent">@color/transistor_accent_intense</item>
 
-        <!-- Don't show white status bar -->
+        <!-- Don't show light status bar -->
         <item name="android:windowLightStatusBar">false</item>
         <item name="android:statusBarColor">@color/status_bar_background</item>
 
diff --git a/app/src/main/res/values-v31/colors.xml b/app/src/main/res/values-v31/colors.xml
index 8ac09422..e3ddd9b5 100644
--- a/app/src/main/res/values-v31/colors.xml
+++ b/app/src/main/res/values-v31/colors.xml
@@ -9,40 +9,19 @@
 
 
     <!-- ADAPTIVE BASE COLORS - Android S - https://developer.android.com/reference/android/R.color#system_accent1_0 -->
-    <color name="transistor_neutral_dark1">#FF595959</color>
     <color name="transistor_neutral_dark">@android:color/system_neutral1_600</color>
-
-    <color name="transistor_neutral_darker1">#FF414141</color>
     <color name="transistor_neutral_darker">@android:color/system_neutral1_800</color>
-
-    <color name="transistor_neutral_very_dark1">#FF2D2D2D</color>
     <color name="transistor_neutral_very_dark">@android:color/system_neutral1_900</color>
-
-    <color name="transistor_neutral_medium_light1">#FF7D7D7D</color>
     <color name="transistor_neutral_medium_light">@android:color/system_neutral1_300</color>
-
-    <color name="transistor_neutral_light1">#FFDADADA</color>
     <color name="transistor_neutral_light">@android:color/system_neutral1_100</color>
-
-    <color name="transistor_neutral_lighter1">#FFDADADA</color>
     <color name="transistor_neutral_lighter">@android:color/system_neutral1_50</color>
-
-    <color name="transistor_neutral_very_light1">#FFF2F2F2</color>
     <color name="transistor_neutral_very_light">@android:color/system_neutral1_10</color>
 
-    <color name="transistor_accent_intense1">#FFDC3D33</color>
     <color name="transistor_accent_intense">@android:color/system_accent1_100</color>
-
-    <color name="transistor_accent_light1">#FFE17E77</color>
     <color name="transistor_accent_light">@android:color/system_accent1_50</color>
-
-    <color name="transistor_accent_dimmed1">#FFAD261E</color>
     <color name="transistor_accent_dimmed">@android:color/system_accent1_600</color>
 
-    <color name="transistor_neutral_black1">#FF121212</color>
     <color name="transistor_neutral_black">@android:color/system_neutral1_1000</color>
-
-    <color name="transistor_neutral_white1">#FFFFFFFF</color>
     <color name="transistor_neutral_white">@android:color/system_neutral1_0</color>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index e9b9c242..3eb62325 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,12 +3,10 @@
 <resources>
     <!-- DAY THEME COLORS -->
     <color name="app_window_background">@color/transistor_neutral_lighter</color>
-    <color name="status_bar_background">@color/transistor_neutral_white</color>
-    <color name="action_bar_background">@color/transistor_neutral_very_light</color>
+    <color name="status_bar_background">@color/transistor_neutral_light</color>
     <color name="app_onboarding_icons">@color/transistor_neutral_darker</color>
 
-    <color name="toolbar_background">@color/transistor_neutral_white</color>
-    <!-- <color name="toolbar_text">@color/text_default</color> -->
+    <color name="toolbar_background">@color/transistor_neutral_light</color>
 
     <color name="text_default">@color/transistor_neutral_darker</color>
     <color name="text_lightweight">@color/transistor_neutral_dark</color>
@@ -16,27 +14,24 @@
 
     <color name="icon_default">@color/transistor_neutral_dark</color>
     <color name="icon_lightweight">@color/transistor_neutral_medium_light</color>
-    <color name="icon_very_lightweight">@color/transistor_neutral_light</color>
 
     <color name="player_play_pause_icon">@color/transistor_neutral_very_light</color>
     <color name="player_button_background">@color/transistor_accent_intense</color>
     <color name="player_button_buffering">@color/transistor_accent_light</color>
-    <color name="player_sheet_text_main">@color/transistor_neutral_white</color>
     <color name="player_sheet_background">@color/transistor_neutral_darker</color>
     <color name="player_sheet_background_border">@color/transistor_neutral_dark</color>
+    <color name="player_sheet_text_main">@color/transistor_neutral_white</color>
     <color name="player_sheet_text_details">@color/transistor_neutral_white</color>
     <color name="player_sheet_icon">@color/transistor_neutral_white</color>
 
-    <color name="list_card_background">@color/transistor_neutral_white</color>
-    <color name="list_card_background_starred">@color/transistor_accent_intense</color>
-    <color name="list_card_cover_background">@color/transistor_neutral_very_light</color>
-    <color name="list_card_delete_background">@color/escapepod_red</color>
+    <color name="list_card_background">@color/transistor_neutral_very_light</color>
+    <color name="list_card_cover_background">@color/transistor_neutral_lighter</color>
+    <color name="list_card_delete_background">@color/transistor_red</color>
     <color name="list_card_mark_starred_background">@color/transistor_neutral_medium_light</color>
     <color name="list_card_mark_starred_star">@color/transistor_neutral_very_light</color>
-    <color name="list_card_station_buffering_progress_background">@color/transistor_neutral_light</color>
 
     <color name="search_result_background">@color/transistor_neutral_very_light</color>
-    <color name="search_result_background_selected">@color/transistor_neutral_light</color>
+    <color name="search_result_background_selected">@color/transistor_neutral_lighter</color>
 
     <!-- BASES COLORS -->
     <color name="transistor_neutral_dark">#FF595959</color> <!-- derived from recommended dark theme surface color -->
@@ -55,7 +50,7 @@
     <color name="transistor_neutral_white">#FFFFFFFF</color>
     <color name="transistor_transparent">#00ffffff</color>
 
-    <color name="escapepod_red">#FFDC3D33</color><!-- Slightly muted variant of -> Material Design 2: Red 600 -->
+    <color name="transistor_red">#FFDC3D33</color><!-- Slightly muted variant of -> Material Design 2: Red 600 -->
 <!--    <color name="transistor_red_light">#FFE15950</color>-->
 <!--    <color name="transistor_red_dark">#FFCA2D23</color>-->
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 20b6b985..12c9a1f3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -9,7 +9,7 @@
         <item name="colorPrimaryDark">@color/transistor_neutral_very_dark</item>
         <item name="colorAccent">@color/transistor_accent_dimmed</item>
 
-        <!-- Show white status bar -->
+        <!-- Show light status bar -->
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:statusBarColor">@color/status_bar_background</item>
 
diff --git a/metadata/en-US/changelogs/88.txt b/metadata/en-US/changelogs/88.txt
new file mode 100644
index 00000000..9d4c350a
--- /dev/null
+++ b/metadata/en-US/changelogs/88.txt
@@ -0,0 +1,7 @@
+# v4.0.17 - Andy Warhol
+
+**2021-11-05**
+
+- app theme now uses "dynamic colors" (Material You) on Android 12
+- small bug fixes
+- updated translations