diff --git a/build.gradle b/build.gradle
index ff4d49e3..6ba27252 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9a119efe..50535547 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Apr 22 21:25:44 MSK 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/poweramp_api_example/build.gradle b/poweramp_api_example/build.gradle
index a86e041f..1d162079 100644
--- a/poweramp_api_example/build.gradle
+++ b/poweramp_api_example/build.gradle
@@ -21,6 +21,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
+    namespace 'com.maxmpz.poweramp.apiexample'
 }
 
 
diff --git a/poweramp_api_example/src/main/AndroidManifest.xml b/poweramp_api_example/src/main/AndroidManifest.xml
index 01b8e948..29451038 100644
--- a/poweramp_api_example/src/main/AndroidManifest.xml
+++ b/poweramp_api_example/src/main/AndroidManifest.xml
@@ -2,8 +2,7 @@
 <manifest
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
-	package="com.maxmpz.poweramp.apiexample"
-	android:versionCode="1"
+    android:versionCode="1"
 	android:versionName="1.0">
 
 	<application
diff --git a/poweramp_lyrics_plugin_example/build.gradle b/poweramp_lyrics_plugin_example/build.gradle
index 70514349..66750510 100644
--- a/poweramp_lyrics_plugin_example/build.gradle
+++ b/poweramp_lyrics_plugin_example/build.gradle
@@ -21,6 +21,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'com.maxmpz.poweramplyricspluginexample'
 }
 
 dependencies {
diff --git a/poweramp_lyrics_plugin_example/src/main/AndroidManifest.xml b/poweramp_lyrics_plugin_example/src/main/AndroidManifest.xml
index aa0bd802..5369aae9 100644
--- a/poweramp_lyrics_plugin_example/src/main/AndroidManifest.xml
+++ b/poweramp_lyrics_plugin_example/src/main/AndroidManifest.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	package="com.maxmpz.poweramplyricspluginexample"
-	>
+	xmlns:tools="http://schemas.android.com/tools">
 
 	<application
 		android:allowBackup="false"
diff --git a/poweramp_provider_example/build.gradle b/poweramp_provider_example/build.gradle
index 9b6e2257..cb64d84e 100644
--- a/poweramp_provider_example/build.gradle
+++ b/poweramp_provider_example/build.gradle
@@ -21,6 +21,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'com.maxmpz.powerampproviderexample'
 }
 
 dependencies {
diff --git a/poweramp_provider_example/src/main/AndroidManifest.xml b/poweramp_provider_example/src/main/AndroidManifest.xml
index 938cc599..7173b280 100644
--- a/poweramp_provider_example/src/main/AndroidManifest.xml
+++ b/poweramp_provider_example/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	package="com.maxmpz.powerampproviderexample">
+	xmlns:tools="http://schemas.android.com/tools">
 
 	<application
 		android:allowBackup="false"
diff --git a/poweramp_skin_sample/build.gradle b/poweramp_skin_sample/build.gradle
index 20be2a67..19bc8053 100644
--- a/poweramp_skin_sample/build.gradle
+++ b/poweramp_skin_sample/build.gradle
@@ -18,33 +18,20 @@ android {
         }
     }
 
-    lintOptions {
-        disable "ResAuto", "MissingTranslation", "OnClick", "ExtraTranslation"
 
-    }
-    
-    aaptOptions {
-        def localProps = new Properties()
-        localProps.load(rootProject.file("local.properties").newDataInputStream())
-        def paResources = localProps['poweramp.apk'] ?: "Poweramp-build-953-resources.zip"
-        println "Using $paResources PA resources"
-
-        additionalParameters "--emit-ids", "${projectDir}/stable-ids.txt",
-                                "--package-id", "0x80",
-                                "-I", "${projectDir}/../${paResources}"
-        if(project.file("stable-ids.txt").exists()) {
-            println "Got stable-ids OK"
-            additionalParameters "--stable-ids", "${projectDir}/stable-ids.txt"
-        } else {
-            println "WARNING: no stable-ids.txt specified"
-        }
-    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'com.poweramp.v3.sampleskin'
+    androidResources {
+        additionalParameters '--emit-ids', "$projectDir/stable-ids.txt", '--package-id', '0x80', '-I', "$projectDir/../$aaptOptions.paResources"
+    }
+    lint {
+        disable 'ResAuto', 'MissingTranslation', 'OnClick', 'ExtraTranslation'
+    }
 }
 
 dependencies {
-    implementation "androidx.appcompat:appcompat-resources:1.4.1"
+    implementation "androidx.appcompat:appcompat-resources:1.6.1"
 }
diff --git a/poweramp_skin_sample/src/main/AndroidManifest.xml b/poweramp_skin_sample/src/main/AndroidManifest.xml
index c28ffe1e..42ace1ee 100644
--- a/poweramp_skin_sample/src/main/AndroidManifest.xml
+++ b/poweramp_skin_sample/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	package="com.poweramp.v3.sampleskin">
+	xmlns:tools="http://schemas.android.com/tools">
 
 	<!-- Queries element to support new package visibility rules for target sdk=30 and Android 11:
 	     https://developer.android.com/about/versions/11/privacy/package-visibility -->
diff --git a/poweramp_skin_sdk/reference_resources/color-sw2dp/eq_linear_knob_text_color_selector.xml b/poweramp_skin_sdk/reference_resources/color-sw2dp/eq_linear_knob_text_color_selector.xml
index 81b21544..b1f41988 100644
--- a/poweramp_skin_sdk/reference_resources/color-sw2dp/eq_linear_knob_text_color_selector.xml
+++ b/poweramp_skin_sdk/reference_resources/color-sw2dp/eq_linear_knob_text_color_selector.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_enabled="false" android:color="?colorTextDisabled" />
+	<item android:state_enabled="false" android:color="?colorTextDisabledSecondary" />
 	<item android:color="?android:textColorPrimary" />
 </selector>
 
diff --git a/poweramp_skin_sdk/reference_resources/color-sw2dp/eq_value_text_color_selector.xml b/poweramp_skin_sdk/reference_resources/color-sw2dp/eq_value_text_color_selector.xml
index a1b9cc11..c429c578 100644
--- a/poweramp_skin_sdk/reference_resources/color-sw2dp/eq_value_text_color_selector.xml
+++ b/poweramp_skin_sdk/reference_resources/color-sw2dp/eq_value_text_color_selector.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_enabled="false" android:color="#0000" />
-	<item android:color="?android:textColorSecondary" />
+	<item android:state_enabled="false" android:color="?colorTextDisabled" />
+	<item android:color="?android:textColorSecondary" /><!-- Also for state_locked -->
 </selector>
 
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw1dp/ripple_with_check_selector.xml b/poweramp_skin_sdk/reference_resources/drawable-sw1dp/ripple_with_check_selector.xml
index 8d7e312d..8243e512 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw1dp/ripple_with_check_selector.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw1dp/ripple_with_check_selector.xml
@@ -10,7 +10,10 @@
 		<selector android:exitFadeDuration="250">
 			<item android:state_activated="true">
 				<bitmap android:src="@drawable/check_16dp" android:gravity="right|center_vertical" android:tint="?colorIconPrimary"/>
-			</item>	
+			</item>
+			<item android:state_checked="true">
+				<bitmap android:src="@drawable/check_16dp" android:gravity="right|center_vertical" android:tint="?colorIconPrimary"/>
+			</item>
 		</selector>
 	</item>
 </ripple>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_back_10s_round.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_back_10s_round.xml
index f0139a9e..5ca8a382 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_back_10s_round.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_back_10s_round.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?colorInverse"
+	android:color="?colorPlaybackRipple"
 	>
 	<item>
 		<shape android:shape="oval">
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_ff_round.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_ff_round.xml
index 9bf895c3..ab5f2662 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_ff_round.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_ff_round.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?colorInverse"
+	android:color="?colorPlaybackRipple"
 >
 	<item>
 		<shape android:shape="oval">
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_forward_10s_round.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_forward_10s_round.xml
index 7481265e..d8a77418 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_forward_10s_round.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_forward_10s_round.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?colorInverse"
+	android:color="?colorPlaybackRipple"
 	>
 	<item>
 		<shape android:shape="oval">
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_next_cat_round.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_next_cat_round.xml
index 019eaa0a..80e3b226 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_next_cat_round.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_next_cat_round.xml
@@ -6,7 +6,7 @@
 <!-- NOTE: not using fill scaling for the buttons, they pretty much never scaled and size is defined
      by the appropriate style (e.g. TopSmallButton_size) -->
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?colorInverse"
+	android:color="?colorPlaybackRipple"
 >
 	<item>
 		<shape android:shape="oval">
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_pause_round.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_pause_round.xml
index b77b3444..906924ab 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_pause_round.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_pause_round.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?colorInverse"
+	android:color="?colorPlaybackRipple"
 	android:effectColor="#0000"
 	>
 	<item>
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_play_round_100dp.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_play_round_100dp.xml
index 8cae373b..9f672275 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_play_round_100dp.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_play_round_100dp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?colorInverse"
+	android:color="?colorPlaybackRipple"
 	android:effectColor="#0000"
 >
 	<item>
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_prev_cat_round.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_prev_cat_round.xml
index 0423da31..daa0b690 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_prev_cat_round.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_prev_cat_round.xml
@@ -6,7 +6,7 @@
 <!-- NOTE: not using fill scaling for the buttons, they pretty much never scaled and size is defined
      by the appropriate style (e.g. TopSmallButton_size) -->
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?colorInverse"
+	android:color="?colorPlaybackRipple"
 >
 	<item>
 		<shape android:shape="oval">
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_rw_round.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_rw_round.xml
index 8daff363..9710035a 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_rw_round.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-v31/ripple_rw_round.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?colorInverse"
+	android:color="?colorPlaybackRipple"
 >
 	<item>
 		<shape android:shape="oval">
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/add_next_shuffled_24dp.png b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/add_next_shuffled_24dp.png
index 7ee90a6c..2311401b 100644
Binary files a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/add_next_shuffled_24dp.png and b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/add_next_shuffled_24dp.png differ
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/add_to_pl_at_start_24dp.png b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/add_to_pl_at_start_24dp.png
index 26bd10f9..aabaf680 100644
Binary files a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/add_to_pl_at_start_24dp.png and b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/add_to_pl_at_start_24dp.png differ
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/add_to_pl_shuffled_24dp.png b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/add_to_pl_shuffled_24dp.png
index 941c7af3..93df3097 100644
Binary files a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/add_to_pl_shuffled_24dp.png and b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/add_to_pl_shuffled_24dp.png differ
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/autosave_24dp.png b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/autosave_24dp.png
new file mode 100644
index 00000000..ba589648
Binary files /dev/null and b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/autosave_24dp.png differ
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/edit_stroke_24dp.png b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/edit_stroke_24dp.png
index c50becee..f94e9bad 100644
Binary files a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/edit_stroke_24dp.png and b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/edit_stroke_24dp.png differ
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/enqueue_shuffled_24dp.png b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/enqueue_shuffled_24dp.png
index bf2a49b3..11326e19 100644
Binary files a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/enqueue_shuffled_24dp.png and b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/enqueue_shuffled_24dp.png differ
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/equ_graphic_small.png b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/equ_graphic_small.png
new file mode 100644
index 00000000..503976ff
Binary files /dev/null and b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/equ_graphic_small.png differ
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/equ_parametric_small.png b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/equ_parametric_small.png
new file mode 100644
index 00000000..c3f29aaa
Binary files /dev/null and b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/equ_parametric_small.png differ
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/export_24dp.png b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/export_24dp.png
index 1928f331..e06cbb0f 100644
Binary files a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/export_24dp.png and b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/export_24dp.png differ
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/import_24dp.png b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/import_24dp.png
index 037f63a6..73e09937 100644
Binary files a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/import_24dp.png and b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/import_24dp.png differ
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/lock_solid_24dp.png b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/lock_solid_24dp.png
new file mode 100644
index 00000000..6f914d2d
Binary files /dev/null and b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/lock_solid_24dp.png differ
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/lock_unlock_24dp.png b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/lock_unlock_24dp.png
new file mode 100644
index 00000000..1c9002cf
Binary files /dev/null and b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/lock_unlock_24dp.png differ
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/palette_24dp.png b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/palette_24dp.png
index 9091bc31..630b18d5 100644
Binary files a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/palette_24dp.png and b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/palette_24dp.png differ
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/reset_24dp.png b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/reset_24dp.png
new file mode 100644
index 00000000..6324551b
Binary files /dev/null and b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/reset_24dp.png differ
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/save_24dp.png b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/save_24dp.png
new file mode 100644
index 00000000..061378c2
Binary files /dev/null and b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/save_24dp.png differ
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/save_assign_24dp.png b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/save_assign_24dp.png
new file mode 100644
index 00000000..6ba0a75c
Binary files /dev/null and b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/save_assign_24dp.png differ
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/share_24dp.png b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/share_24dp.png
index 41f86bc7..a95f0dc7 100644
Binary files a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/share_24dp.png and b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/share_24dp.png differ
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/unlock_solid_24dp.png b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/unlock_solid_24dp.png
new file mode 100644
index 00000000..0eaf8be6
Binary files /dev/null and b/poweramp_skin_sdk/reference_resources/drawable-sw2dp-xxxhdpi/unlock_solid_24dp.png differ
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/alpha_strict_rounded_large.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/alpha_strict_rounded_large.xml
new file mode 100644
index 00000000..ff279a64
--- /dev/null
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/alpha_strict_rounded_large.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+	<corners android:radius="?corners_large"/>
+	<solid android:color="?colorBgPrimaryStrictAlpha"/>
+</shape>
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/checkable_non_tr_lighter_rounded_large.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/checkable_non_tr_lighter_rounded_large.xml
new file mode 100644
index 00000000..9f4b7281
--- /dev/null
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/checkable_non_tr_lighter_rounded_large.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- This one has non-transparent popup background -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_checked="true">
+		<ripple android:color="?colorInverse">
+			<item android:id="@android:id/mask" android:drawable="@drawable/rounded_large" />
+			<item>
+				<shape>
+					<corners android:radius="?corners_large"/>
+					<solid android:color="?colorBgCheckedLight"/>
+				</shape>
+			</item>
+		</ripple>
+	</item>
+
+	<item>
+		<ripple android:color="?colorPrimary">
+			<item android:id="@android:id/mask" android:drawable="@drawable/rounded_large" />
+			<item>
+				<shape>
+					<corners android:radius="?corners_large"/>
+					<stroke android:color="?colorStroke" android:width="1.25dp"/>
+					<solid android:color="?colorBgPrimary"/>
+				</shape>
+			</item>
+		</ripple>
+	</item>
+</selector>
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/knob_hole_selector.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/knob_hole_selector.xml
index f134ceda..5f08518a 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/knob_hole_selector.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/knob_hole_selector.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (C) 2010-2022 Maksim Petrov
+Copyright (C) 2010-2023 Maksim Petrov
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted for themes, skins, widgets, plugins, applications and other software
@@ -21,7 +21,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 <!-- NOTE: can't change size of drawable, thus, emulating bolder hole when pressed with invisile (#0000) stroke.
      Also, width/height=3dp defines min size for appropriate axis. -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
+<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:w="http://schemas.android.com/apk/res-auto"
 	android:exitFadeDuration="300"
 >
 	<item android:state_enabled="false">
@@ -33,7 +33,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 			<stroke android:color="#0000" android:width="0dp"/>
 		</shape>
 	</item>
-	
+
+	<item w:state_locked="true">
+		<shape>
+			<size android:width="3dp" android:height="3dp"/>
+			<padding android:left="18dp" android:right="18dp" android:top="20dp" android:bottom="20dp"/>
+			<corners android:radius="3dp"/>
+			<solid android:color="?colorKnobHoleDisabled"/>
+			<stroke android:color="#0000" android:width="0dp"/>
+		</shape>
+	</item>
+
 	<item android:state_pressed="true">
 		<shape>
 			<size android:width="3dp" android:height="3dp"/>
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/knob_thumb_selector.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/knob_thumb_selector.xml
index 6a683361..d0e8b970 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/knob_thumb_selector.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/knob_thumb_selector.xml
@@ -1,70 +1,107 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2010-2023 Maksim Petrov
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted for themes, skins, widgets, plugins, applications and other software
+which communicate with Poweramp music player application on Android platform.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
 
 <!-- NOTE: keeping ripple as top drawable item: 
 	- that allows setting software mode on it
 	- avoiding multiple ripples inside drawable hierarchy
+	NOTE: ripple is a layer-list itself
+	NOTE: layer gravity is supported started from Android 6.0, so we're limited to absolute offsets here
+	      to position the inner layers
 --> 
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?colorKnobRipple">
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" xmlns:w="http://schemas.android.com/apk/res-auto"
+	android:color="?colorKnobRipple"
+>
+	<!-- NOTE: layer item width/height is supported for SDK 23+, thus, using linear knob thumbWidth/height attributes instead -->
+	<!-- <item android:width="32dp" android:height="64dp"> -->
 	<item>
-		<layer-list>
-			<!-- NOTE: layer item width/height is supported for SDK 23+, thus, using linear knob thumbWidth/height attributes instead -->
-			<!-- <item android:width="32dp" android:height="64dp"> -->
+		<selector android:exitFadeDuration="300">
+
+			<item android:state_enabled="false">
+				<shape>
+					<corners android:radius="?corners_knob_thumb"/>
+					<solid android:color="?colorKnobBg"/>
+					<stroke android:color="?colorKnobDisabled" android:width="2dp"/>
+				</shape>
+			</item>
+
+			<!-- This is custom state which is applied when band is in "locked" state. Similar to disabled state -->
+			<item w:state_locked="true">
+				<shape>
+					<corners android:radius="?corners_knob_thumb"/>
+					<solid android:color="?colorKnobBg"/>
+					<stroke android:color="?colorKnobDisabled" android:width="2dp"/>
+				</shape>
+			</item>
+
+			<item android:state_pressed="true">
+				<shape>
+					<corners android:radius="?corners_knob_thumb"/>
+					<solid android:color="?colorKnobBg"/>
+					<stroke android:color="?colorKnobPressed" android:width="3.5dp"/>
+				</shape>
+			</item>
+
 			<item>
-				<selector android:exitFadeDuration="300">
-					<item android:state_enabled="false">
-						<shape>
-							<corners android:radius="?corners_knob_thumb"/>
-							<solid android:color="?colorKnobBg"/>
-							<stroke android:color="?colorKnobDisabled" android:width="2dp"/>
-						</shape>
-					</item>
-					
-					<item android:state_pressed="true">
-						<shape>
-							<corners android:radius="?corners_knob_thumb"/>
-							<solid android:color="?colorKnobBg"/>
-							<stroke android:color="?colorKnobPressed" android:width="3.5dp"/>
-						</shape>
-					</item>
-						
-					<item>
-						<shape>
-							<corners android:radius="?corners_knob_thumb"/>
-							<solid android:color="?colorKnobBg"/>
-							<stroke android:color="?colorKnob" android:width="2dp"/>
-						</shape>
-					</item>
-				</selector>
+				<shape>
+					<corners android:radius="?corners_knob_thumb"/>
+					<solid android:color="?colorKnobBg"/>
+					<stroke android:color="?colorKnob" android:width="2dp"/>
+				</shape>
 			</item>
-			
-			<item android:top="@dimen/knob_thumb_indicator_top_bottom" 
-				android:left="@dimen/knob_thumb_indicator_left_right" 
-				android:right="@dimen/knob_thumb_indicator_left_right" 
-				android:bottom="@dimen/knob_thumb_indicator_top_bottom"
-			>
-				<selector android:exitFadeDuration="300">
-					<item android:state_enabled="false">
-						<shape>
-							<solid android:color="?colorKnobIndicatorDisabled"/>
-							<corners android:radius="2dp"/>
-						</shape>
-					</item>
-					<item android:state_pressed="true">
-						<shape>
-							<solid android:color="?colorKnobIndicatorPressed"/>
-							<corners android:radius="2dp"/>
-						</shape>
-					</item>
-					<item>
-						<shape>
-							<solid android:color="?colorKnobIndicator"/>
-							<corners android:radius="2dp"/>
-						</shape>
-					</item>
-				</selector>
+		</selector>
+	</item>
+
+	<item android:top="@dimen/knob_thumb_indicator_top_bottom"
+		android:left="@dimen/knob_thumb_indicator_left_right"
+		android:right="@dimen/knob_thumb_indicator_left_right"
+		android:bottom="@dimen/knob_thumb_indicator_top_bottom"
+	>
+		<selector android:exitFadeDuration="300">
+			<item android:state_enabled="false">
+				<shape>
+					<solid android:color="?colorKnobIndicatorDisabled"/>
+					<corners android:radius="2dp"/>
+				</shape>
+			</item>
+			<item android:state_pressed="true">
+				<shape>
+					<solid android:color="?colorKnobIndicatorPressed"/>
+					<corners android:radius="2dp"/>
+				</shape>
+			</item>
+			<item>
+				<shape>
+					<solid android:color="?colorKnobIndicator"/>
+					<corners android:radius="2dp"/>
+				</shape>
 			</item>
-			
-		</layer-list>
+		</selector>
 	</item>
+	<!--<item android:width="@dimen/knob_thumb_lock_size" android:height="@dimen/knob_thumb_lock_size"-->
+	<!--	android:top="@dimen/knob_thumb_lock_top" android:left="@dimen/knob_thumb_lock_left">-->
+	<!--	<selector android:exitFadeDuration="300">-->
+	<!--		&lt;!&ndash; This is custom state which is applied when band is in "locked" state. Similar to disabled state &ndash;&gt;-->
+	<!--		<item w:state_locked="true">-->
+	<!--			<bitmap android:src="@drawable/lock_solid_24dp" android:tint="?colorIconDisabled"/>-->
+	<!--		</item>-->
+	<!--	</selector>-->
+	<!--</item>-->
 </ripple>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/lock_24dp_tinted.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/lock_24dp_tinted.xml
new file mode 100644
index 00000000..c37f4936
--- /dev/null
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/lock_24dp_tinted.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+	android:src="@drawable/lock_solid_24dp"
+	android:tint="?colorIconPrimary"
+	/>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/lock_unlock_24dp_selector.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/lock_unlock_24dp_selector.xml
new file mode 100644
index 00000000..9d044844
--- /dev/null
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/lock_unlock_24dp_selector.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+	android:exitFadeDuration="@integer/selector_fade_ms">
+
+	<item android:state_checked="true" android:drawable="@drawable/lock_solid_24dp" />
+	<item android:drawable="@drawable/unlock_solid_24dp" />
+
+</selector>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/preamp_bg.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/preamp_bg.xml
index b3a4e6ca..84f99338 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/preamp_bg.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/preamp_bg.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<corners android:radius="?corners_medium_plus" />
-	<solid android:color="?colorPreampBg" />
-</shape>
+<!-- NOTE: adding right inset for preamp bg - this allows for extra padding between preamp and first band
+     without adding any extra intermediate layouts with margins -->
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+	android:insetRight="@dimen/preamp_bg_insetRight"
+	>
+	<shape >
+		<corners android:radius="?corners_medium_plus" />
+		<solid android:color="?colorPreampBg" />
+	</shape>
+</inset>
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_alpha_rounded_small.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_alpha_rounded_small.xml
index e37a30bd..cf932abb 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_alpha_rounded_small.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_alpha_rounded_small.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
+<!-- NOTE USED -->
 <ripple xmlns:android="http://schemas.android.com/apk/res/android" 
 	android:color="?colorInverse">
 	<item android:drawable="@drawable/alpha_rounded_small" />
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_back_10s_round.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_back_10s_round.xml
index 5ba23a65..d7d0a9cb 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_back_10s_round.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_back_10s_round.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?colorInverse"
+	android:color="?colorPlaybackRipple"
 >
 	<item android:drawable="?back_10s_round" />
 </ripple>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_ff_round.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_ff_round.xml
index 1e957774..ea6211d6 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_ff_round.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_ff_round.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?colorInverse"
+	android:color="?colorPlaybackRipple"
 >
 	<item android:drawable="?ff_round" />
 </ripple>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_forward_10s_round.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_forward_10s_round.xml
index 03f15a2b..3e3563bf 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_forward_10s_round.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_forward_10s_round.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?colorInverse"
+	android:color="?colorPlaybackRipple"
 >
 	<item android:drawable="?forward_10s_round" />
 </ripple>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_inverse_alpha_rounded_large.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_inverse_alpha_rounded_large.xml
index 06c9ba05..7c0160b5 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_inverse_alpha_rounded_large.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_inverse_alpha_rounded_large.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android" 
-	android:color="?colorInverse">
+	android:color="?colorPlaybackRipple">
 	<item android:drawable="@drawable/inverse_alpha_rounded_large" />
 </ripple>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_inverse_rounded_large.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_inverse_rounded_large.xml
index 1544c5eb..8a8841e5 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_inverse_rounded_large.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_inverse_rounded_large.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<ripple xmlns:android="http://schemas.android.com/apk/res/android" 
+<!-- NOT USED -->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
 	android:color="?colorInverse"
 	>
 	<item android:drawable="@drawable/inverse_rounded_large" />
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_inverse_stroke_bg_rounded_large.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_inverse_stroke_bg_rounded_large.xml
index 831e9aff..4ab7cea9 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_inverse_stroke_bg_rounded_large.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_inverse_stroke_bg_rounded_large.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<ripple xmlns:android="http://schemas.android.com/apk/res/android" 
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
 	android:color="?colorPrimary"
 >
-	<item android:id="@android:id/mask" android:drawable="@drawable/rounded_large" />	
+	<item android:id="@android:id/mask" android:drawable="@drawable/rounded_large" />
 	<item>
 		<selector android:exitFadeDuration="300">
 			<item android:state_enabled="false" android:drawable="@drawable/rounded_large"/>
-			<item android:drawable="@drawable/inverse_stroke_bg_rounded_large"/> 
+			<item android:drawable="@drawable/inverse_stroke_bg_rounded_large"/>
 		</selector>
 	</item>
 </ripple>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_next_cat_round.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_next_cat_round.xml
index 862fe11b..147b6757 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_next_cat_round.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_next_cat_round.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?colorInverse"
+	android:color="?colorPlaybackRipple"
 >
 	<item android:drawable="?next_cat_round" />
 </ripple>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_pause_round.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_pause_round.xml
index 9b0ac4e3..54ea3e33 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_pause_round.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_pause_round.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?colorInverse"
+	android:color="?colorPlaybackRipple"
 	android:effectColor="#0000"
 >
 	<item android:drawable="?pause_round" />
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_play_round_100dp.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_play_round_100dp.xml
index 1543c63f..fa2dbe53 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_play_round_100dp.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_play_round_100dp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?colorInverse"
+	android:color="?colorPlaybackRipple"
 	android:effectColor="#0000"
 >
 	<item android:drawable="?play_round" />
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_prev_cat_round.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_prev_cat_round.xml
index d2bcb6d7..d35637eb 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_prev_cat_round.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_prev_cat_round.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?colorInverse"
+	android:color="?colorPlaybackRipple"
 >
 	<item android:drawable="?prev_cat_round" />
 </ripple>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_primary_bg_generic.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_primary_bg_generic.xml
new file mode 100644
index 00000000..ba0da200
--- /dev/null
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_primary_bg_generic.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" 
+	android:color="?attr/colorControlHighlight">
+	<item android:drawable="@drawable/rounded_generic" />
+</ripple>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_rw_round.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_rw_round.xml
index e970ebc2..70271658 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_rw_round.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_rw_round.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-	android:color="?colorInverse"
+	android:color="?colorPlaybackRipple"
 >
 	<item android:drawable="?rw_round" />
 </ripple>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_text_bg_rounded_small_labels.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_text_bg_rounded_small_labels.xml
index cf015759..8fa37555 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_text_bg_rounded_small_labels.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/ripple_text_bg_rounded_small_labels.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android" 
-	android:color="?colorInverse">
+	android:color="?colorPlaybackRipple">
 	<item android:drawable="@drawable/text_bg_alpha_rounded_small_labels" />
 </ripple>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/round_knob.xml b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/round_knob.xml
index bd235eee..6fc7e8b2 100644
--- a/poweramp_skin_sdk/reference_resources/drawable-sw2dp/round_knob.xml
+++ b/poweramp_skin_sdk/reference_resources/drawable-sw2dp/round_knob.xml
@@ -1,6 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2010-2023 Maksim Petrov
 
-<ripple xmlns:android="http://schemas.android.com/apk/res/android" 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted for themes, skins, widgets, plugins, applications and other software
+which communicate with Poweramp music player application on Android platform.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" xmlns:w="http://schemas.android.com/apk/res-auto"
 	android:color="?colorKnobRipple">
 	<item>
 		<selector android:exitFadeDuration="300">
@@ -11,6 +30,13 @@
 				</shape>
 			</item>
 
+			<!-- This is custom state which is applied when band is in "locked" state. Similar to disabled state -->
+			<item w:state_locked="true">
+				<shape android:shape="oval">
+					<solid android:color="?colorKnobBg"/>
+				</shape>
+			</item>
+
 			<item android:state_pressed="true">
 				<shape android:shape="oval">
 					<stroke android:color="?colorKnobPressed" android:width="3dp"/>
diff --git a/poweramp_skin_sdk/reference_resources/layout-sw1dp/merge_toast.xml b/poweramp_skin_sdk/reference_resources/layout-sw1dp/merge_toast.xml
index a863e61d..3afce7e2 100644
--- a/poweramp_skin_sdk/reference_resources/layout-sw1dp/merge_toast.xml
+++ b/poweramp_skin_sdk/reference_resources/layout-sw1dp/merge_toast.xml
@@ -59,8 +59,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 				style="?TopToastTitle_no_icon"
 				w:applyEvenIfGone="true"
 			/>
-			
-			<com.maxmpz.widget.base.FastTextView android:id="@+id/line2"
+
+			<!-- NOTE: TextView is needed to be able to show links -->
+			<!-- REVISIT: allow clickable underlined FTV (whole string though, requires also different text styling) -->
+			<TextView android:id="@+id/line2"
 				style="?TopToastLine2"
 			/>
 			<SceneParams w:scene="@+id/scene_expanded"
diff --git a/poweramp_skin_sdk/reference_resources/layout-sw2dp/activity_main.xml b/poweramp_skin_sdk/reference_resources/layout-sw2dp/activity_main.xml
index 9dc53e00..a05c80df 100644
--- a/poweramp_skin_sdk/reference_resources/layout-sw2dp/activity_main.xml
+++ b/poweramp_skin_sdk/reference_resources/layout-sw2dp/activity_main.xml
@@ -21,7 +21,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 <merge
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:w="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools" xmlns:w="http://schemas.android.com/apk/res-auto"
 >
 
 <!--
@@ -98,7 +98,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<!-- cc_button -->
 	<com.maxmpz.audioplayer.widget.MediaRouteButton android:id="@+id/cc_button"
 		style="?CcButton_MainUI"
-	/>
+		tools:ignore="MissingClass"
+		/>
 	<SceneParams w:scene="@+id/scene_playing"
 		style="?CcButton_MainUI_scenes_playing"
 	/>
@@ -521,7 +522,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<com.maxmpz.widget.base.MenuPlaceholderLayout android:id="@+id/menu_placeholder2"
 		style="?TopMenuPlaceholderLayout"
 		w:privateScene="true"
-	/>
+		/>
+
+	<include android:layout="@layout/merge_upper_toast"/>
+	<!-- This is for toast_container -->
+	<SceneParams w:scene="@id/scene_vis_temp_ui" w:scene_2="@id/scene_vis"
+		w:baseScene="defaultScene"
+		/>
+	<!-- Alpha is overridden for this scene -->
+	<SceneParams w:scene="@id/scene_vis_w_ui"
+		w:baseScene="defaultScene"
+		/>
+
 
 	<include android:layout="@layout/merge_toast"/>
 
diff --git a/poweramp_skin_sdk/reference_resources/layout-sw2dp/item_eq_preset.xml b/poweramp_skin_sdk/reference_resources/layout-sw2dp/item_eq_preset.xml
index b319d204..cacf4797 100644
--- a/poweramp_skin_sdk/reference_resources/layout-sw2dp/item_eq_preset.xml
+++ b/poweramp_skin_sdk/reference_resources/layout-sw2dp/item_eq_preset.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (C) 2010-2018 Maksim Petrov
+Copyright (C) 2010-2023 Maksim Petrov
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted for themes, skins, widgets, plugins, applications and other software
@@ -30,12 +30,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		style="?ItemPopupListFrs"
 		android:importantForAccessibility="no"
 	/>
-	
+
+	<com.maxmpz.widget.base.BusActionButton android:id="@+id/lock"
+		style="?ItemEqPresetLock"
+	/>
+
 	<com.maxmpz.widget.base.FastCheckBoxOnly android:id="@+id/select_box"
 		style="?ItemEqPresetSelectBox"
 	/>
-	<com.maxmpz.widget.base.FastTextView android:id="@+id/title"
-		style="?ItemPopupListTitleLarger"
+
+	<com.maxmpz.audioplayer.widget.MarqueeFastTextView android:id="@+id/title"
+		style="@style/ItemEqPresetTitle"
 	/>
 	
 </com.maxmpz.widget.player.list.TextItemView>
diff --git a/poweramp_skin_sdk/reference_resources/layout-sw2dp/item_eq_preset_2line.xml b/poweramp_skin_sdk/reference_resources/layout-sw2dp/item_eq_preset_2line.xml
index e0e8e27f..9e07ff7c 100644
--- a/poweramp_skin_sdk/reference_resources/layout-sw2dp/item_eq_preset_2line.xml
+++ b/poweramp_skin_sdk/reference_resources/layout-sw2dp/item_eq_preset_2line.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (C) 2010-2021 Maksim Petrov
+Copyright (C) 2010-2023 Maksim Petrov
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted for themes, skins, widgets, plugins, applications and other software
@@ -30,48 +30,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		style="?ItemPopupListFrs"
 		android:importantForAccessibility="no"
 	/>
-	
+
+	<com.maxmpz.widget.base.BusActionButton android:id="@+id/lock"
+		style="?ItemEqPresetLock"
+		/>
+
 	<com.maxmpz.widget.base.FastCheckBoxOnly android:id="@+id/select_box"
 		style="?ItemEqPresetSelectBox"
 	/>
-	
-	<com.maxmpz.widget.base.FastTextView android:id="@+id/title"
-		style="?ItemPopupListTitleLarger_2line"
-	/>
-	
-	<!-- Spacer used to align icons to ItemPopupListTitleLarger_2line padding -->
-	<com.maxmpz.widget.base.InvisibleView
-		style="?ItemPopupListMicroIconSpace"
-	/>
-	
-	<com.maxmpz.widget.base.FastTextView android:id="@+id/speaker"
-		android:drawable="?pre_speaker"
-		style="?ItemPopupListMicroIcon"
-	/>
-	<com.maxmpz.widget.base.FastTextView android:id="@+id/wired"
-		android:drawable="?pre_wired"
-		style="?ItemPopupListMicroIcon"
-	/>
-	<com.maxmpz.widget.base.FastTextView android:id="@+id/bt"
-		android:drawable="?pre_bt"
-		style="?ItemPopupListMicroIcon"
-	/>
-	<com.maxmpz.widget.base.FastTextView android:id="@+id/usb"
-		android:drawable="?pre_usb"
-		style="?ItemPopupListMicroIcon"		
-	/>
-	<com.maxmpz.widget.base.FastTextView android:id="@+id/chromecast"
-		android:drawable="?pre_chromecast"
-		style="?ItemPopupListMicroIcon"
-	/>
-	<com.maxmpz.widget.base.FastTextView android:id="@+id/other"
-		android:drawable="?pre_other"
-		style="?ItemPopupListMicroIcon"
-	/>
-	<com.maxmpz.widget.base.FastTextView android:id="@+id/song"
-		android:drawable="?pre_song"
-		style="?ItemPopupListMicroIcon"
+
+	<com.maxmpz.audioplayer.widget.MarqueeFastTextView android:id="@+id/title"
+		style="?ItemEqPresetTitle_2line"
 	/>
 	
-		
+	<com.maxmpz.widget.base.FastTextView android:id="@+id/line2"
+		style="?ItemEqPresetLine2_2line"
+		/>
+
 </com.maxmpz.widget.player.list.TextItemView>
diff --git a/poweramp_skin_sdk/reference_resources/layout-sw2dp/item_eq_preset_3line.xml b/poweramp_skin_sdk/reference_resources/layout-sw2dp/item_eq_preset_3line.xml
new file mode 100644
index 00000000..487ee9b1
--- /dev/null
+++ b/poweramp_skin_sdk/reference_resources/layout-sw2dp/item_eq_preset_3line.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2010-2023 Maksim Petrov
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted for themes, skins, widgets, plugins, applications and other software
+which communicate with Poweramp music player application on Android platform.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<!-- NOTE: layoutWidth/height of items are always ignored (see EqPresetButtonLayoutBase listItemSize). Used for presets with assignment -->
+<com.maxmpz.widget.player.list.TextItemView 
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:w="http://schemas.android.com/apk/res-auto"
+	
+	style="?ItemEqPreset"
+>
+	<com.maxmpz.widget.player.FrequencyResponseScroller android:id="@+id/frs"
+		style="?ItemPopupListFrs"
+		android:importantForAccessibility="no"
+	/>
+
+	<com.maxmpz.widget.base.BusActionButton android:id="@+id/lock"
+		style="?ItemEqPresetLock"
+		/>
+
+	<com.maxmpz.widget.base.FastCheckBoxOnly android:id="@+id/select_box"
+		style="?ItemEqPresetSelectBox"
+	/>
+
+	<com.maxmpz.audioplayer.widget.MarqueeFastTextView android:id="@+id/title"
+		style="?ItemEqPresetTitle_2line"
+	/>
+
+	<com.maxmpz.widget.base.FastTextView android:id="@+id/line2"
+		style="?ItemEqPresetLine2_3line"
+		/>
+
+	<!-- Spacer used to align icons to ItemPopupListTitleLarger_2line padding -->
+	<com.maxmpz.widget.base.InvisibleView
+		style="?ItemPopupListMicroIconSpace"
+		/>
+
+	<com.maxmpz.widget.base.FastTextView android:id="@+id/speaker"
+		android:drawable="?pre_speaker"
+		style="?ItemPopupListMicroIcon"
+	/>
+	<com.maxmpz.widget.base.FastTextView android:id="@+id/wired"
+		android:drawable="?pre_wired"
+		style="?ItemPopupListMicroIcon"
+	/>
+	<com.maxmpz.widget.base.FastTextView android:id="@+id/bt"
+		android:drawable="?pre_bt"
+		style="?ItemPopupListMicroIcon"
+	/>
+	<com.maxmpz.widget.base.FastTextView android:id="@+id/usb"
+		android:drawable="?pre_usb"
+		style="?ItemPopupListMicroIcon"		
+	/>
+	<com.maxmpz.widget.base.FastTextView android:id="@+id/chromecast"
+		android:drawable="?pre_chromecast"
+		style="?ItemPopupListMicroIcon"
+	/>
+	<com.maxmpz.widget.base.FastTextView android:id="@+id/other"
+		android:drawable="?pre_other"
+		style="?ItemPopupListMicroIcon"
+	/>
+	<com.maxmpz.widget.base.FastTextView android:id="@+id/song"
+		android:drawable="?pre_song"
+		style="?ItemPopupListMicroIcon"
+	/>
+	
+		
+</com.maxmpz.widget.player.list.TextItemView>
diff --git a/poweramp_skin_sdk/reference_resources/layout-sw2dp/item_eq_preset_assign_cb.xml b/poweramp_skin_sdk/reference_resources/layout-sw2dp/item_eq_preset_assign_cb.xml
new file mode 100644
index 00000000..a8a2f287
--- /dev/null
+++ b/poweramp_skin_sdk/reference_resources/layout-sw2dp/item_eq_preset_assign_cb.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2010-2023 Maksim Petrov
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted for themes, skins, widgets, plugins, applications and other software
+which communicate with Poweramp music player application on Android platform.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<com.maxmpz.widget.base.FastLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:w="http://schemas.android.com/apk/res-auto"
+	style="@style/EqPresetSearchAssignLayout"
+	android:clickable="true"
+	>
+	<com.maxmpz.widget.base.FastCheckBox android:id="@+id/eq_presets_assign"
+		style="@style/EqPresetSearchAssignCb"
+		android:text="@string/assign_preset_to_this_device"
+		/>
+	<com.maxmpz.widget.base.FastCheckBox android:id="@+id/eq_preset_dont_suggest"
+		style="@style/EqPresetSearchDontSuggestCb"
+		android:text="@string/dont_suggest_autoeq_preset_for_this_device"
+		/>
+</com.maxmpz.widget.base.FastLayout>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/layout-sw2dp/item_eq_preset_search.xml b/poweramp_skin_sdk/reference_resources/layout-sw2dp/item_eq_preset_search.xml
new file mode 100644
index 00000000..4dcd19dd
--- /dev/null
+++ b/poweramp_skin_sdk/reference_resources/layout-sw2dp/item_eq_preset_search.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2010-2023 Maksim Petrov
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted for themes, skins, widgets, plugins, applications and other software
+which communicate with Poweramp music player application on Android platform.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<com.maxmpz.widget.base.FastLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:w="http://schemas.android.com/apk/res-auto"
+	style="@style/EqPresetSearchLayout"
+	android:clickable="true"
+	>
+
+	<com.maxmpz.widget.base.FastLayout
+		style="@style/EqPresetSearchPanel"
+	>
+		<!-- NOTE: we consume space from right here, so search text view is not taking full width -->
+		<com.maxmpz.widget.base.BusActionButton
+			style="@style/EqPresetSearchCloseButton"
+			android:contentDescription="@string/clear"
+			w:busId="parent"
+			w:msgId="@id/cmd_list_search_clear"
+			/>
+		<com.maxmpz.audioplayer.widget.LocalListSearchEditText android:id="@+id/eq_search_edit"
+			style="@style/EqPresetSearchEditText"
+			w:busId="parent"
+			android:hint="@string/search"
+			/>
+	</com.maxmpz.widget.base.FastLayout>
+
+	<com.maxmpz.audioplayer.widget.EqPresetSearchCatsLayout android:id="@+id/eq_search_type"
+		style="@style/EqPresetSearchCatsLayout"
+		>
+		<!-- Group "g" -->
+		<com.maxmpz.widget.base.FastCheckBox
+			style="@style/EqPresetSearchCatButton"
+			android:text="@string/user_plural_adj_short"
+			android:tag="g/user"
+			/>
+		<com.maxmpz.widget.base.FastCheckBox
+			style="@style/EqPresetSearchCatButton"
+			android:text="@string/builtin_presets_short"
+			android:tag="g/built_in"
+			/>
+		<com.maxmpz.widget.base.FastCheckBox
+			style="@style/EqPresetSearchCatButton"
+			android:text="@string/auto_eq"
+			android:id="@+id/auto_eq"
+			android:tag="g/auto_eq"
+			/>
+		<com.maxmpz.widget.base.NonOverlappingView
+			style="@style/EqPresetSearchCatSeparator"
+			w:layout_attachTopToTop="@+id/auto_eq"
+			w:layout_attachBottomToBottom="@+id/auto_eq"
+			/>
+
+		<!-- Group "t" -->
+		<com.maxmpz.widget.base.FastCheckBox android:id="@+id/graphic"
+			style="@style/EqPresetSearchCatButton"
+			android:drawable="?equ_graphic_small"
+			android:text="@string/graphic_equ_short"
+			android:tag="t/graphic"
+			/>
+		<com.maxmpz.widget.base.FastCheckBox android:id="@+id/parametric"
+			style="@style/EqPresetSearchCatButton"
+			w:layout_consumeSpace="vertical|reset_horizontal"
+			android:drawable="?equ_parametric_small"
+			android:text="@string/parametric_equ_short"
+			android:tag="t/parametric"
+			/>
+
+		<!--
+		<com.maxmpz.widget.base.NonOverlappingView
+			style="@style/EqPresetSearchCatSeparator"
+			w:layout_attachTopToTop="@+id/parametric"
+			w:layout_attachBottomToBottom="@+id/parametric"
+			/>
+			-->
+
+		<com.maxmpz.widget.base.FastCheckBox android:id="@+id/assigned"
+			style="@style/EqPresetSearchCatButton"
+			android:text="@string/assigned_short"
+			android:tag="f/assigned"
+			/>
+
+		<com.maxmpz.widget.base.NonOverlappingView
+			style="@style/EqPresetSearchCatSeparator"
+			w:layout_attachTopToTop="@+id/assigned"
+			w:layout_attachBottomToBottom="@+id/assigned"
+			/>
+
+		<!-- REVISIT: disable/hide this when no device exists -->
+		<com.maxmpz.widget.base.BusActionButton
+			style="@style/EqPresetSearchCatButton"
+			android:text="@string/device_short"
+			w:busId="parent"
+			w:msgId="@id/cmd_list_search_device"
+			w:disableForStateBusId="@id/bus_player"
+			w:enableForStateId="@id/state_player_output_end_device"
+			w:disableForStateMsgId="@id/msg_pipeline_started"
+			w:disableForStateMsgId_2="@id/msg_player_output_meta_changed"
+			/>
+
+
+	</com.maxmpz.audioplayer.widget.EqPresetSearchCatsLayout>
+</com.maxmpz.widget.base.FastLayout>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/layout-sw2dp/item_separator_button.xml b/poweramp_skin_sdk/reference_resources/layout-sw2dp/item_separator_button.xml
index 4b1c21cc..4f31c14e 100644
--- a/poweramp_skin_sdk/reference_resources/layout-sw2dp/item_separator_button.xml
+++ b/poweramp_skin_sdk/reference_resources/layout-sw2dp/item_separator_button.xml
@@ -31,5 +31,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<com.maxmpz.widget.base.FastButton android:id="@+id/line2"
 		style="?SeparatorWithButtonButton"
 	/>
+	<com.maxmpz.widget.base.NonOverlappingView
+		style="@style/SeparatorLine"
+		/>
 	
 </com.maxmpz.widget.player.list.SeparatorItemView>
diff --git a/poweramp_skin_sdk/reference_resources/layout-sw2dp/item_track.xml b/poweramp_skin_sdk/reference_resources/layout-sw2dp/item_track.xml
index d2effaf5..21a21cc5 100644
--- a/poweramp_skin_sdk/reference_resources/layout-sw2dp/item_track.xml
+++ b/poweramp_skin_sdk/reference_resources/layout-sw2dp/item_track.xml
@@ -358,7 +358,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<SceneParams w:scene="@+id/scene_item_menu_lu"
 		style="?ItemTrackTitle_scene_item_menu_lu"
 	/>
+	<!-- REVISIT: this may introduce cycles due to layout kept as is, thus we still apply some -->
 	<SceneParams w:scene="@+id/scene_bottom_toolbar"
+		android:layout_width="0px"
+		android:layout_height="0px"
 		android:visibility="gone"
 		/>
 	<SceneParams w:scene="@+id/scene_lyrics"
diff --git a/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_eq_equalizer_tab_common.xml b/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_eq_equalizer_tab_common.xml
index 9f5570e8..566553f9 100644
--- a/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_eq_equalizer_tab_common.xml
+++ b/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_eq_equalizer_tab_common.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (C) 2010-2022 Maksim Petrov
+Copyright (C) 2010-2023 Maksim Petrov
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted for themes, skins, widgets, plugins, applications and other software
@@ -20,9 +20,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:w="http://schemas.android.com/apk/res-auto">
-	<!-- NOTE: EqPreampKnobLayout is needed for background as if background is applied to the DSPLinearKnob itself,
-	     knob outline shadow is rendered behind background -->
-
 	<!-- PowerList based band list -->
 	<com.maxmpz.widget.player.EqKnobsList android:id="@+id/eq_knobs_layout"
 		style="?EqKnobsLayout"
@@ -110,6 +107,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<com.maxmpz.widget.player.EqPresetPopupListLayout android:id="@+id/preset_button"
 		style="?EqEquPresetButtonLayout"
 		android:contentDescription="@string/preset"
+		w:disableParentLayoutForPopup="false"
 	>
 		<com.maxmpz.widget.player.BusStatusText android:id="@id/_label"
 			style="?EqEquPresetLabel"
@@ -132,38 +130,28 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<SceneParams w:scene="@+id/scene_button_menu" 
 		style="?EqEquPresetButtonLayout_scene_button_menu"
 	/>
-	
-	<com.maxmpz.widget.player.DSPCheckBox android:id="@+id/save_button"
-		style="?EqEquSaveButton"
-		android:text="@string/save"
-
-		w:param="@id/dsp_autosave_enabled"
-		w:updateMsgId="@id/msg_dsp_eq_changed"
-		
-		w:firstPressToast="@string/long_press_autosave_hint"
-		w:toastStateIdOnPress="@id/dsp_autosave_toast_msg"
-		w:toastOnPress="@string/autosave_enabled_msg"
-		w:toastHeaderOnPress="@string/autosave"
-		w:toastIconOnPress="?toast_info"
-		w:pressBusId="@id/bus_data_cmd"
-		w:pressCmdId="@id/cmd_data_add_eq_preset_dialog"
-	/>
-	<com.maxmpz.widget.base.BusActionButton android:id="@+id/reset_button"
-		style="?EqEquResetButton"
 
+	<com.maxmpz.widget.base.BusActionPopupLayout android:id="@+id/eq_menu"
+		style="?EqMenu"
+		android:contentDescription="@string/menu"
+		w:menuItemsLayout="@layout/merge_eq_menu_layout"
 		w:busId="@id/bus_dsp_cmd"
-		w:msgId="@id/cmd_dsp_reset_eq"
-		
-		android:text="@string/reset"
-		w:confirmTitle="@string/reset"
-		w:confirmText="@string/reset_knobs_and_restore_presets"
-		
-		android:longClickable="true"
-		w:longPressMsgId="@id/cmd_dsp_restore_eq_presets"
-		w:longPressConfirmTitle="@string/pref_reset_equ_presets"
-		w:longPressConfirmText="@string/pref_summary_reset_equ_presets"
+		w:msgId="@id/cmd_dsp_switch_dsp_meta"
+		>
+		<com.maxmpz.widget.base.FastTextView android:id="@id/_icon"
+			style="?EqMenuIcon"
+			/>
+		<SceneParams w:scene="@+id/scene_button_menu"
+			android:visibility="gone"
+			/>
+		<SceneParams w:scene="@+id/scene_button_menu_closed"
+			android:visibility="visible"
+			/>
+	</com.maxmpz.widget.base.BusActionPopupLayout>
+	<SceneParams w:scene="@+id/scene_button_menu"
+		style="?EqMenu_scene_item_menu"
 	/>
-	
+
 	<com.maxmpz.widget.base.FastLayout android:id="@+id/tone_panel"
 		style="?EqTonePanel"
 	>
diff --git a/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_eq_menu_layout.xml b/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_eq_menu_layout.xml
new file mode 100644
index 00000000..977b867b
--- /dev/null
+++ b/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_eq_menu_layout.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2010-2023 Maksim Petrov
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted for themes, skins, widgets, plugins, applications and other software
+which communicate with Poweramp music player application on Android platform.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<com.maxmpz.widget.base.FastLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:w="http://schemas.android.com/apk/res-auto"
+	style="?EqMenuLayoutItems"
+	>
+	<SceneParams w:forId="parent" w:scene="@+id/scene_button_menu_closed"
+		android:visibility="invisible"
+		/>
+
+
+	<!-- NOTE: this sets dsp_autosave_enabled state to true/false on click (no any specific cmd needed) -->
+	<com.maxmpz.widget.player.DSPCheckBox android:id="@+id/autosave"
+		style="?CheckablePopupItem"
+		android:drawable="?autosave_24dp"
+
+		android:text="@string/autosave"
+
+		w:param="@id/dsp_autosave_enabled"
+		w:updateMsgId="@id/msg_dsp_eq_changed"
+
+		w:toastOnPress="@string/autosave_enabled_msg"
+		w:toastHeaderOnPress="@string/autosave"
+		w:toastIconOnPress="?toast_info"
+
+		w:preferNotToClosePopup="true"
+	/>
+
+	<com.maxmpz.widget.player.DSPCheckBox android:id="@+id/lock_unlock"
+		style="?CheckablePopupItem"
+		android:drawable="?lock_solid_24dp"
+
+		android:text="@string/lock_preset_short"
+
+		w:param="@id/dsp_eq_preset_locked"
+		w:updateMsgId="@id/msg_dsp_eq_changed"
+
+		w:preferNotToClosePopup="true"
+		/>
+
+	<com.maxmpz.widget.base.BusActionButton android:id="@+id/save"
+		style="?PopupMenuItem"
+		android:drawable="?save_assign_24dp"
+
+		android:text="@string/save_assign"
+
+		w:busId="@id/bus_data_cmd"
+		w:msgId="@id/cmd_data_add_eq_preset_dialog"
+		/>
+
+	<com.maxmpz.widget.base.BusActionButton
+		style="?PopupMenuItem"
+		android:drawable="?rename_24dp"
+
+		android:text="@string/rename"
+
+		w:busId="@id/bus_data_cmd"
+		w:msgId="@id/cmd_data_eq_preset_rename"
+		/>
+
+	<!-- This should be hidden for low end Androids -->
+	<com.maxmpz.widget.base.BusActionButton android:id="@+id/share"
+		style="?PopupMenuItem"
+		android:drawable="?share_24dp"
+
+		android:text="@string/share"
+
+		w:busId="@id/bus_data_cmd"
+		w:msgId="@id/cmd_data_eq_preset_share"
+		/>
+	<!--
+		w:layout_goneWhenEmpty="true"
+		w:emptyForDisable="true"
+		w:disableForStateBusId="@id/bus_dsp"
+		w:enableForStateId="@id/dsp_eq_parametric"
+		w:disableForStateMsgId="@id/msg_dsp_eq_changed"
+	-->
+	<com.maxmpz.widget.base.BusActionButton
+		style="?PopupMenuItem"
+
+		android:drawable="?export"
+
+		android:text="@string/pref_export"
+
+		w:busId="@id/bus_data_cmd"
+		w:msgId="@id/cmd_data_eq_preset_export"
+		/>
+	<com.maxmpz.widget.base.BusActionButton
+		style="?PopupMenuItem"
+		android:drawable="?import_24dp"
+
+		android:text="@string/pref_import"
+
+		w:busId="@id/bus_data_cmd"
+		w:msgId="@id/cmd_data_eq_preset_import"
+		/>
+
+	<com.maxmpz.widget.base.BusActionButton android:id="@+id/reset"
+		style="?PopupMenuItem"
+		android:drawable="?reset_24dp"
+
+		android:text="@string/restore_defaults_short"
+
+		w:busId="@id/bus_dsp_cmd"
+		w:msgId="@id/cmd_dsp_eq_preset_restore"
+
+		w:confirmTitle="@string/pref_restore_defaults"
+		w:confirmText="@string/builtin_autoeq_user_preset_restore"
+		w:confirmButton="@string/restore_defaults_short"
+		/>
+
+
+</com.maxmpz.widget.base.FastLayout>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_eq_vol_tab.xml b/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_eq_vol_tab.xml
index fd9808ae..b98e832e 100644
--- a/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_eq_vol_tab.xml
+++ b/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_eq_vol_tab.xml
@@ -154,7 +154,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		/>
 				
 			
-		<!-- NOTE: 100.5 rounding helps with 0-100 (101 items) to 100 steps rounding, especially around 50% (where by default rounded 0.5050 value is ~51%) -->
+		<!-- NOTE: 100.5 rounding helps with 0-100 (101 items) to 100 steps rounding, especially around 50%
+		    (where the rounded 0.5050 value is ~51% by default) -->
 		<com.maxmpz.widget.player.DSPRoundKnobLayout android:id="@+id/volume_knob_layout"
 			style="?EqVolumeKnobLayout"
 			
diff --git a/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_item_aa_rating_stars.xml b/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_item_aa_rating_stars.xml
index 32c24044..4e0e1162 100644
--- a/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_item_aa_rating_stars.xml
+++ b/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_item_aa_rating_stars.xml
@@ -56,8 +56,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<StateAnimParams w:stateAnim="@+id/anim_ratingbar_pressed"
 		style="?ItemRatingBar_anim_ratingbar_pressed"
 	/>
+	<!-- NOTE: we still need layout applied to avoid dragging old layout with possible cycles -->
 	<SceneParams w:scene="@+id/scene_bottom_toolbar"
 		android:visibility="gone"
+		style="?ItemRatingBar_scenes_invisible"
 	/>
 	<SceneParams w:scene="@+id/scene_lyrics"
 		style="?ItemRatingBar_scene_lyrics"
diff --git a/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_item_text_popup_menu.xml b/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_item_text_popup_menu.xml
index 801f9202..04ef9a5b 100644
--- a/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_item_text_popup_menu.xml
+++ b/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_item_text_popup_menu.xml
@@ -26,7 +26,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 >
 	<!-- NOTE: popup menu item view is detached from list and attached to @id/menu_placeholder -->
 	<!-- NOTE: defines scene params for the item which is detached from list and attached to menu_placeholder -->
-	<!-- NOTE: PopupMenuHelper creates "returning" scene params programatically as needed to match initial item position -->
+	<!-- NOTE: PopupMenuHelper creates "returning" scene params programatically as needed to match the initial item position -->
 	<SceneParams w:forId="parent" w:scene="@+id/scene_item_menu" w:scene_2="@+id/scene_item_menu_lu"
 		style="?ItemPopupMenu_scene_item_menu"
 	/>
diff --git a/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_search_layout.xml b/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_search_layout.xml
index a8fc5225..ce25db17 100644
--- a/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_search_layout.xml
+++ b/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_search_layout.xml
@@ -45,7 +45,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<com.maxmpz.audioplayer.widget.ListSearchCatsLayout android:id="@+id/search_cats_layout"
 			style="?TopSearchCatsLayout"
 			>
-			<!-- NOTE: buttons inside created with style=?TopSearchCatButton -->
+			<!-- NOTE: buttons inside created with catButtonStyle => style=?TopSearchCatButton -->
 		</com.maxmpz.audioplayer.widget.ListSearchCatsLayout>
 		<SceneParams w:scene="@+id/scene_search"
 			android:visibility="gone"
diff --git a/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_selection_menu_eq_knobs.xml b/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_selection_menu_eq_knobs.xml
index a0894b6f..e4c2c194 100644
--- a/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_selection_menu_eq_knobs.xml
+++ b/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_selection_menu_eq_knobs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (C) 2010-2021 Maksim Petrov
+Copyright (C) 2010-2023 Maksim Petrov
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted for themes, skins, widgets, plugins, applications and other software
@@ -36,4 +36,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		w:confirmTitle="@string/delete_bands_q"
 		w:confirmText="@string/msg_delete_selected_bands"
 	/>
+
+	<com.maxmpz.widget.base.BusStateEnabledActionButton
+		style="?SelectionListContextButton33"
+		android:drawable="?lock_unlock_24dp"
+		android:text="@string/lock_unlock"
+
+		w:msgId="@id/cmd_list_lock_unlock"
+		w:stateId="@id/state_list_something_selected"
+		w:stateMsgId="@id/state_list_selection_count"
+		/>
 </merge>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_selection_menu_eq_preset_items.xml b/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_selection_menu_eq_preset_items.xml
index 6d414a7c..b65eb9b7 100644
--- a/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_selection_menu_eq_preset_items.xml
+++ b/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_selection_menu_eq_preset_items.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (C) 2010-2021 Maksim Petrov
+Copyright (C) 2010-2023 Maksim Petrov
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted for themes, skins, widgets, plugins, applications and other software
@@ -23,7 +23,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	xmlns:w="http://schemas.android.com/apk/res-auto"
 >
 	<!-- NOTE: SelectionMenuBehavior automatically sets target list msgBusIs/stateBusId on these buttons -->
-	
+
 	<com.maxmpz.widget.base.BusStateEnabledActionButton
 		style="?SelectionListContextButton33"
 		android:drawable="@drawable/edit_stroke_24dp"
@@ -35,7 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 		w:stateId="@id/state_list_preset_rename_allowed"
 	/>
-	
+
 	<com.maxmpz.widget.base.BusStateEnabledActionButton
 		style="?SelectionListContextButton33"
 		android:drawable="?assign_eq_24dp"
@@ -64,19 +64,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	/>
 	
 	<!-- NOTE: this may be hidden for some editions -->
-	<com.maxmpz.widget.base.BusStateEnabledActionButton 
+	<com.maxmpz.widget.base.BusStateEnabledActionButton
 		style="?SelectionListContextButton33"
 		android:drawable="?share_24dp"
 		android:text="@string/share"
-		
+
 		w:stateId="@id/state_list_something_selected"
 		w:stateMsgId="@id/state_list_selection_count"
 		w:alwaysCheckState="true"
-		
+
 		w:msgId="@id/cmd_list_share"
 	/>
-	
-	<!-- Hidden for Android < 23 -->
+
 	<com.maxmpz.widget.base.BusStateEnabledActionButton android:id="@+id/export"
 		style="?SelectionListContextButton33"
 		android:drawable="?export"
@@ -88,8 +87,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 		w:msgId="@id/cmd_list_export"
 	/>
-		
-	<!-- Hidden for Android < 23 -->
+	
 	<com.maxmpz.widget.base.BusActionButton android:id="@+id/_import"
 		style="?SelectionListContextButton33"
 		android:drawable="?import_24dp"
diff --git a/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_selection_menu_list_base_items.xml b/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_selection_menu_list_base_items.xml
index 0a4db178..7464156e 100644
--- a/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_selection_menu_list_base_items.xml
+++ b/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_selection_menu_list_base_items.xml
@@ -22,6 +22,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:w="http://schemas.android.com/apk/res-auto"
 >
+	<!-- NOTE: toast for the selection is shown via ListWidget.onBusMsg logic -->
+
 	<com.maxmpz.widget.base.BusSelectablePopupButtonLayout android:id="@+id/add_to_pl"
 		style="?SelectionListContextPopupButtonLayout"
 
@@ -40,6 +42,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		w:buttonsBusId="@id/list"
 		w:buttonsMsgId="@id/cmd_set_playlist_insert_pos"
 		w:buttonsLabels="@array/add_to_pl_modes"
+		w:buttonsLabels2="@array/playlist_insert_modes"
 		w:buttonsDrawables="@array/add_to_pl_modes_icons_24dp"
 		w:buttonsArg1="@array/playlist_insert_args1"
 		>
@@ -69,6 +72,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		w:buttonsBusId="@id/list"
 		w:buttonsMsgId="@id/cmd_set_queue_insert_pos"
 		w:buttonsLabels="@array/enqueue_modes"
+		w:buttonsLabels2="@array/enqueue_insert_modes"
 		w:buttonsDrawables="@array/enqueue_modes_icons_24dp"
 		w:buttonsArg1="@array/enqueue_modes_args1"
 		>
@@ -96,6 +100,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		w:buttonsMsgId="@id/cmd_set_play_next_insert_pos"
 		w:buttonsLabels="@array/play_next_modes"
 		w:buttonsDrawables="@array/play_next_modes_icons_24dp"
+		w:buttonsLabels2="@array/play_next_insert_modes"
 		w:buttonsArg1="@array/enqueue_modes_args1"
 		>
 	</com.maxmpz.widget.base.BusSelectablePopupButtonLayout>
diff --git a/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_vis_panel.xml b/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_vis_panel.xml
index 9c6c012a..2f8d853e 100644
--- a/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_vis_panel.xml
+++ b/poweramp_skin_sdk/reference_resources/layout-sw2dp/merge_vis_panel.xml
@@ -41,6 +41,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 			<!-- NOTE: buttons are aligned to the right, thus, reveresed -->
 			<com.maxmpz.widget.base.FastButton android:id="@+id/close_button"
 				style="?VisCloseButton"
+				android:contentDescription="@string/close"
 			/>
 			<SceneParams w:scene="@+id/scene_vispanel_expanded"
 				android:visibility="visible"
@@ -51,6 +52,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 				w:busId="@id/bus_app_cmd"
 				w:msgId="@id/cmd_app_open_settings"
 				w:string="vis"
+				android:contentDescription="@string/settings"
 			/>
 			<SceneParams w:scene="@+id/scene_vispanel_expanded"
 				android:visibility="visible"
@@ -58,7 +60,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 			<com.maxmpz.widget.base.BusSelectablePopupButtonLayout
 				style="?VisSortButtonLayout"
-			
+				android:contentDescription="@string/sort"
+
 				w:stateBusId="@id/bus_player"
 				w:stateId="@id/state_player_milk_sort"			
 				
diff --git a/poweramp_skin_sdk/reference_resources/values-land-v4/styles-widgets.xml b/poweramp_skin_sdk/reference_resources/values-land-v4/styles-widgets.xml
index cda3daef..835d4607 100644
--- a/poweramp_skin_sdk/reference_resources/values-land-v4/styles-widgets.xml
+++ b/poweramp_skin_sdk/reference_resources/values-land-v4/styles-widgets.xml
@@ -84,5 +84,4 @@
 	</style>
 
 
-
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values-land/default-styles-alt2.xml b/poweramp_skin_sdk/reference_resources/values-land/default-styles-alt2.xml
index 69098302..e57bdf11 100644
--- a/poweramp_skin_sdk/reference_resources/values-land/default-styles-alt2.xml
+++ b/poweramp_skin_sdk/reference_resources/values-land/default-styles-alt2.xml
@@ -66,6 +66,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<style name="Alt2_TrackLabelsCentered_ItemTrackTitle_scene_aa" parent="Alt_TrackLabelsCentered_ItemTrackTitle_scene_aa">
 	</style>
 	<style name="Alt2_TrackLabelsCentered_ItemTrackLine2_scene_aa" parent="Alt_TrackLabelsCentered_ItemTrackLine2_scene_aa">
+		<item name="android:layout_marginLeft">42dp</item><!-- Add left/right margin enough to not to overlap buttons -->
+		<item name="android:layout_marginRight">42dp</item>
 	</style>
 
 	<style name="Alt2_TrackLabelsCentered_ItemTrackLyrics_scene_aa" parent="Alt2_ItemTrackLyrics_scene_aa">
diff --git a/poweramp_skin_sdk/reference_resources/values-land/dimens-eq.xml b/poweramp_skin_sdk/reference_resources/values-land/dimens-eq.xml
index 6af5b6b4..e2639d3f 100644
--- a/poweramp_skin_sdk/reference_resources/values-land/dimens-eq.xml
+++ b/poweramp_skin_sdk/reference_resources/values-land/dimens-eq.xml
@@ -21,15 +21,23 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 <!-- values-h1dp-land. Baseline values for scaled screens -->
 <resources>
-	<dimen name="eq_frs_height">36dp</dimen>
+	<dimen name="eq_frs_height">32dp</dimen>
 	
 	<dimen name="TopActionModeBar_marginBottom">0dp</dimen>
 	
-	<dimen name="TopPeqEqLayoutBase_scenes_vis_marginTop">48dp</dimen>
+	<dimen name="TopPeqEqLayoutBase_scenes_vis_marginTop">44dp</dimen>
 	
-	<dimen name="EqButton_layout_maxWidth">70dp</dimen>
+	<dimen name="EqButton_maxWidth">70dp</dimen>
 
 	<dimen name="RoundKnobLabelLeftTop_marginRight">8dp</dimen>
 
 	<dimen name="EqLinearKnob_paddingTB">0dp</dimen>
+	<dimen name="EqParamFreqLabelAndValue_marginBottom">2dp</dimen>
+
+	<dimen name="EqRoundKnobLabel_marginTop">0dp</dimen><!-- Reduced for land -->
+
+	<dimen name="EqParamLRPopupButtonLayout_marginBottom_land">4dp</dimen>
+	<dimen name="EqParamTypePopupButtonLayout_marginBottom_land">8dp</dimen>
+
+	<dimen name="TopPeqEqLayoutBase_paddingBottom">4dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values-land/dimens-player.xml b/poweramp_skin_sdk/reference_resources/values-land/dimens-player.xml
index 0d79e93c..117010c1 100644
--- a/poweramp_skin_sdk/reference_resources/values-land/dimens-player.xml
+++ b/poweramp_skin_sdk/reference_resources/values-land/dimens-player.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (C) 2010-2021 Maksim Petrov
+Copyright (C) 2010-2023 Maksim Petrov
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted for themes, skins, widgets, plugins, applications and other software
@@ -19,33 +19,25 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 
-<!-- values-h1dp-land. Baseline values for scaled screens -->
+<!-- values-land. Baseline values for scaled screens -->
 <resources>
-	<dimen name="Navbar_height">40dp</dimen>
+	<dimen name="Navbar_height">36dp</dimen>
+	<dimen name="NavBarButton_drawableSize">24dp</dimen>
 	<dimen name="NavbarNavButtonsLayout_height">36dp</dimen>
-	<dimen name="NavBarButton_drawableSize">28dp</dimen>
 
-	<!-- @Deprecated -->
-	<dimen name="NavbarBounds_height_more_rounded">40dp</dimen>
-	<!-- @Deprecated -->
-	<dimen name="NavbarBounds_height_scene_navbar_2lines_more_rounded">88dp</dimen>
-
-	<!-- Sligtly reduce navbar seekbar spanning height for land -->
+	<!-- Slightly reduce navbar seekbar spanning height for land -->
 	<dimen name="NavbarSeekbar_marginTop">-4dp</dimen>
 	<dimen name="NavbarSeekbar_marginBottom">-10dp</dimen>
 
 	<dimen name="ItemMiniplayerAAImage_size">28dp</dimen>
 	<dimen name="corners_miniplayer_aa">8dp</dimen>
 	
-	<!-- Navbar + bottom Navbar paddings => resulting anchoring point for other views -->
-	<dimen name="NavbarBounds_height">48dp</dimen>
 	<!-- Navbar (2 lines scene) + bottom Navbar paddings => resulting anchoring point for other views -->
 	<dimen name="NavbarBounds_height_scene_navbar_2lines">96dp</dimen>
 	<!-- Same for overlap_navbar_offset -->
 	<dimen name="NavbarBounds_height_offset">52dp</dimen>
 	<dimen name="NavbarBounds_height_scene_navbar_2lines_offset">102dp</dimen>
 
-
 	<dimen name="TopSubAAButtons_marginTop">0dp</dimen>
 
 	<dimen name="TopWaveseekLayout_paddingTop">8dp</dimen>
@@ -72,4 +64,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 	<dimen name="ActivityTheme_AltLayout2_Alt2_ItemRatingBar_scene_aa_marginLeft">0dp</dimen>
 	<dimen name="Alt2_TracksLabelsNoBg_Alt2_ItemRatingBar_scene_aa_marginLeft">4dp</dimen>
+
+
+	<!-- Navbar + bottom Navbar paddings => resulting anchoring point for other views -->
+	<!-- @Deprecated -->
+	<dimen name="NavbarBounds_height">48dp</dimen>
+	<!-- @Deprecated -->
+	<dimen name="NavbarBounds_height_more_rounded">40dp</dimen>
+	<!-- @Deprecated -->
+	<dimen name="NavbarBounds_height_scene_navbar_2lines_more_rounded">88dp</dimen>
 </resources>
diff --git a/poweramp_skin_sdk/reference_resources/values-land/dimens-powerui.xml b/poweramp_skin_sdk/reference_resources/values-land/dimens-powerui.xml
index ae94a4b2..c99c927b 100644
--- a/poweramp_skin_sdk/reference_resources/values-land/dimens-powerui.xml
+++ b/poweramp_skin_sdk/reference_resources/values-land/dimens-powerui.xml
@@ -27,13 +27,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<dimen name="TopBottomSheetDialogFrame_vertical_buttons_maxHeight">460dp</dimen>
 	<dimen name="SmallerCenterDialogFrame_maxHeight">360dp</dimen>
 	
-	<dimen name="DialogButtonStyle_layout_maxWidth">220dp</dimen>
+	<dimen name="DialogButtonStyle_maxWidth">220dp</dimen>
 	
 	<dimen name="TopUpperToastFrame_maxWidth">580dp</dimen><!-- Not limited in portrait, limited in land -->
 	
-	<dimen name="TopBaseButtonLayout_layout_width">50dp</dimen>
-	<dimen name="TopBaseButtonLayout_layout_height">30dp</dimen>
-	<dimen name="PopupButtons_paddingLeft">11dp</dimen><!-- Sync with TopBaseButtonLayout_layout_width=>PopupButtons_paddingLeft + 32dp (icon size) + PopupButtons_paddingLeft -->
+	<dimen name="TopBaseButtonLayout_width">50dp</dimen>
+	<dimen name="TopBaseButtonLayout_height">30dp</dimen>
+	<dimen name="PopupButtons_paddingLeft">11dp</dimen><!-- Sync with TopBaseButtonLayout_width=>PopupButtons_paddingLeft + 32dp (icon size) + PopupButtons_paddingLeft -->
 	
 	<dimen name="PopupLayoutList_height">270dp</dimen>
 	
diff --git a/poweramp_skin_sdk/reference_resources/values-land/dimens-vis.xml b/poweramp_skin_sdk/reference_resources/values-land/dimens-vis.xml
index 03944323..c5c9b2bf 100644
--- a/poweramp_skin_sdk/reference_resources/values-land/dimens-vis.xml
+++ b/poweramp_skin_sdk/reference_resources/values-land/dimens-vis.xml
@@ -21,5 +21,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 <!-- values-h1dp-land. Baseline values for scaled screens -->
 <resources>
-	<dimen name="VisPanelFrame_scene_vispanel_expanded_height">320dp</dimen><!-- Shouldn't overlap navbar -->
+	<dimen name="VisPanelFrame_scene_vispanel_expanded_height">260dp</dimen><!-- Shouldn't overlap navbar -->
+	<dimen name="VisPanelFrame_height">44dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values-land/styles-depricated.xml b/poweramp_skin_sdk/reference_resources/values-land/styles-depricated.xml
index 2b08031e..b969b898 100644
--- a/poweramp_skin_sdk/reference_resources/values-land/styles-depricated.xml
+++ b/poweramp_skin_sdk/reference_resources/values-land/styles-depricated.xml
@@ -17,4 +17,6 @@
 		<item name="layout_marginBottomRef">@id/navbar_bounds_size</item>
 		<!--<item name="android:background">#5f0f</item>--><!-- DEBUG -->
 	</style>
+	<!-- @Deprecated -->
+	<style name="ActivityTheme_Whitepro_PeqEqKnobsHiliteMonochromatic"></style>
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values-land/styles-eq-menu.xml b/poweramp_skin_sdk/reference_resources/values-land/styles-eq-menu.xml
new file mode 100644
index 00000000..dc04c634
--- /dev/null
+++ b/poweramp_skin_sdk/reference_resources/values-land/styles-eq-menu.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2010-2023 Maksim Petrov
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted for themes, skins, widgets, plugins, applications and other software
+which communicate with Poweramp music player application on Android platform.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<resources
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools" xmlns:w="http://schemas.android.com/apk/res-auto"
+>
+	<style name="EqMenu" parent="EqMenuBase">
+		<item name="android:layout_marginLeft">8dp</item>
+		<item name="android:layout_marginTop">0dp</item>
+		<item name="android:layout_marginBottom">@dimen/EqMenu_marginBottom</item>
+		<item name="layout_attachBottom">parent</item>
+		<item name="layout_attachLeft">@+id/eq_knobs_layout</item>
+		<item name="layout_attachRight">@null</item>
+		<item name="popupExpandDirection">top|left</item>
+		<item name="keepLayoutForPopup">true</item><!-- We need this as preset is attached to this in land -->
+	</style>
+	<style name="EqMenu_scene_item_menu" parent="TopMetaInfo_scene_item_menu">
+		<item name="android:layout_width">0dp</item>
+		<item name="layout_widthPercent">65%</item><!-- This is related to the non-consumed width -->
+		<item name="layout_maxWidth">300dp</item>
+	</style>
+
+</resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values-land/styles-eq.xml b/poweramp_skin_sdk/reference_resources/values-land/styles-eq.xml
index e0193f81..a45d8252 100644
--- a/poweramp_skin_sdk/reference_resources/values-land/styles-eq.xml
+++ b/poweramp_skin_sdk/reference_resources/values-land/styles-eq.xml
@@ -27,17 +27,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<!-- NOTE: can't attach anything to @id/preset_button as it's a popup button which may disappear from the layout when
 	     in popup mode, so other attached view will jump occasionally.
 	     Instead we're attaching to tone_panel on the right, frequency_response_scroller or eq_knobs_layout on the left,
-	     and margin=EqPresetButtonLayout_width defines space for the buttons
+	     and margin=EqEquPresetButtonLayout_width defines space for the buttons
 
 	+=============================+                  +===========+
-	| eq_knobs_layout             | <(preset_button)>| tone_panel|
-	|                             | <(save)          |           |
+	| eq_knobs_layout             |                  | tone_panel|
+	|                             | <(eq_menu)       |           |
 	|                             | <...             |           |
 	+=============================+                  |           |
-	| frequency_response_scroller |                  |           |
+	| frequency_response_scroller | <(preset_button)>|           |
 	+=============================+                  +===========+
 	                              |<-              ->|
-	                           EqPresetButtonLayout_width
+	                           EqEquPresetButtonLayout_width
 	-->
 
 	<!-- This is kind of anchor view, we attach other views to this one -->
@@ -47,7 +47,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="layout_attachLeft">parent</item>
 		<item name="layout_attachBottom">parent</item>
 		<item name="layout_attachRight">@+id/tone_panel</item>
-		<item name="android:layout_marginRight">@dimen/EqPresetButtonLayout_width</item>
+		<item name="android:layout_marginRight">@dimen/EqEquPresetButtonLayout_width</item>
 		<item name="android:layout_marginLeft">0dp</item>
 	</style>
 
@@ -82,61 +82,50 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="android:visibility">gone</item><!-- No place for this ATM. REVISIT: 18:9 screens have enough room for this -->
 	</style>
 
-
-	<style name="EqEquResetButton" parent="EqButton">
-		<item name="android:layout_marginTop">4dp</item>
-		<item name="android:layout_marginLeft">4dp</item>
-		<item name="layout_attachLeft">@+id/eq_knobs_layout</item>
-		<item name="layout_attachTop">parent</item>
-		<item name="layout_maxWidth">@dimen/EqButton_layout_maxWidth</item>
-	</style>
-
-	<style name="EqEquSaveButton" parent="EqButton">
-		<item name="android:layout_marginTop">4dp</item>
-		<item name="android:layout_marginLeft">4dp</item>
-		<item name="layout_attachLeft">@+id/eq_knobs_layout</item>
-		<item name="layout_attachTop">@+id/reset_button</item>
-		<item name="layout_maxWidth">@dimen/EqButton_layout_maxWidth</item>
-	</style>
-
+	<!-- NOTE: width defined by EqFrequencyResponseScroller layout_marginRight  -->
+	<!-- NOTE: this can't be attached to something which is popup itself (==menu) nor anything can be attached to this as
+	     this is popup -->
 	<style name="EqEquPresetButtonLayout" parent="EqPresetButtonLayoutBase">
-		<item name="android:layout_marginLeft">4dp</item>
-		<item name="android:layout_marginRight">4dp</item>
-		<item name="android:layout_marginTop">4dp</item>
-		<item name="layout_attachTop">@+id/save_button</item>
+		<item name="android:layout_marginLeft">8dp</item>
+		<item name="android:layout_marginRight">0dp</item>
+		<item name="android:layout_marginTop">0dp</item>
+		<item name="android:layout_marginBottom">4dp</item>
 		<item name="layout_attachLeft">@+id/eq_knobs_layout</item>
+		<item name="layout_attachBottom">@+id/eq_menu</item>
 		<item name="layout_attachRight">@+id/tone_panel</item>
 	</style>
-		
-
 
 	
 	<style name="EqEquButton" parent="EqCheckButton">
-		<item name="android:layout_marginLeft">4dp</item>
+		<item name="android:layout_marginLeft">8dp</item>
+		<item name="android:layout_marginTop">8dp</item>
 		<item name="layout_attachLeft">@+id/eq_knobs_layout</item>
-		<item name="layout_attachBottom">@id/tone_button</item>
-		<item name="layout_maxWidth">@dimen/EqButton_layout_maxWidth</item>
+		<item name="layout_attachTop">parent</item>
+		<item name="layout_maxWidth">@dimen/EqButton_maxWidth</item>
+		<item name="layout_consumeSpace">vertical</item>
 	</style>
 	
 	<style name="EqToneButton" parent="EqCheckButton">
 		<item name="android:layout_marginTop">4dp</item>
-		<item name="android:layout_marginLeft">4dp</item>
-		<item name="layout_attachBottom">@+id/limiter_button</item>
+		<item name="android:layout_marginLeft">8dp</item>
+		<!--<item name="layout_attachTop">@+id/equ_button</item>-->
 		<item name="layout_attachLeft">@+id/eq_knobs_layout</item>
-		<item name="layout_maxWidth">@dimen/EqButton_layout_maxWidth</item>
+		<item name="layout_maxWidth">@dimen/EqButton_maxWidth</item>
+		<item name="layout_consumeSpace">vertical</item>
 	</style>
 	
 	<style name="EqLimiterButton" parent="EqCheckButton">
 		<item name="android:layout_marginTop">4dp</item>
-		<item name="android:layout_marginLeft">4dp</item>
-		<item name="layout_attachBottom">parent</item>
+		<item name="android:layout_marginLeft">8dp</item>
+		<!--<item name="layout_attachTop">@+id/tone_button</item>-->
 		<item name="layout_attachLeft">@+id/eq_knobs_layout</item>
-		<item name="layout_maxWidth">@dimen/EqButton_layout_maxWidth</item>
+		<item name="layout_maxWidth">@dimen/EqButton_maxWidth</item>
+		<item name="layout_consumeSpace">vertical</item>
 	</style>
 	
 	<style name="EqTonePanel">
 		<item name="android:layout_width">0px</item>
-		<item name="layout_widthPercent">15%</item>
+		<item name="layout_widthPercent">@fraction/EqTonePanel_widthPercent</item>
 		<item name="android:layout_height">match_parent</item>
 		<item name="layout_attachRight">parent</item>
 		<item name="android:layout_marginTop">4dp</item>
@@ -153,6 +142,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="labelStyle">@style/EqToneKnobLayoutBaseLabel</item>
 		<item name="valueLabelStyle">@style/EqToneKnobLayoutBaseValue</item>
 		<item name="valueLabelPressedAnimStyle">@style/EqToneKnobLayoutBaseLabelAnim</item>
+		<item name="lockLabelStyle">?EqLockLabelStyle</item>
 	</style>
 	<!-- NOTE: more indirection needed for future updates that are compatible with skins - as we can change styles independently then -->
 	<style name="EqToneKnobLayoutBaseRoundKnob" parent="EqResizableRoundKnob"></style>
@@ -166,7 +156,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="layout_heightPercent">50%</item>
 		<item name="layout_attachBottom">50%</item><!-- Attaching to 50% so it's better looking on tablets -->
 		<item name="android:layout_gravity">center_horizontal</item>
-		<item name="android:layout_marginBottom">@dimen/EqKnob_spacing</item>
+		<item name="android:layout_marginTop">@dimen/EqToneKnobLayout_marginOffset</item>
 		<item name="layout_maxHeight">@dimen/EqToneRoundKnobLayout_maxSize</item>
 	</style>
 	
@@ -177,7 +167,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="layout_attachTop">50%</item>
 		<item name="android:layout_gravity">center_horizontal</item>
 		<item name="layout_maxHeight">@dimen/EqToneRoundKnobLayout_maxSize</item>
-		<item name="android:layout_marginTop">@dimen/EqKnob_spacing</item>
+		<item name="android:layout_marginBottom">@dimen/EqToneKnobLayout_marginOffset</item>
 	</style>
 	
 		
@@ -297,7 +287,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="android:layout_marginRight">8dp</item>
 		<item name="android:layout_gravity">right|bottom</item>
 		<!--<item name="layout_maxWidth">80dp</item>-->
-		<item name="layout_maxWidth">@dimen/EqButton_layout_maxWidth</item>
+		<item name="layout_maxWidth">@dimen/EqButton_maxWidth</item>
 		<item name="android:ellipsize">end</item>
 		<item name="layout_widthPercent">33%</item>
 		<item name="layout_consumeSpace">vertical</item><!-- Eat space at the bottom, so volume doesn't overgrow -->
diff --git a/poweramp_skin_sdk/reference_resources/values-sw2dp-h700dp/styles-eq-param.xml b/poweramp_skin_sdk/reference_resources/values-sw2dp-h700dp/styles-eq-param.xml
index ee59398d..d6b3c5c3 100644
--- a/poweramp_skin_sdk/reference_resources/values-sw2dp-h700dp/styles-eq-param.xml
+++ b/poweramp_skin_sdk/reference_resources/values-sw2dp-h700dp/styles-eq-param.xml
@@ -21,28 +21,78 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 <!-- NOTE: the parametric styles applied as "landscape" to all devices with not enough vertical space
      in any orientation (portrait/landscape). As soon as enough vertical space is available,
-     values-sw2dp-h700dp is applied for the "portrait" layout --> 
+     values-sw2dp-h700dp is applied for the "portrait" layout.
+     NOTE: for Peq this is applied earlier (via dir symbolic link - we start at 616dp).
+     NOTE: ensure this dir contains stuff just related to styles-eq-param and properly update Peq link on changes -->
 <resources 
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:w="http://schemas.android.com/apk/res-auto"
 >
+	<!--
+	  EqParamGainLinearKnob (@id/_gain)
+	           |       +========================================+
+	           |     |       +=============+                     |   <- _placeholder2 pushes knobs (_q and below)
+	           |    |   |    |_placeholder2|                      |     and limits their overal size by consuming the available
+	           +====|==>|    +=============+                      |     height. _placeholder2 height is roughly the height
+	                |   |      [ _lr ]                            |     of _lr + _type buttons with the margins
+	                |   =      [_type]                            |  <- _type button is attached to the top of _q knob.
+	                |   =                                         |     The buttons are not affected by _placeholder2 and
+	                |   |      +=====+                            |     can go over _placeholder2 if not enough space,
+	                |   |      | _q  |                            |     but still will be inside container as _placeholder2
+	                |   |      +=====+                            |     ensures that
+	                |   =      [_q_label_and_value]               |
+	                |                                             |
+	                |          +=====+                            | <- height of _freq/_q knobs is limited with maxHeight,
+	                |          +=====+                   [_color] |    so they grows to a limited size. The grow itself is caused
+	                |          [_freq_label_and_value]   [_edit]  |    by layout_heightPercent
+	                 |                                           |
+	                  +=========================================+
+
+	-->
+
+
 	<!-- port -->
+	<!-- _placeholder1 has no size and is invisible -->
 	<style name="EqParamPlaceholder1">
 		<item name="android:id">@id/_placeholder1</item>
-		<!--<item name="android:background">#ff0</item>-->
+		<!--<item name="android:background">#00f</item>-->
 	</style>
+	
 	<!-- port -->
 	<style name="EqParamPlaceholder2">
-		<!-- Using _placeholder2 to simplify some landscape styling (_placeholder2 is the right-most item for vertical separator to attach to) -->
 		<item name="android:id">@id/_placeholder2</item>
-		<!-- 88dp = 44 + 44 + 4 + 4 + 8. Should match LR and type buttons height + their margins, thus depends on EqButton_layout_height -->
-		<item name="android:layout_height">@dimen/EqParamPlaceholder2_height</item>
+		<!-- Should match LR and type buttons height + their margins, thus depends
+		     on EqParamPopupButtonLayout_height_port -->
+		<item name="android:layout_height">@dimen/EqParamPlaceholder2_height_port</item>
 		<item name="android:layout_width">88dp</item>
 		<item name="layout_consumeSpace">vertical|size</item>
 		
-		<!--<item name="android:background">#f0f</item>-->
+		<!--<item name="android:background">#f00</item>-->
 	</style>
-	
+
+	<!-- port -->
+	<style name="EqParamLRPopupButtonLayout" parent="EqParamLRPopupButtonLayoutBase">
+		<item name="android:layout_height">@dimen/EqParamPopupButtonLayout_height_port</item>
+		<item name="layout_attachBottom">@id/_type</item>
+
+		<item name="layout_gravityTarget">@id/_q</item>
+		<item name="android:layout_gravity">center_horizontal</item>
+
+		<item name="android:layout_marginTop">4dp</item>
+		<item name="android:layout_marginBottom">0dp</item>
+	</style>
+
+	<!-- port -->
+	<style name="EqParamTypePopupButtonLayout" parent="EqParamTypePopupButtonLayoutBase">
+		<item name="android:layout_height">@dimen/EqParamPopupButtonLayout_height_port</item>
+		<item name="android:layout_marginTop">4dp</item>
+		<item name="android:layout_marginBottom">@dimen/EqParamTypePopupButtonLayout_marginBottom_port</item><!-- 4dp -->
+
+		<item name="layout_attachBottom">@id/_q</item>
+		<item name="layout_gravityTarget">@id/_q</item>
+		<item name="android:layout_gravity">center_horizontal</item>
+	</style>
+
 	<!-- port -->
 	<style name="EqParamEditButton" parent="EqParamEditButtonBase">
 		<item name="layout_attachLeft">@id/_freq</item>
@@ -51,41 +101,58 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="android:layout_marginRight">8dp</item>
 		<item name="android:layout_marginLeft">-16dp</item>
 	</style>
-	<!-- port -->	
+
+	<!-- port -->
 	<style name="EqParamColorPopupLayout" parent="EqParamColorPopupLayoutBase">
 		<item name="layout_attachLeftToLeft">@id/_edit</item>
 		<item name="layout_attachBottom">@id/_edit</item>
-	</style>	
-	
+	</style>
+
+	<!-- port -->
+	<style name="EqParamLockButton" parent="EqParamLockButtonBase">
+		<item name="layout_attachLeftToLeft">@id/_edit</item>
+		<item name="layout_attachBottom">@id/_color</item>
+	</style>
+
+
 	<!-- port -->
 	<style name="EqParamRoundKnobPortBase" parent="EqParamRoundKnobBase">
+		<item name="layout_maxHeight">@dimen/EqParamRoundKnobBase_maxSize_port</item>
 		<item name="android:layout_width">wrap_content</item>
+		<!-- NOTE: for a longer screens layout_maxHeight is in effect up to an available space or maxHeight and limit -->
 		<item name="layout_heightPercent">50%</item>
 		<item name="android:layout_gravity">top|left</item>
 
-		<item name="android:layout_marginTop">8dp</item> 
-		<item name="android:layout_marginBottom">2dp</item>
+		<item name="android:layout_marginTop">6dp</item>
+		<!-- Matching the gain linear knob total offset from bottom. This margin is applied to the knob labels, as those are aligned
+		     bottom-to-bottom -->
+		<item name="android:layout_marginBottom">4dp</item>
 				
 		<item name="android:paddingBottom">@dimen/EqParamRoundKnobPortBase_paddingBottom</item><!-- 36sp. Should be enough for label and values to fit -->
 
+		<!--<item name="android:background">#500f</item>-->
 	</style>
 	
 	<!-- port -->
 	<style name="EqParamQRoundKnob" parent="EqParamRoundKnobPortBase">
 		<item name="android:id">@id/_q</item>
+		<item name="android:contentDescription">@string/q_factor</item>
 		
 		<item name="layout_attachTop">@null</item>
 		<item name="layout_attachBottom">@id/_freq</item>
+
+		<!--<item name="android:background">#f00</item>-->
 	</style>
 	
 	<!-- port -->
 	<style name="EqParamQLabelAndValue" parent="EqParamLabelAndValueBase">
 		<item name="android:id">@id/_q_label_and_value</item>
+		<item name="android:importantForAccessibility">no</item>
 
 		<item name="layout_minWidth">52sp</item><!-- Reduce width jumps when rotating and changing value by defining some resonable min width -->
 		<item name="layout_attachBottomToBottom">@id/_q</item>
 		<item name="android:layout_marginTop">0dp</item>
-		<item name="android:layout_marginBottom">0dp</item>
+		<item name="android:layout_marginBottom">0dp</item><!-- Ensure to reset margin bottom -->
 
 		<item name="layout_gravityTarget">@id/_q</item>
 		<item name="android:layout_gravity">center_horizontal</item>
@@ -95,6 +162,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<!-- port -->
 	<style name="EqParamFreqRoundKnob" parent="EqParamRoundKnobPortBase">
 		<item name="android:id">@id/_freq</item>
+		<item name="android:contentDescription">@string/frequency</item>
 		
 		<item name="layout_attachTop">@null</item>
 		<item name="layout_attachBottom">parent</item>
@@ -103,34 +171,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	</style>
 	
 	<!-- port -->
+	<!-- NOTE: we have offset from parent bottom as we're attached bottom-to-bottom to knob, which has some marignBottom already -->
 	<style name="EqParamFreqLabelAndValue" parent="EqParamLabelAndValueBase">
 		<item name="android:id">@id/_freq_label_and_value</item>
+		<item name="android:importantForAccessibility">no</item>
 		
 		<item name="layout_attachBottomToBottom">@id/_freq</item>
 		<item name="layout_gravityTarget">@id/_freq</item>
 		<item name="android:layout_gravity">center_horizontal</item>
+		<item name="android:layout_marginBottom">0dp</item><!-- Ensure to reset margin bottom -->
 	</style>
-	
-	<!-- port -->	
-	<style name="EqParamLRPopupButtonLayout" parent="EqParamLRPopupButtonLayoutBase">
-		<item name="layout_attachBottom">@id/_type</item>		
-		
-		<item name="layout_gravityTarget">@id/_q</item>
-		<item name="android:layout_gravity">center_horizontal</item>
-						
-		<item name="android:layout_marginTop">4dp</item>
-		<item name="android:layout_marginBottom">0dp</item>
-	</style>
-	
-	<!-- port -->
-	<style name="EqParamTypePopupButtonLayout" parent="EqParamTypePopupButtonLayoutBase">
-		<item name="android:layout_marginTop">4dp</item>
-		<item name="android:layout_marginBottom">8dp</item>
-		
-		<item name="layout_attachBottom">@id/_q</item>
-		<item name="layout_gravityTarget">@id/_q</item>
-		<item name="android:layout_gravity">center_horizontal</item>
-	</style>
-	
-	
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values-sw360dp-h530dp-port/dimens-eq.xml b/poweramp_skin_sdk/reference_resources/values-sw360dp-h530dp-port/dimens-eq.xml
index d2f0a685..eb420d4a 100644
--- a/poweramp_skin_sdk/reference_resources/values-sw360dp-h530dp-port/dimens-eq.xml
+++ b/poweramp_skin_sdk/reference_resources/values-sw360dp-h530dp-port/dimens-eq.xml
@@ -22,4 +22,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 <resources>
 	<dimen name="RoundKnob_arcWidth">4dp</dimen>
 	<dimen name="RoundKnob_arcOffset">4dp</dimen>
+	<dimen name="EqButton_height">30dp</dimen>
+	<dimen name="EqMenu_size">32dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values-sw360dp-h570dp-port/dimens-eq.xml b/poweramp_skin_sdk/reference_resources/values-sw360dp-h570dp-port/dimens-eq.xml
index 5901da09..f4b57dd4 100644
--- a/poweramp_skin_sdk/reference_resources/values-sw360dp-h570dp-port/dimens-eq.xml
+++ b/poweramp_skin_sdk/reference_resources/values-sw360dp-h570dp-port/dimens-eq.xml
@@ -23,8 +23,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 <resources>
 	<dimen name="EqInfoLabel_maxWidth">350dp</dimen>
 	
-	<dimen name="EqButton_layout_maxWidth">72dp</dimen>
+	<dimen name="EqButton_maxWidth">72dp</dimen>
 	<dimen name="EqButton_marginSide">4dp</dimen>
-	<dimen name="EqEquPresetButtonLayout_layout_width">90dp</dimen>
+	<dimen name="EqEquPresetButtonLayout_width">150dp</dimen>
 		
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values-sw360dp-h640dp-port/dimens-eq.xml b/poweramp_skin_sdk/reference_resources/values-sw360dp-h640dp-port/dimens-eq.xml
index bd10e689..403bd10f 100644
--- a/poweramp_skin_sdk/reference_resources/values-sw360dp-h640dp-port/dimens-eq.xml
+++ b/poweramp_skin_sdk/reference_resources/values-sw360dp-h640dp-port/dimens-eq.xml
@@ -28,12 +28,22 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<dimen name="knob_thumb_indicator_left_right">8.5dp</dimen>
 	<dimen name="knob_thumb_radius">16dp</dimen>
 	<dimen name="knob_thumb_radius_less_rounded">12dp</dimen>
+
+	<dimen name="knob_thumb_lock_size">24dp</dimen>
+	<dimen name="knob_thumb_lock_top">20dp</dimen>
+	<dimen name="knob_thumb_lock_left">4dp</dimen>
+
 	<dimen name="EqKnobValueText_size">10.5sp</dimen>
 	<dimen name="EqKnobLabelText_size">13dp</dimen>
-	<dimen name="EqButton_layout_width">64dp</dimen>
-	<dimen name="EqButton_layout_height">32dp</dimen>
-	<dimen name="EqParamPlaceholder2_height">88dp</dimen>
-	<dimen name="EqButton_textSize">12dp</dimen>
+	<dimen name="EqButton_width">64dp</dimen>
+	<dimen name="EqButton_height">36dp</dimen>
+
+	<dimen name="EqParamPopupButtonLayout_height_port">32dp</dimen>
+	<dimen name="EqParamPlaceholder2_height_port">76dp</dimen><!-- 4 + 32 + 4 + 32 + 4 -->
+	<dimen name="EqParamTypePopupButtonLayout_marginBottom_port">4dp</dimen>
+
+	<dimen name="EqMenu_size">36dp</dimen>
+	<dimen name="EqButton_textSize">13dp</dimen><!-- Default (fixed) font -->
 	<dimen name="eq_frs_height">48dp</dimen>
 	
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values-sw360dp-h708dp-port/dimens-eq.xml b/poweramp_skin_sdk/reference_resources/values-sw360dp-h708dp-port/dimens-eq.xml
new file mode 100644
index 00000000..902888f8
--- /dev/null
+++ b/poweramp_skin_sdk/reference_resources/values-sw360dp-h708dp-port/dimens-eq.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2010-2022 Maksim Petrov
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted for themes, skins, widgets, plugins, applications and other software
+which communicate with Poweramp music player or Poweramp Equalizer applications on Android platform.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+
+<resources>
+	<dimen name="eq_frs_height">54dp</dimen>
+	
+</resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values-sw360dp-h730dp-port/dimens-eq.xml b/poweramp_skin_sdk/reference_resources/values-sw360dp-h730dp-port/dimens-eq.xml
new file mode 100644
index 00000000..479e7116
--- /dev/null
+++ b/poweramp_skin_sdk/reference_resources/values-sw360dp-h730dp-port/dimens-eq.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2010-2022 Maksim Petrov
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted for themes, skins, widgets, plugins, applications and other software
+which communicate with Poweramp music player or Poweramp Equalizer applications on Android platform.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+
+<resources>
+	<dimen name="eq_frs_height">60dp</dimen>
+	<dimen name="EqParamRoundKnobPortBase_paddingBottom">42sp</dimen>
+	
+</resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values-sw360dp-w600dp-land/dimens-eq.xml b/poweramp_skin_sdk/reference_resources/values-sw360dp-w600dp-land/dimens-eq.xml
index b9cab6c2..14359d22 100644
--- a/poweramp_skin_sdk/reference_resources/values-sw360dp-w600dp-land/dimens-eq.xml
+++ b/poweramp_skin_sdk/reference_resources/values-sw360dp-w600dp-land/dimens-eq.xml
@@ -22,8 +22,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 <!-- land -->
 <resources>
-	<dimen name="EqEquPresetButtonLayout_layout_width">80dp</dimen>
-	
-	<dimen name="EqButton_layout_maxWidth">96dp</dimen>
+	<dimen name="EqEquPresetButtonLayout_width">100dp</dimen>
+
+	<dimen name="EqMenu_size">36dp</dimen>
+	<dimen name="EqButton_width">68dp</dimen>
+	<dimen name="EqButton_maxWidth">96dp</dimen>
 	<dimen name="EqPresetButtonLayout_width">102dp</dimen>
+	<dimen name="eq_frs_height">36dp</dimen><!-- NOTE: increased for Peq -->
+
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values-sw360dp-w600dp-land/dimens-player.xml b/poweramp_skin_sdk/reference_resources/values-sw360dp-w600dp-land/dimens-player.xml
index 9c0e9683..8caba62a 100644
--- a/poweramp_skin_sdk/reference_resources/values-sw360dp-w600dp-land/dimens-player.xml
+++ b/poweramp_skin_sdk/reference_resources/values-sw360dp-w600dp-land/dimens-player.xml
@@ -43,9 +43,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<dimen name="TopHelpSmaller_paddingTB">6dp</dimen>
 	<dimen name="TopHelpSmaller_marginTB">12dp</dimen>
 	
-	<!-- Alt -->
-	<!-- <dimen name="Alt_aaMaxSize">422dp</dimen> Not used anymore -->
-	
 	<dimen name="Alt_TopPlay_maxSize">80dp</dimen>
 	<dimen name="Alt_TopPauseMoreButtons_maxSize_scene_playing">74dp</dimen>
 	<dimen name="Alt_TopSmallButton_size">52dp</dimen>
diff --git a/poweramp_skin_sdk/reference_resources/values-sw360dp-w750dp-land/dimens-eq.xml b/poweramp_skin_sdk/reference_resources/values-sw360dp-w750dp-land/dimens-eq.xml
new file mode 100644
index 00000000..aef28aa0
--- /dev/null
+++ b/poweramp_skin_sdk/reference_resources/values-sw360dp-w750dp-land/dimens-eq.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2010-2023 Maksim Petrov
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted for themes, skins, widgets, plugins, applications and other software
+which communicate with Poweramp music player or Poweramp Equalizer applications on Android platform.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<resources>
+	<fraction name="EqTonePanel_widthPercent">12%</fraction><!-- Used for land only, reduced for the longer phones -->
+	<dimen name="EqEquPresetButtonLayout_width">110dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values-sw380dp-h670dp-port/dimens-eq.xml b/poweramp_skin_sdk/reference_resources/values-sw380dp-h670dp-port/dimens-eq.xml
index 8fc69f74..88a4ecca 100644
--- a/poweramp_skin_sdk/reference_resources/values-sw380dp-h670dp-port/dimens-eq.xml
+++ b/poweramp_skin_sdk/reference_resources/values-sw380dp-h670dp-port/dimens-eq.xml
@@ -29,9 +29,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 	<dimen name="EqButton_marginSide">8dp</dimen>
 
-	<dimen name="EqButton_layout_maxWidth">78dp</dimen>
+	<dimen name="EqButton_maxWidth">78dp</dimen>
 
-	<dimen name="EqEquPresetButtonLayout_layout_width">120dp</dimen>
+	<dimen name="EqEquPresetButtonLayout_width">160dp</dimen>
 	
 	<dimen name="EqVolPanel1_paddingTop">8dp</dimen>
 	
diff --git a/poweramp_skin_sdk/reference_resources/values-sw380dp-h670dp-port/dimens-player.xml b/poweramp_skin_sdk/reference_resources/values-sw380dp-h670dp-port/dimens-player.xml
index 5476e288..b41d6d16 100644
--- a/poweramp_skin_sdk/reference_resources/values-sw380dp-h670dp-port/dimens-player.xml
+++ b/poweramp_skin_sdk/reference_resources/values-sw380dp-h670dp-port/dimens-player.xml
@@ -27,11 +27,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<dimen name="TopMediumButton_size">60dp</dimen>
 	<dimen name="TopSmallButton_size">42dp</dimen>
 	
-	<dimen name="TopBaseButtonLayout_layout_width">68dp</dimen>
-	<dimen name="TopBaseButtonLayout_layout_height">36dp</dimen>
+	<dimen name="TopBaseButtonLayout_width">68dp</dimen>
+	<dimen name="TopBaseButtonLayout_height">36dp</dimen>
 	<dimen name="PopupButtons_drawableSize">32dp</dimen>
 	<dimen name="SmallerPopupButton_marginLeft">-12dp</dimen>
-	<dimen name="PopupButtons_paddingLeft">18dp</dimen><!-- Sync with TopBaseButtonLayout_layout_width=>PopupButtons_paddingLeft + 32dp (icon size) + PopupButtons_paddingLeft -->
+	<dimen name="PopupButtons_paddingLeft">18dp</dimen><!-- Sync with TopBaseButtonLayout_width=>PopupButtons_paddingLeft + 32dp (icon size) + PopupButtons_paddingLeft -->
 	<dimen name="SmallerPopupButtons_paddingLeft">20.5dp</dimen>
 	
 	<dimen name="TopWaveseek_maxHeight">164dp</dimen>
diff --git a/poweramp_skin_sdk/reference_resources/values-sw380dp-h750dp-port/dimens-eq.xml b/poweramp_skin_sdk/reference_resources/values-sw380dp-h750dp-port/dimens-eq.xml
index 8b1277b8..292c3462 100644
--- a/poweramp_skin_sdk/reference_resources/values-sw380dp-h750dp-port/dimens-eq.xml
+++ b/poweramp_skin_sdk/reference_resources/values-sw380dp-h750dp-port/dimens-eq.xml
@@ -33,7 +33,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	
 	<dimen name="eq_frs_height">64dp</dimen>
 	
-	<dimen name="EqParamTypePopupButtonLayout_marginBottom">16dp</dimen>
 	<dimen name="Peq_EqParamRoundKnob_marginBottom">12dp</dimen>
 	<dimen name="EqParamRoundKnob_marginBottom">8dp</dimen>
+
+	<fraction name="EqEquPresetButtonLayout_scene_button_menu_heightPercent">60%</fraction>
+
+	<dimen name="Peq_EqTonePanel_paddingTop">18dp</dimen>
+	<dimen name="Peq_EqTonePanel_paddingBottom">6dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values-sw600dp-large-land/dimens-powerui.xml b/poweramp_skin_sdk/reference_resources/values-sw380dp-land/dimens-player.xml
similarity index 82%
rename from poweramp_skin_sdk/reference_resources/values-sw600dp-large-land/dimens-powerui.xml
rename to poweramp_skin_sdk/reference_resources/values-sw380dp-land/dimens-player.xml
index 43e0540f..2d9c1b05 100644
--- a/poweramp_skin_sdk/reference_resources/values-sw600dp-large-land/dimens-powerui.xml
+++ b/poweramp_skin_sdk/reference_resources/values-sw380dp-land/dimens-player.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (C) 2010-2019 Maksim Petrov
+Copyright (C) 2010-2023 Maksim Petrov
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted for themes, skins, widgets, plugins, applications and other software
@@ -19,7 +19,9 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 
+<!-- sw-380-land -->
 <resources>
-	<dimen name="CenterDialogFrame_maxWidth">800dp</dimen>
-	<dimen name="CenterDialogFrame_maxHeight">600dp</dimen>
-</resources>
\ No newline at end of file
+	<dimen name="Navbar_height">40dp</dimen>
+	<dimen name="NavBarButton_drawableSize">28dp</dimen>
+	<dimen name="NavbarNavButtonsLayout_height">36dp</dimen>
+</resources>
diff --git a/poweramp_skin_sdk/reference_resources/values-sw380dp-w720dp-land/dimens-eq.xml b/poweramp_skin_sdk/reference_resources/values-sw380dp-w720dp-land/dimens-eq.xml
index f5c70421..c0cca8e7 100644
--- a/poweramp_skin_sdk/reference_resources/values-sw380dp-w720dp-land/dimens-eq.xml
+++ b/poweramp_skin_sdk/reference_resources/values-sw380dp-w720dp-land/dimens-eq.xml
@@ -22,5 +22,5 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 <!-- land. S9+ -->
 <resources>
-	<dimen name="EqEquPresetButtonLayout_layout_width">120dp</dimen>
+	<dimen name="EqEquPresetButtonLayout_width">120dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values-sw380dp-w720dp-land/dimens-player.xml b/poweramp_skin_sdk/reference_resources/values-sw380dp-w720dp-land/dimens-player.xml
index 5e82ef3a..30927dcf 100644
--- a/poweramp_skin_sdk/reference_resources/values-sw380dp-w720dp-land/dimens-player.xml
+++ b/poweramp_skin_sdk/reference_resources/values-sw380dp-w720dp-land/dimens-player.xml
@@ -31,11 +31,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	
 	<dimen name="TopWaveseek_maxHeight">184dp</dimen>
 
-	<dimen name="TopBaseButtonLayout_layout_width">68dp</dimen>
-	<dimen name="TopBaseButtonLayout_layout_height">36dp</dimen>
+	<dimen name="TopBaseButtonLayout_width">72dp</dimen>
+	<dimen name="TopBaseButtonLayout_height">36dp</dimen>
 	<dimen name="PopupButtons_drawableSize">32dp</dimen>
 	<dimen name="SmallerPopupButton_marginLeft">-12dp</dimen>
-	<dimen name="PopupButtons_paddingLeft">18dp</dimen><!-- Sync with TopBaseButtonLayout_layout_width=>PopupButtons_paddingLeft + 32dp (icon size) + PopupButtons_paddingLeft -->
+	<dimen name="PopupButtons_paddingLeft">18dp</dimen><!-- Sync with TopBaseButtonLayout_width=>PopupButtons_paddingLeft + 32dp (icon size) + PopupButtons_paddingLeft -->
 	<dimen name="SmallerPopupButtons_paddingLeft">20.5dp</dimen>
 	
 	<dimen name="TopHelpSmaller_textSize">12dp</dimen>
diff --git a/poweramp_skin_sdk/reference_resources/values-sw390dp-w640dp-land/dimens-eq.xml b/poweramp_skin_sdk/reference_resources/values-sw390dp-w640dp-land/dimens-eq.xml
index bedabc1b..4a531558 100644
--- a/poweramp_skin_sdk/reference_resources/values-sw390dp-w640dp-land/dimens-eq.xml
+++ b/poweramp_skin_sdk/reference_resources/values-sw390dp-w640dp-land/dimens-eq.xml
@@ -23,22 +23,26 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 <resources>
 	<dimen name="EqLinearKnob_thumbWidth">32dp</dimen>
 	<dimen name="EqLinearKnob_thumbHeight">64dp</dimen>
-	<dimen name="knob_thumb_indicator_top_bottom">31dp</dimen>	
-	<dimen name="knob_thumb_indicator_left_right">6dp</dimen>
+	<dimen name="knob_thumb_indicator_top_bottom">30dp</dimen>
+	<dimen name="knob_thumb_indicator_left_right">8.5dp</dimen>
 	<dimen name="knob_thumb_radius">16dp</dimen>
 	<dimen name="knob_thumb_radius_less_rounded">12dp</dimen>
-	
+
+	<dimen name="knob_thumb_lock_size">24dp</dimen>
+	<dimen name="knob_thumb_lock_top">20dp</dimen>
+	<dimen name="knob_thumb_lock_left">4dp</dimen>
+
 	<dimen name="EqKnobValueText_size">10.5sp</dimen>
 	<dimen name="EqKnobLabelText_size">13dp</dimen>
 	
-	<dimen name="EqButton_layout_width">76dp</dimen>
-	<dimen name="EqButton_layout_height">32dp</dimen>
-	<dimen name="EqParamPlaceholder2_height">88dp</dimen>
-	<dimen name="EqButton_textSize">12dp</dimen>
+	<dimen name="EqButton_width">76dp</dimen>
+	<dimen name="EqButton_height">36dp</dimen>
+	<dimen name="EqMenu_size">36dp</dimen>
+	<dimen name="EqButton_textSize">13dp</dimen><!-- Default (fixed) font -->
 	
 	<dimen name="EqButton_marginSide">8dp</dimen>
 	
-	<dimen name="EqEquPresetButtonLayout_layout_width">80dp</dimen>
+	<dimen name="EqEquPresetButtonLayout_width">120dp</dimen>
 	<dimen name="EqPresetButtonLayout_width">114dp</dimen>
 	
 	<dimen name="eq_frs_height">44dp</dimen>
diff --git a/poweramp_skin_sdk/reference_resources/values-sw400dp-h650dp-port/dimens-eq.xml b/poweramp_skin_sdk/reference_resources/values-sw400dp-h650dp-port/dimens-eq.xml
index 6d8b921e..ec87cb8f 100644
--- a/poweramp_skin_sdk/reference_resources/values-sw400dp-h650dp-port/dimens-eq.xml
+++ b/poweramp_skin_sdk/reference_resources/values-sw400dp-h650dp-port/dimens-eq.xml
@@ -22,5 +22,5 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 <resources>
 	<dimen name="EqInfoLabel_maxWidth">390dp</dimen>
-	<dimen name="EqButton_layout_maxWidth">94dp</dimen>
+	<dimen name="EqButton_maxWidth">94dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values-sw400dp-h746dp-port/dimens-player.xml b/poweramp_skin_sdk/reference_resources/values-sw400dp-h746dp-port/dimens-player.xml
index b77b3714..f5fe7538 100644
--- a/poweramp_skin_sdk/reference_resources/values-sw400dp-h746dp-port/dimens-player.xml
+++ b/poweramp_skin_sdk/reference_resources/values-sw400dp-h746dp-port/dimens-player.xml
@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<dimen name="Alt_TopMediumButton_size">62dp</dimen>
 	<dimen name="Alt_TopSmallButton_size">46dp</dimen>
 
-	<dimen name="Alt2_TopAABounds_marginBottom">88sp</dimen><!-- Reduce for the wider screens -->
+	<dimen name="Alt2_TopAABounds_marginBottom">96sp</dimen><!-- Reduce for the wider screens -->
 	<dimen name="Alt_PlainSeekbar_buttons_offset">38dp</dimen>
 
 </resources>
diff --git a/poweramp_skin_sdk/reference_resources/values-sw600dp-h500dp-large/dimens-eq.xml b/poweramp_skin_sdk/reference_resources/values-sw600dp-h500dp-large/dimens-eq.xml
new file mode 100644
index 00000000..8d092f98
--- /dev/null
+++ b/poweramp_skin_sdk/reference_resources/values-sw600dp-h500dp-large/dimens-eq.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2010-2021 Maksim Petrov
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted for themes, skins, widgets, plugins, applications and other software
+which communicate with Poweramp music player or Poweramp Equalizer applications on Android platform.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<resources>
+	<dimen name="EqParamGainLinearKnob_layout_marginLeft">16dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values-sw600dp-h500dp-large/styles-eq-param.xml b/poweramp_skin_sdk/reference_resources/values-sw600dp-h500dp-large/styles-eq-param.xml
new file mode 100644
index 00000000..d6b3c5c3
--- /dev/null
+++ b/poweramp_skin_sdk/reference_resources/values-sw600dp-h500dp-large/styles-eq-param.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2010-2021 Maksim Petrov
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted for themes, skins, widgets, plugins, applications and other software
+which communicate with Poweramp music player application on Android platform.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<!-- NOTE: the parametric styles applied as "landscape" to all devices with not enough vertical space
+     in any orientation (portrait/landscape). As soon as enough vertical space is available,
+     values-sw2dp-h700dp is applied for the "portrait" layout.
+     NOTE: for Peq this is applied earlier (via dir symbolic link - we start at 616dp).
+     NOTE: ensure this dir contains stuff just related to styles-eq-param and properly update Peq link on changes -->
+<resources 
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:w="http://schemas.android.com/apk/res-auto"
+>
+	<!--
+	  EqParamGainLinearKnob (@id/_gain)
+	           |       +========================================+
+	           |     |       +=============+                     |   <- _placeholder2 pushes knobs (_q and below)
+	           |    |   |    |_placeholder2|                      |     and limits their overal size by consuming the available
+	           +====|==>|    +=============+                      |     height. _placeholder2 height is roughly the height
+	                |   |      [ _lr ]                            |     of _lr + _type buttons with the margins
+	                |   =      [_type]                            |  <- _type button is attached to the top of _q knob.
+	                |   =                                         |     The buttons are not affected by _placeholder2 and
+	                |   |      +=====+                            |     can go over _placeholder2 if not enough space,
+	                |   |      | _q  |                            |     but still will be inside container as _placeholder2
+	                |   |      +=====+                            |     ensures that
+	                |   =      [_q_label_and_value]               |
+	                |                                             |
+	                |          +=====+                            | <- height of _freq/_q knobs is limited with maxHeight,
+	                |          +=====+                   [_color] |    so they grows to a limited size. The grow itself is caused
+	                |          [_freq_label_and_value]   [_edit]  |    by layout_heightPercent
+	                 |                                           |
+	                  +=========================================+
+
+	-->
+
+
+	<!-- port -->
+	<!-- _placeholder1 has no size and is invisible -->
+	<style name="EqParamPlaceholder1">
+		<item name="android:id">@id/_placeholder1</item>
+		<!--<item name="android:background">#00f</item>-->
+	</style>
+	
+	<!-- port -->
+	<style name="EqParamPlaceholder2">
+		<item name="android:id">@id/_placeholder2</item>
+		<!-- Should match LR and type buttons height + their margins, thus depends
+		     on EqParamPopupButtonLayout_height_port -->
+		<item name="android:layout_height">@dimen/EqParamPlaceholder2_height_port</item>
+		<item name="android:layout_width">88dp</item>
+		<item name="layout_consumeSpace">vertical|size</item>
+		
+		<!--<item name="android:background">#f00</item>-->
+	</style>
+
+	<!-- port -->
+	<style name="EqParamLRPopupButtonLayout" parent="EqParamLRPopupButtonLayoutBase">
+		<item name="android:layout_height">@dimen/EqParamPopupButtonLayout_height_port</item>
+		<item name="layout_attachBottom">@id/_type</item>
+
+		<item name="layout_gravityTarget">@id/_q</item>
+		<item name="android:layout_gravity">center_horizontal</item>
+
+		<item name="android:layout_marginTop">4dp</item>
+		<item name="android:layout_marginBottom">0dp</item>
+	</style>
+
+	<!-- port -->
+	<style name="EqParamTypePopupButtonLayout" parent="EqParamTypePopupButtonLayoutBase">
+		<item name="android:layout_height">@dimen/EqParamPopupButtonLayout_height_port</item>
+		<item name="android:layout_marginTop">4dp</item>
+		<item name="android:layout_marginBottom">@dimen/EqParamTypePopupButtonLayout_marginBottom_port</item><!-- 4dp -->
+
+		<item name="layout_attachBottom">@id/_q</item>
+		<item name="layout_gravityTarget">@id/_q</item>
+		<item name="android:layout_gravity">center_horizontal</item>
+	</style>
+
+	<!-- port -->
+	<style name="EqParamEditButton" parent="EqParamEditButtonBase">
+		<item name="layout_attachLeft">@id/_freq</item>
+		<item name="layout_attachBottom">parent</item>
+		<item name="android:layout_marginBottom">6dp</item>
+		<item name="android:layout_marginRight">8dp</item>
+		<item name="android:layout_marginLeft">-16dp</item>
+	</style>
+
+	<!-- port -->
+	<style name="EqParamColorPopupLayout" parent="EqParamColorPopupLayoutBase">
+		<item name="layout_attachLeftToLeft">@id/_edit</item>
+		<item name="layout_attachBottom">@id/_edit</item>
+	</style>
+
+	<!-- port -->
+	<style name="EqParamLockButton" parent="EqParamLockButtonBase">
+		<item name="layout_attachLeftToLeft">@id/_edit</item>
+		<item name="layout_attachBottom">@id/_color</item>
+	</style>
+
+
+	<!-- port -->
+	<style name="EqParamRoundKnobPortBase" parent="EqParamRoundKnobBase">
+		<item name="layout_maxHeight">@dimen/EqParamRoundKnobBase_maxSize_port</item>
+		<item name="android:layout_width">wrap_content</item>
+		<!-- NOTE: for a longer screens layout_maxHeight is in effect up to an available space or maxHeight and limit -->
+		<item name="layout_heightPercent">50%</item>
+		<item name="android:layout_gravity">top|left</item>
+
+		<item name="android:layout_marginTop">6dp</item>
+		<!-- Matching the gain linear knob total offset from bottom. This margin is applied to the knob labels, as those are aligned
+		     bottom-to-bottom -->
+		<item name="android:layout_marginBottom">4dp</item>
+				
+		<item name="android:paddingBottom">@dimen/EqParamRoundKnobPortBase_paddingBottom</item><!-- 36sp. Should be enough for label and values to fit -->
+
+		<!--<item name="android:background">#500f</item>-->
+	</style>
+	
+	<!-- port -->
+	<style name="EqParamQRoundKnob" parent="EqParamRoundKnobPortBase">
+		<item name="android:id">@id/_q</item>
+		<item name="android:contentDescription">@string/q_factor</item>
+		
+		<item name="layout_attachTop">@null</item>
+		<item name="layout_attachBottom">@id/_freq</item>
+
+		<!--<item name="android:background">#f00</item>-->
+	</style>
+	
+	<!-- port -->
+	<style name="EqParamQLabelAndValue" parent="EqParamLabelAndValueBase">
+		<item name="android:id">@id/_q_label_and_value</item>
+		<item name="android:importantForAccessibility">no</item>
+
+		<item name="layout_minWidth">52sp</item><!-- Reduce width jumps when rotating and changing value by defining some resonable min width -->
+		<item name="layout_attachBottomToBottom">@id/_q</item>
+		<item name="android:layout_marginTop">0dp</item>
+		<item name="android:layout_marginBottom">0dp</item><!-- Ensure to reset margin bottom -->
+
+		<item name="layout_gravityTarget">@id/_q</item>
+		<item name="android:layout_gravity">center_horizontal</item>
+		
+	</style>
+	
+	<!-- port -->
+	<style name="EqParamFreqRoundKnob" parent="EqParamRoundKnobPortBase">
+		<item name="android:id">@id/_freq</item>
+		<item name="android:contentDescription">@string/frequency</item>
+		
+		<item name="layout_attachTop">@null</item>
+		<item name="layout_attachBottom">parent</item>
+
+		<item name="layout_minWidth">52sp</item><!-- Reduce width jumps when rotating and changing value by defining some resonable min width -->
+	</style>
+	
+	<!-- port -->
+	<!-- NOTE: we have offset from parent bottom as we're attached bottom-to-bottom to knob, which has some marignBottom already -->
+	<style name="EqParamFreqLabelAndValue" parent="EqParamLabelAndValueBase">
+		<item name="android:id">@id/_freq_label_and_value</item>
+		<item name="android:importantForAccessibility">no</item>
+		
+		<item name="layout_attachBottomToBottom">@id/_freq</item>
+		<item name="layout_gravityTarget">@id/_freq</item>
+		<item name="android:layout_gravity">center_horizontal</item>
+		<item name="android:layout_marginBottom">0dp</item><!-- Ensure to reset margin bottom -->
+	</style>
+</resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values-sw600dp-large-land/dimens-eq.xml b/poweramp_skin_sdk/reference_resources/values-sw600dp-large-land/dimens-eq.xml
new file mode 100644
index 00000000..40cb1d10
--- /dev/null
+++ b/poweramp_skin_sdk/reference_resources/values-sw600dp-large-land/dimens-eq.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2010-2023 Maksim Petrov
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted for themes, skins, widgets, plugins, applications and other software
+which communicate with Poweramp music player or Poweramp Equalizer applications on Android platform.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<resources>
+	<!-- Used for land + large only -->
+	<dimen name="EqToneKnobLayout_marginOffset">4dp</dimen>
+	<!-- NOTE: needed for cases like Nexus 7/land where bass value labe is too close to bottom, and
+	     treble value label is too close to bass knob -->
+	<dimen name="EqRoundKnobValueLabel_marginBottom">8dp</dimen>
+
+	<dimen name="EqEquPresetButtonLayout_width">110dp</dimen>
+	<dimen name="EqMenu_marginBottom">8dp</dimen>
+
+	<dimen name="EqParamPopupButtonLayout_height_port">32dp</dimen>
+	<dimen name="EqParamPlaceholder2_height_port">76dp</dimen><!-- 4 + 32 + 4 + 32 + 4 -->
+	<dimen name="EqParamTypePopupButtonLayout_marginBottom_port">4dp</dimen>
+
+
+</resources>
diff --git a/poweramp_skin_sdk/reference_resources/values-sw600dp-large-land/styles-eq.xml b/poweramp_skin_sdk/reference_resources/values-sw600dp-large-land/styles-eq.xml
index 02bb3d99..396c689d 100644
--- a/poweramp_skin_sdk/reference_resources/values-sw600dp-large-land/styles-eq.xml
+++ b/poweramp_skin_sdk/reference_resources/values-sw600dp-large-land/styles-eq.xml
@@ -50,5 +50,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="android:paddingRight">@dimen/EqKnob_spacing</item>
 		<item name="android:layout_marginBottom">4dp</item>
 	</style>
-		
+
+
 </resources> 
diff --git a/poweramp_skin_sdk/reference_resources/values-sw600dp-large/dimens-eq.xml b/poweramp_skin_sdk/reference_resources/values-sw600dp-large/dimens-eq.xml
index b488f1f4..453e11a5 100644
--- a/poweramp_skin_sdk/reference_resources/values-sw600dp-large/dimens-eq.xml
+++ b/poweramp_skin_sdk/reference_resources/values-sw600dp-large/dimens-eq.xml
@@ -24,39 +24,51 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 <resources>
 	<dimen name="EqLinearKnob_thumbWidth">40dp</dimen>
 	<dimen name="EqLinearKnob_thumbHeight">80dp</dimen>
-	<dimen name="knob_thumb_indicator_top_bottom">39.5dp</dimen>	
-	<dimen name="knob_thumb_indicator_left_right">7dp</dimen>
+	<dimen name="knob_thumb_indicator_top_bottom">39dp</dimen>
+	<dimen name="knob_thumb_indicator_left_right">10dp</dimen>
 	<dimen name="knob_thumb_radius">24dp</dimen>
 	<dimen name="knob_thumb_radius_less_rounded">18dp</dimen>
 	<dimen name="EqLinearKnob_paddingLR">8dp</dimen>
 
 	<dimen name="EqEquButton_maxWidth">110dp</dimen>
-	<dimen name="EqButton_layout_width">64dp</dimen>
-	<dimen name="EqButton_layout_height">32dp</dimen>
+	<dimen name="EqButton_width">64dp</dimen>
+	<dimen name="EqButton_height">32dp</dimen>
+	<dimen name="EqMenu_size">32dp</dimen>
 	<dimen name="EqButton_paddingLR">16dp</dimen>
 
-	<dimen name="EqParamPlaceholder2_height">88dp</dimen>
-	<dimen name="EqParamRoundKnobPortBase_paddingBottom">64sp</dimen>
+	<dimen name="EqParamRoundKnobPortBase_paddingBottom">34sp</dimen>
 
+	<dimen name="EqParamPopupButtonLayout_height_port">32dp</dimen>
+	<dimen name="EqParamPlaceholder2_height_port">84dp</dimen><!-- 4 + 32 + 4 + 32 + 12 -->
+	<dimen name="EqParamTypePopupButtonLayout_marginBottom_port">12dp</dimen>
 
 	<dimen name="eq_frs_height">62dp</dimen>
 	
-	<dimen name="EqButton_layout_maxWidth">98dp</dimen>
+	<dimen name="EqButton_maxWidth">98dp</dimen>
 	<dimen name="EqButton_marginSide">8dp</dimen>
-	<dimen name="EqEquPresetButtonLayout_layout_width">128dp</dimen>
-	
+
+	<dimen name="EqEquPresetButtonLayout_width">120dp</dimen>
 
 	<dimen name="EqSmallRoundKnobLayout_maxSize">170dp</dimen>
 
-	<dimen name="EqToneRoundKnobLabel_maxWidth">100dp</dimen>
-	<dimen name="EqToneRoundKnobLabel_marginRight">0dp</dimen>
 	<dimen name="EqToneRoundKnob_maxSize">190dp</dimen>
 
 	<dimen name="EqRoundKnobLayout_maxSize">220dp</dimen>
 	<dimen name="EqLargerRoundKnobLayout_maxSize">240dp</dimen>
 	<dimen name="EqSmallRoundKnob_maxSize">130dp</dimen>
 	<dimen name="EqRoundKnob_maxSize">180dp</dimen>
-	<dimen name="EqParamRoundKnobBase_maxSize">160dp</dimen>
+	<dimen name="EqParamRoundKnobBase_maxSize_port">160dp</dimen>
 	<dimen name="EqLargerRoundKnob_maxSize">200dp</dimen>
 	<dimen name="EqPresetButtonLayout_width">132dp</dimen><!-- land only -->
+
+	<dimen name="EqPresetButtonLayoutBase_listItemSize">76dp</dimen>
+
+	<dimen name="ItemPopupListFrs_marginRight">20dp</dimen>
+	<dimen name="ItemEqPresetTitle_drawablePadding">16dp</dimen>
+
+	<dimen name="EqMenuIcon_size">24dp</dimen>
+
+
+
+
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values-sw600dp-large/dimens-player.xml b/poweramp_skin_sdk/reference_resources/values-sw600dp-large/dimens-player.xml
index d39453c2..dde4fecf 100644
--- a/poweramp_skin_sdk/reference_resources/values-sw600dp-large/dimens-player.xml
+++ b/poweramp_skin_sdk/reference_resources/values-sw600dp-large/dimens-player.xml
@@ -26,11 +26,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<dimen name="TopMetaInfoLabel_paddingTopBottom">3dp</dimen>
 	<dimen name="TopMetaInfo_scene_item_menu_maxWidth">580dp</dimen>
 	
-	<dimen name="TopBaseButtonLayout_layout_width">68dp</dimen>
-	<dimen name="TopBaseButtonLayout_layout_height">36dp</dimen>
+	<dimen name="TopBaseButtonLayout_width">68dp</dimen>
+	<dimen name="TopBaseButtonLayout_height">36dp</dimen>
 	<dimen name="PopupButtons_drawableSize">32dp</dimen>
 	<dimen name="SmallerPopupButton_marginLeft">-12dp</dimen>
-	<dimen name="PopupButtons_paddingLeft">18dp</dimen><!-- Sync with TopBaseButtonLayout_layout_width=>PopupButtons_paddingLeft + 32dp (icon size) + PopupButtons_paddingLeft -->
+	<dimen name="PopupButtons_paddingLeft">18dp</dimen><!-- Sync with TopBaseButtonLayout_width=>PopupButtons_paddingLeft + 32dp (icon size) + PopupButtons_paddingLeft -->
 
 	<dimen name="NavbarExtensionMenuLine_drawableSize">32dp</dimen>
 		
@@ -100,5 +100,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<dimen name="Alt_TopPauseMoreButtons_maxSize_scene_playing">72dp</dimen>
 	<dimen name="Alt_TopSmallButton_size">40dp</dimen>
 	<dimen name="Alt_TopMediumButton_size">60dp</dimen>
-		
+
+	<dimen name="ListSubstyleBase2_searchHeaderSize">160dp</dimen><!-- REVISIT: includes sp text size, so should be sp based or dynamic -->
+	<dimen name="ListSubstyleBase2_targetSearchHeaderSize">160dp</dimen>
 </resources>
diff --git a/poweramp_skin_sdk/reference_resources/values-sw600dp-large/dimens-powerui.xml b/poweramp_skin_sdk/reference_resources/values-sw600dp-large/dimens-powerui.xml
index 8d5bbd16..c5802ae2 100644
--- a/poweramp_skin_sdk/reference_resources/values-sw600dp-large/dimens-powerui.xml
+++ b/poweramp_skin_sdk/reference_resources/values-sw600dp-large/dimens-powerui.xml
@@ -24,17 +24,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<dimen name="LargerTopBottomSheetDialogFrame_maxHeight">560dp</dimen>
 	<dimen name="TopBottomSheetDialogFrame_vertical_buttons_maxHeight">560dp</dimen>
 	<dimen name="SmallerCenterDialogFrame_maxHeight">460dp</dimen>
-	
-	<dimen name="CenterDialogFrame_maxWidth">600dp</dimen>
+
+	<dimen name="CenterDialogFrame_maxWidth">540dp</dimen>
 	<dimen name="CenterDialogFrame_maxHeight">800dp</dimen>
 	
 	<dimen name="TopSleepTimerButtonLayout_scene_item_menu_width">500dp</dimen>
 	<dimen name="PopupButtonLayoutDialogButton_marginTop">8dp</dimen>
 	
-	<dimen name="TopToastContainer_layout_height">192dp</dimen>
+	<dimen name="TopToastContainer_height">192dp</dimen>
 	<dimen name="TopToastFrame_maxWidth">400dp</dimen>
 	<dimen name="TopToastFrame_paddingLR">24dp</dimen>
 	<dimen name="TopToastFrame_paddingTB">10dp</dimen>
 	<dimen name="TopToastTile_marginLeft">58dp</dimen><!-- NOTE: defines space for icon + padding -->
-		
+
+	<dimen name="DialogFrame_maxWidth">540dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values-sw800dp-large-land/dimens-eq.xml b/poweramp_skin_sdk/reference_resources/values-sw800dp-large-land/dimens-eq.xml
new file mode 100644
index 00000000..3a2782cc
--- /dev/null
+++ b/poweramp_skin_sdk/reference_resources/values-sw800dp-large-land/dimens-eq.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2010-2023 Maksim Petrov
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted for themes, skins, widgets, plugins, applications and other software
+which communicate with Poweramp music player or Poweramp Equalizer applications on Android platform.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<resources>
+	<dimen name="EqEquPresetButtonLayout_width">170dp</dimen>
+</resources>
diff --git a/poweramp_skin_sdk/reference_resources/values-sw800dp-large/dimens-eq.xml b/poweramp_skin_sdk/reference_resources/values-sw800dp-large/dimens-eq.xml
index bee0aeaf..6aa1f3ca 100644
--- a/poweramp_skin_sdk/reference_resources/values-sw800dp-large/dimens-eq.xml
+++ b/poweramp_skin_sdk/reference_resources/values-sw800dp-large/dimens-eq.xml
@@ -24,37 +24,48 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 <resources>
 	<dimen name="EqLinearKnob_thumbWidth">48dp</dimen>
 	<dimen name="EqLinearKnob_thumbHeight">96dp</dimen>
-	<dimen name="knob_thumb_indicator_top_bottom">47dp</dimen>	
-	<dimen name="knob_thumb_indicator_left_right">8dp</dimen>
+	<dimen name="knob_thumb_indicator_top_bottom">46dp</dimen>
+	<dimen name="knob_thumb_indicator_left_right">10dp</dimen>
 	<dimen name="knob_thumb_radius">30dp</dimen>
 	<dimen name="knob_thumb_radius_less_rounded">20dp</dimen>
-	<dimen name="EqLinearKnob_paddingLR">16dp</dimen>
+	<dimen name="EqLinearKnob_paddingLR">12dp</dimen>
 	<dimen name="linear_knob_text_size">14dp</dimen>
 	
-	<dimen name="preamp_knob_width">104dp</dimen>
+	<dimen name="preamp_knob_width">108dp</dimen>
+	<dimen name="preamp_bg_insetRight">16dp</dimen>
 		
 	<dimen name="EqKnobValueText_size">12sp</dimen>
 	<dimen name="EqKnobLabelText_size">14dp</dimen>
 	
-	<dimen name="EqButton_layout_width">72dp</dimen>
-	<dimen name="EqButton_layout_height">44dp</dimen>
+	<dimen name="EqButton_width">72dp</dimen>
+	<dimen name="EqButton_height">44dp</dimen>
+	<dimen name="EqMenu_size">44dp</dimen>
 	<dimen name="EqButton_paddingLR">24dp</dimen>
+	<dimen name="EqButton_textSize">16dp</dimen><!-- Default (fixed) font -->
+
+	<dimen name="EqParamRoundKnobPortBase_paddingBottom">48sp</dimen>
+
+	<dimen name="EqParamPopupButtonLayout_height_port">44dp</dimen>
+	<dimen name="EqParamPlaceholder2_height_port">116dp</dimen><!-- 4 + 44 + 4 + 44 + 20 -->
+	<dimen name="EqParamTypePopupButtonLayout_marginBottom_port">20dp</dimen>
+
+	<dimen name="EqParamRoundKnobBase_maxSize_port">180dp</dimen>
 
-	<dimen name="EqParamPlaceholder2_height">112dp</dimen>
 
-	<dimen name="EqButton_textSize">15dp</dimen>
-	
 	<dimen name="eq_frs_height">96dp</dimen>
 	
-	<dimen name="EqButton_layout_maxWidth">128dp</dimen>
+	<dimen name="EqButton_maxWidth">128dp</dimen>
 	<dimen name="EqButton_marginSide">16dp</dimen>
-	<dimen name="EqEquPresetButtonLayout_layout_width">190dp</dimen>
+	
+	<dimen name="EqEquPresetButtonLayout_width">272dp</dimen>
+
+	<dimen name="EqToneRoundKnobLabel_maxWidth">80dp</dimen>
 	
 	<dimen name="EqKnob_spacing">8dp</dimen>
 	
 	<dimen name="EqToneRoundKnob_maxSize">240dp</dimen>
 	<dimen name="EqRoundKnob_maxSize">300dp</dimen>
-	<dimen name="EqParamRoundKnobBase_maxSize">240dp</dimen>
+
 	<dimen name="EqLargerRoundKnob_maxSize">350dp</dimen>
 
 	<dimen name="EqToneRoundKnobLayout_maxWidth">320dp</dimen>
@@ -62,5 +73,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	
 	<dimen name="EqRoundKnobLayout_maxSize">320dp</dimen>
 	<dimen name="EqLargerRoundKnobLayout_maxSize">350dp</dimen>
-		
+
+
+
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values-sw800dp-large/dimens-player.xml b/poweramp_skin_sdk/reference_resources/values-sw800dp-large/dimens-player.xml
index 1c892b88..3711564c 100644
--- a/poweramp_skin_sdk/reference_resources/values-sw800dp-large/dimens-player.xml
+++ b/poweramp_skin_sdk/reference_resources/values-sw800dp-large/dimens-player.xml
@@ -44,12 +44,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 	<dimen name="ListSubstyleBase2_aaMarginBottom">400dp</dimen>
 	
-	<dimen name="TopBaseButtonLayout_layout_width">104dp</dimen>
-	<dimen name="TopBaseButtonLayout_layout_height">48dp</dimen>
+	<dimen name="TopBaseButtonLayout_width">104dp</dimen>
+	<dimen name="TopBaseButtonLayout_height">48dp</dimen>
 	<dimen name="PopupButtons_drawableSize">48dp</dimen>
 	<dimen name="PopupButton_scene_button_menu">80dp</dimen>
 	<dimen name="SmallerPopupButton_marginLeft">-12dp</dimen>
-	<dimen name="PopupButtons_paddingLeft">28dp</dimen><!-- Sync with TopBaseButtonLayout_layout_width=>PopupButtons_paddingLeft + 32dp (icon size) + PopupButtons_paddingLeft -->
+	<dimen name="PopupButtons_paddingLeft">28dp</dimen><!-- Sync with TopBaseButtonLayout_width=>PopupButtons_paddingLeft + 32dp (icon size) + PopupButtons_paddingLeft -->
 	<dimen name="PopupMenuItem_drawableWidth">32dp</dimen>
 
 	<dimen name="Navbar_height">64dp</dimen>
diff --git a/poweramp_skin_sdk/reference_resources/values-sw800dp-large/dimens-text.xml b/poweramp_skin_sdk/reference_resources/values-sw800dp-large/dimens-text.xml
index f739640e..6b38b980 100644
--- a/poweramp_skin_sdk/reference_resources/values-sw800dp-large/dimens-text.xml
+++ b/poweramp_skin_sdk/reference_resources/values-sw800dp-large/dimens-text.xml
@@ -39,7 +39,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<dimen name="TopTrackElapsedDuration_Text_size">19sp</dimen>
 	<dimen name="ItemTrackCatImage_Text_size">10.125sp</dimen>
 
-	
 	<dimen name="small1_textSize">13.5sp</dimen>
 	<dimen name="small2_textSize">13.5sp</dimen>
 	<dimen name="small3_textSize">13.75sp</dimen>
diff --git a/poweramp_skin_sdk/reference_resources/values-v29/black-styles.xml b/poweramp_skin_sdk/reference_resources/values-v29/black-styles.xml
index 43bacb55..44e1e6eb 100644
--- a/poweramp_skin_sdk/reference_resources/values-v29/black-styles.xml
+++ b/poweramp_skin_sdk/reference_resources/values-v29/black-styles.xml
@@ -23,7 +23,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 	<!-- NOTE: need to redefine it again, as core black-styles redefines default colors -->
 	<style name="ActivityTheme_Black" parent="Base_ActivityTheme_Black">
+		<!-- NOTE: update v29/* as well if this is updated -->
 		<item name="statusBarBg">#3000</item>
+		<!-- NOTE: if navigationBarColor is fully transparent, system will apply extra background color
+		     via implicit android:enforceNavigationBarContrast.
+		     Most firmwares will properly drop that enforceNavigationBarContrast background for the
+		     gesture navigation, but some devices still apply it (Samsungs@Android 13).
+		     Also these affected devices usually do not honor setNavigationBarContrastEnforced call, so we must to apply
+		     appropriate style via xml -->
 		<item name="android:navigationBarColor">#0fff</item>
 	</style>
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values-v29/default-styles.xml b/poweramp_skin_sdk/reference_resources/values-v29/default-styles.xml
index 3197ab16..26acfd5b 100644
--- a/poweramp_skin_sdk/reference_resources/values-v29/default-styles.xml
+++ b/poweramp_skin_sdk/reference_resources/values-v29/default-styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (C) 2010-2019 Maksim Petrov
+Copyright (C) 2010-2023 Maksim Petrov
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted for themes, skins, widgets, plugins, applications and other software
@@ -22,11 +22,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 <!-- values-sw2dp-v29 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 	<style name="Base_ActivityTheme_Default" parent="Base_ActivityTheme_Core">
+		<!-- NOTE: update v33/* as well if this is updated -->
 		<item name="android:editTextBackground">@drawable/edit_text_material</item>
-		
 		<item name="statusBarBg">#3000</item>
 		<item name="android:navigationBarColor">#0fff</item><!-- Makes big navbar button greyish so they are better visible on white -->
-		
 		<item name="corners_equ_frs">16dp</item><!-- NOTE: overridden for v28/v29+, as it's slow for lower Androids. Also further overridden by OptionEquFRSRounded* -->
 	</style>
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values/attrs-fastlayout.xml b/poweramp_skin_sdk/reference_resources/values/attrs-fastlayout.xml
index ce511e94..5e3f2770 100644
--- a/poweramp_skin_sdk/reference_resources/values/attrs-fastlayout.xml
+++ b/poweramp_skin_sdk/reference_resources/values/attrs-fastlayout.xml
@@ -147,7 +147,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		</attr>
 
 		<!-- layout_attach*To* (where *= Right|Left|Top|Bottom => attaches appropriate edge of the view to same edge of the target view.
-			 layout_attach*To* and layout_attach* for the same * are mutually exclusive. layout_attach*To* takes priority.
+			 layout_attach*To* and layout_attach* for the same * (side) are mutually exclusive. layout_attach*To* takes priority.
 			 (Since 940) If layout_attach*="value %" is specified, then this view is also offset from the target view by the specified percent of the target
 			 size in the given axis (width for Right|Left, height for Top|Bottom).
 			 Cyclic references are not allowed (you'll see stack overflow exception). The referenced view will be laid out first (xml order is ignored).
@@ -199,18 +199,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 		<!-- layout_consumeSpace "consumes" space within parent from one or two sides, or both (layout_consumeSpace="both").
-			 If parent space is consumed, any subsequent child will be laid out with offset. Gravity is also affected, but not the
-			 layout_widthPercent/layout_heightPercent (unless "size" flag specified, see below).
+			 When the parent space is consumed, any subsequent child will be laid out in the non-consumed space.
+			 Gravity is also affected, but not the layout_widthPercent/layout_heightPercent (unless "size" flag specified, see below).
 			 There are 4 sides in parent view which can be consumed - left, top, right, bottom.
 
 			 Views aligned to left (or left and right), consume left space, view aligned to top - top space, views aligned
 			 to right - right space, and aligned to bottom - bottom space.
-			 The alignment here means either layout_gravity (per appropiate axis), or layout_attach* attribute, if layout_gravity is missing for the axis.
+			 The alignment here means either layout_gravity (per appropiate axis), or layout_attach* attribute, if layout_gravity
+			 is missing for the axis.
 
 			 layout_consumeSpace=reset_* resets such layout consumption (works similar to new line in text or to <br/> in html).
-			 By default, only the side (e.g. just left, for horizontally consumed space), which view is aligned to is reset.
+			 By default, only the side (e.g. just left, for horizontally consumed space), which view is aligned to, is reset.
 			 Special reset_full_* values can reset both sides.
 
+			 The GONE views or views considered GONE (see layout_goneWhenEmpty) do not consume space nor can reset it.
+
 			 For example: 2 columns 50%|50% height=200dp, then 2 rows (width=100%) height=100dp
 			 	<view w:layout_widthRelative="50%" android:layout_height="200dp" w:layout_consumeSpace="horizontal"/>
 			 	<view w:layout_widthRelative="50%" android:layout_height="200dp" w:layout_consumeSpace="vertical|reset_horizontal"/>
@@ -218,6 +221,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 			 	<view android:layout_width="match_parent" android:layout_height="100dp" w:layout_consumeSpace="vertical"/>
 			 	<view android:layout_width="match_parent" android:layout_height="100dp" w:layout_consumeSpace="vertical"/>
 
+
 		-->
 		<attr name="layout_consumeSpace">
 			<flag name="none" value="0"/>
diff --git a/poweramp_skin_sdk/reference_resources/values/attrs-player-widgets.xml b/poweramp_skin_sdk/reference_resources/values/attrs-player-widgets.xml
index 071712a3..fb0fbd8d 100644
--- a/poweramp_skin_sdk/reference_resources/values/attrs-player-widgets.xml
+++ b/poweramp_skin_sdk/reference_resources/values/attrs-player-widgets.xml
@@ -164,5 +164,27 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<!-- InfoTextHelper class name to use. Can start with . to resolve class name vs package name --> 
 		<attr name="infoTextHelper" format="string"/>
 	</declare-styleable>
-	
+
+
+	<declare-styleable name="ListSearchCatsLayoutBase">
+		<attr name="catButtonStyle" format="reference"/>
+	</declare-styleable>
+
+	<declare-styleable name="ListSearchEditText">
+		<!-- The list bus id. Default is @id/list -->
+		<attr name="busId"/>
+	</declare-styleable>
+
+	<declare-styleable name="EqPresetPopupListLayout">
+		<attr name="separatorSize"/>
+		<!-- This is taken from the default theme -->
+		<attr name="equ_graphic_small"/>
+		<!-- This is taken from the default theme -->
+		<attr name="equ_parametric_small"/>
+		<attr name="bottomReservedSpace"/>
+		<!-- True for the dialog list. This changes behavior to be focused around specific filters/assign cb/etc. as commanded
+		     by the intent -->
+		<attr name="isDialog" format="boolean"/>
+	</declare-styleable>
+
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values/attrs-player.xml b/poweramp_skin_sdk/reference_resources/values/attrs-player.xml
index 4e7b9866..b6fb5deb 100644
--- a/poweramp_skin_sdk/reference_resources/values/attrs-player.xml
+++ b/poweramp_skin_sdk/reference_resources/values/attrs-player.xml
@@ -84,6 +84,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<attr name="pre_chromecast" format="reference"/>
 	<attr name="pre_other" format="reference"/>
 
+	<attr name="equ_graphic_small" format="reference"/>
+	<attr name="equ_parametric_small" format="reference"/>
+
 	<!-- Points to array of drawables, array sorting order is important -->
 	<attr name="vis_icons_32dp" format="reference"/>
 	
@@ -137,6 +140,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<attr name="import_24dp" format="reference"/>
 	<attr name="bookmark" format="reference"/>
 	<attr name="share_24dp" format="reference"/>
+	<attr name="reset_24dp" format="reference"/>
+	<attr name="save_24dp" format="reference"/>
+	<attr name="save_assign_24dp" format="reference"/>
+	<attr name="autosave_24dp" format="reference"/>
 
 	<attr name="clear_q_24dp" format="reference"/>
 	<attr name="artists_24dp" format="reference"/>
@@ -150,6 +157,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<attr name="playlist_24dp" format="reference"/>
 	<attr name="play_24dp" format="reference"/>
 	<attr name="search_24dp" format="reference"/>
+	<!-- The tinted version - used in the toast -->
+	<attr name="lock_24dp_tinted" format="reference"/>
+	<attr name="lock_24dp" format="reference"/>
+	<attr name="lock_solid_24dp" format="reference"/>
+	<attr name="lock_unlock_24dp" format="reference"/>
 
 	<!-- This may visually match settings_24dp, but may also have a higher resolution for xhdpi-large.
 	     settings_24dp should not grow over 24dp as it used with implicit size in many places -->
@@ -197,6 +209,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	
 	<!-- Not themeable functional attributes -->
 	<attr name="state_playing" format="boolean" /><!-- Extra state for drawables -->
+	<attr name="state_locked" format="boolean" /><!-- Extra state for drawables -->
+
 	<attr name="milk_advance_modes" format="reference"/>
 	<attr name="milk_advance_icons" format="reference"/>
 	<attr name="milk_advance_enum" format="reference"/>
@@ -214,6 +228,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<attr name="alt_sub_aa_button_bg" format="color|reference"/>
 	<attr name="meta_info_bg" format="color|reference"/>
 
+	<attr name="lock_unlock_24dp_selector" format="reference"/>
+
 	<!-- These are overridden for alt styles + overlap_track_labels_no_bg -->
 	<attr name="ItemTrackAAImage_scene_header_drawableTintColor" format="color"/>
 
@@ -376,7 +392,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	</attr>
 
 	<attr name="EqMilkFrs_presetUri" format="string"/>
-	
+
+	<attr name="EqTonePanel_paddingTop" format="dimension"/>
+	<attr name="EqTonePanel_paddingBottom" format="dimension"/>
+
 	<!-- Extra optional layout to include into TopWaveseekLayout (e.g. extra pro-buttons, but can be anything skin wants) -->
 	<attr name="TopWaveseekLayout_extraLayout" format="reference"/>
 	
@@ -425,9 +444,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<attr name="ItemTrackTitle_scene_item_menu_scale" format="float"/>
 	<attr name="Alt_ItemTrackTitle_scene_aa_scale" format="float"/>
 
-	<!-- @Deprecated -->
-	<attr name="ItemTrackTitle_marginBottom" format="dimension"/>
-	
 	<attr name="ItemTrackTitle_paddingLR" format="dimension"/>
 	<attr name="ItemTrackTitle_paddingTB" format="dimension"/>
 
@@ -458,9 +474,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<attr name="ItemTrackMeta_drawablePaddingStart" format="dimension"/>
 
 
-	<!-- @Deprecated -->
-	<attr name="ItemTrackMeta_scene_item_menu_marginBottom" format="dimension"/>
-
 	<attr name="ItemMiniplayer_paddingLeft" format="dimension"/>
 
 	<attr name="TopListScrollerView_marginTop" format="dimension"/>
@@ -888,7 +901,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<attr name="indicatorScale" format="float"/>
 		<!-- Default is false. If true, also rotates knob image to the same angle as indicator  -->
 		<attr name="rotateKnob" format="boolean"/>
-		
+
+		<!-- Gravity to use for the round knob inside the possibly non-rectangle bounds. Default is center -->
+		<attr name="android:gravity"/>
+
 		<!-- If defined (with arcWidth > 0), arc is drawn.
 		     If just start color is defined - this is the color for whole shape, othersiwe color changes from start color to the appropriate end color -->
 		<attr name="arcStartColor" format="color|reference"/>
@@ -935,6 +951,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		
 		<!-- Additional value to round to/from values prior setting. Resulting value is Math.round(value * rounding) / rounding --> 
 		<attr name="rounding" format="float"/>
+
 	</declare-styleable>
 	
 	<declare-styleable name="DSPRoundKnob">
@@ -975,6 +992,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 		<!-- If set, this state is used for the toast msg (if string state returns non-null value) -->
 		<attr name="toastStateIdOnPress" format="reference"/>
+
+		<!-- If we're in some popup and this is true, we'll try not to close the popup -->
+		<attr name="preferNotToClosePopup" format="boolean"/>
 	</declare-styleable>
 
 	<declare-styleable name="MilkFRS">
@@ -991,6 +1011,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<attr name="lineWidth" format="dimension"/>
 		<!-- Parametric mode line width -->
 		<attr name="parametricLineWidth" format="dimension"/>
+
+		<!-- Gradient color for graphic mode line.
+		     If all of these defined to value != #0000, we draw line with gradient:
+		     [graphicColorMax, graphicColor75, lineColor, graphicColor25, graphicColorMin]  -->
+		<attr name="graphicColorMax" format="color"/>
+		<!-- Gradient color for graphic mode line -->
+		<attr name="graphicColor75" format="color"/>
+		<!-- Gradient color for graphic mode line -->
+		<attr name="graphicColor25" format="color"/>
+		<!-- Gradient color for graphic mode line -->
+		<attr name="graphicColorMin" format="color"/>
 		
 		<attr name="cornerRadius1"/>
 		
@@ -1122,6 +1153,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<attr name="HeadText"/>
 		<attr name="SubheadText"/>
 		<attr name="Hint"/>
+
 		<attr name="dspInfoImage" format="reference"/><!-- The target view where we put our drawable info -->
 		<attr name="unknownIcon" format="reference"/>
 		<attr name="drawableTint"/>
@@ -1133,6 +1165,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<attr name="arrowLineWeight"/>
 		<attr name="arrowFillColor"/>
 		<attr name="arrowStrokeColor"/>
+
+		<!-- Adds extra space for subHead lines -->
+		<attr name="subheadPadding" format="dimension"/>
 	</declare-styleable>
 	
 	<declare-styleable name="EqKnobParamLayout">
@@ -1153,7 +1188,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<attr name="separatorColor" format="color"/>
 		<!-- Dotted separator line width -->
 		<attr name="separatorWidth" format="dimension"/>
-		<!-- Ribght separator line padding -->
+		<!-- Right separator line padding -->
 		<attr name="separatorPaddingRight" format="dimension"/>
 		<!-- Top separator line padding -->
 		<attr name="separatorPaddingTop" format="dimension"/>
@@ -1180,6 +1215,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		     Padding should be enough to fit color borders as borders are drawn on paddings -->   
 		<attr name="colorPadding" format="dimension"/>
 	</declare-styleable>
-	
-		
+
+
+	<!-- Deprecated -->
+
+	<!-- @Deprecated -->
+	<attr name="ItemTrackMeta_scene_item_menu_marginBottom" format="dimension"/>
+	<!-- @Deprecated -->
+	<attr name="ItemTrackTitle_marginBottom" format="dimension"/>
+
+
+
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values/attrs-powerui-styles.xml b/poweramp_skin_sdk/reference_resources/values/attrs-powerui-styles.xml
index 6632ed8d..cabea808 100644
--- a/poweramp_skin_sdk/reference_resources/values/attrs-powerui-styles.xml
+++ b/poweramp_skin_sdk/reference_resources/values/attrs-powerui-styles.xml
@@ -47,11 +47,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<attr name="TopUpperToastLine2_Text" format="reference"/>
 	<attr name="TopUpperToastTitle_no_icon" format="reference"/>
 	<attr name="TopUpperToastLine2_no_icon" format="reference"/>
+	<attr name="TopUpperToastSeparator" format="reference"/>
 	<attr name="TopUpperToastFrame_scene_expanded" format="reference"/>
 	
 	<attr name="PopupMenuItem" format="reference"/>
 	<attr name="PopupMenuItem_Text" format="reference"/>
 	<attr name="PopupMenuItem50" format="reference"/>
+	<attr name="CheckablePopupItem" format="reference"/>
 	
 	<attr name="PopupButton" format="reference"/>
 	<attr name="PopupButton_Text" format="reference"/>
diff --git a/poweramp_skin_sdk/reference_resources/values/attrs-powerui.xml b/poweramp_skin_sdk/reference_resources/values/attrs-powerui.xml
index f691e008..0fdb65c1 100644
--- a/poweramp_skin_sdk/reference_resources/values/attrs-powerui.xml
+++ b/poweramp_skin_sdk/reference_resources/values/attrs-powerui.xml
@@ -163,6 +163,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 			 ripple is not visible anyway, but causes performance drop on some devices -->
 		<attr name="animOnClick" format="boolean"/>
 		<attr name="disableClickHandler" format="boolean"/>
+		<!-- If true, we set this view to "empty" state when it's disabled. This may cause FastLayout to hide it completely. May not
+		     properly work/sync with scenes -->
+		<attr name="emptyForDisable" format="boolean"/>
 	</declare-styleable>
 	
 	
@@ -255,7 +258,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<!-- Behavior (pseudo-view-tag which attaches to some real view and modifies its behavior in some way) which enables sending commands to Poweramp event buses
 		 NOTE: also applied to BusActionButton -->
 	<declare-styleable name="BusActionBehavior">
-		<attr name="busId" format="reference"/><!-- E.g. @id/list (== bus supporting view id) or @id/bus_gui -->
+		<!-- E.g. @id/list (== bus supporting view id) or @id/bus_gui, or parent -> to attach to the first available msg bus up
+		     the views hierarchy -->
+		<attr name="busId" format="reference">
+			<enum name="parent" value="0"/>
+		</attr>
 		<attr name="msgId" format="reference"/><!-- E.g. @id/cmd_list_select_all -->
 		<attr name="longPressBusId"/><!-- Optional, busId is used by default -->
 		<attr name="longPressMsgId" format="reference"/><!-- E.g. @id/cmd_list_select_all. Send on long press and (if repeatLongPressPeriod > 0) periodically  -->
@@ -276,16 +283,22 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<attr name="confirmTitle" format="string|reference"/>
 		<!-- Optional confirmation dialog text -->
 		<attr name="confirmText" format="string|reference"/>
+		<!-- Optional confirmation dialog OK button label -->
+		<attr name="confirmButton" format="string"/>
 		
 		<!-- Optional confirmation dialog title for long press. Should be set for dialog to show -->
 		<attr name="longPressConfirmTitle" format="string|reference"/>
 		<!-- Optional confirmation dialog text for long press -->
 		<attr name="longPressConfirmText" format="string|reference"/>
+		<!-- Optional confirmation dialog OK button label for long press -->
+		<attr name="longConfirmButton" format="string"/>
 		
 		<!-- Delay for sending message in ms -->
 		<attr name="clickDelay" format="integer"/>
 		
-		<attr name="disableForStateBusId" format="reference"/><!-- See BusDisabledForStateBehavior -->
+		<attr name="disableForStateBusId" format="reference"><!-- See BusDisabledForStateBehavior -->
+			<enum name="parent" value="0"/>
+		</attr>
 		<attr name="firstPressToast" format="string|reference"/><!-- If set, toast msg will be shown for first ever press on this button. Preference is stored based on view id -->
 	</declare-styleable>
 	
@@ -316,7 +329,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<attr name="android:drawable"/>
 	</declare-styleable>
 	
-	<!-- SelectablePopupButtonLayout attributes which define list selection workflow -->  
 	<declare-styleable name="BusSelectablePopupButtonLayout">
 		<!-- State bus to listen/query to -->
 		<attr name="stateBusId" format="reference"/>
@@ -353,8 +365,28 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<attr name="clickBusId" format="reference"/>
 		<!-- Msg id to send message on button click when clickOnClick=true. Arg1 matches buttonArg1 set via buttonsArg1  -->
 		<attr name="clickMsgId" format="reference"/>
+
+		<!-- If false (default) each button is a PopupButton view, if true, each button is a DynamicPopupButton (a layout).
+		     buttonStyle then may reference the style for a DynamicPopupButton (layout), which in turns
+		     creates icon (dynamicIconStyle) + label (dynamicLabelStyle) inside -->
+		<attr name="dynamicButtons" format="boolean"/>
+
+		<!-- Optional secondary button labels for the dynamic buttons - string @array -->
+		<attr name="buttonsLabels2" format="reference"/>
 	</declare-styleable>
-		
+
+	<declare-styleable name="DynamicPopupButton">
+		<!-- These should be defined either globally or within appropriate buttonStyle -->
+		<attr name="dynamicIconStyle" format="reference"/>
+		<attr name="dynamicIconStyle_scene_menu" format="reference"/>
+		<attr name="dynamicLabelStyle" format="reference"/>
+		<attr name="dynamicLabelStyle_scene_menu" format="reference"/>
+		<!-- NOTE: this should be set for label 2 to be activated -->
+		<attr name="dynamicLabel2Style" format="reference"/>
+		<attr name="dynamicLabel2Style_scene_menu" format="reference"/>
+	</declare-styleable>
+
+
 	<!-- Behavior (pseudo-view-tag which attaches to some real view and modifies its behavior in some way) which selectes child view based on Poweramp state/msg bus -->
 	<declare-styleable name="BusSelectableBehavior">
 		<!-- State bus to listen/query to -->
@@ -539,6 +571,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<!-- If true, inner scrolling will be activated for popup -->
 		<attr name="innerScrolling" format="boolean"/>
 
+		<!-- If set, forces popup expansion direction (somewhat inverse of the gravity):
+		     - top - expand to top
+		     - right - expand to right
+		     - etc.
+		     This makes sense only if popup size is appropriately defined -->
+		<attr name="popupExpandDirection">
+			<flag name="none" value="0x0"/>
+			<flag name="top" value="0x30" />
+			<flag name="bottom" value="0x50" />
+			<flag name="left" value="0x03" />
+			<flag name="right" value="0x05" />
+		</attr>
+
 		<attr name="popupEnterAnimTime"/><!-- ms -->
 		<attr name="popupExitAnimTime"/><!-- ms -->
 		<attr name="menuPlaceholder"/>
@@ -551,6 +596,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		     completely from current parent while in popup mode. Alternatively use private scene layout, or set this to false and not rely on this view layout --> 
 		<attr name="disableParentLayoutForPopup" format="boolean"/>
 
+		<!-- If true, intermediate temporary stub view is created and attached in place of PopupLayout button when it's
+		     in popup state. This allows the parent layout handle any changes properly while PopupLayout is detached from
+		     the parent while in popup state.
+		     This is needed when we need relayouts in the app while popup is active, such as for some actions pressed in
+		     the popup, while popup stays.
+		     WARNING: this is dangereous attribute due to the stub view reusing the popup view id, while being
+		     a completely different type of view, so any logic touching the popup view, esp. by id should be aware
+		     of this attribute being used -->
+		<attr name="keepLayoutForPopup" format="boolean"/>
+
 		<attr name="maxOvershoot"/>
 		<attr name="maxStretchOvershoot"/>
 	</declare-styleable>
@@ -578,7 +633,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<attr name="buttonStyle" format="reference"/>
 		<!-- Button style (e.g. ?PopupButton_scene_button_menu) while in popup menu state -->
 		<attr name="menuButtonStyle" format="reference"/>
-		
+
 		<!-- Default is true -->
 		<attr name="closeOnClickInside"/>
 		
diff --git a/poweramp_skin_sdk/reference_resources/values/attrs-settings.xml b/poweramp_skin_sdk/reference_resources/values/attrs-settings.xml
index 308c4c8e..7f8b3108 100644
--- a/poweramp_skin_sdk/reference_resources/values/attrs-settings.xml
+++ b/poweramp_skin_sdk/reference_resources/values/attrs-settings.xml
@@ -279,6 +279,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<attr name="entries"/>
 		<attr name="values"/>
 		<attr name="summaries"/>
+		<attr name="icons" format="reference"/>
 		<attr name="disableDependenciesValue"/>
 	</declare-styleable>
 		
diff --git a/poweramp_skin_sdk/reference_resources/values/attrs-styles-powerui.xml b/poweramp_skin_sdk/reference_resources/values/attrs-styles-powerui.xml
index a2fd9280..33db7c84 100644
--- a/poweramp_skin_sdk/reference_resources/values/attrs-styles-powerui.xml
+++ b/poweramp_skin_sdk/reference_resources/values/attrs-styles-powerui.xml
@@ -325,7 +325,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<attr name="ItemPopupListMicroIconSpace" format="reference"/>
 		<attr name="ItemPopupListFrs" format="reference"/>
 		<attr name="ItemEqPreset" format="reference"/>
+		<attr name="ItemEqPresetLock" format="reference"/>
 		<attr name="ItemEqPresetSelectBox" format="reference"/>
+		<attr name="ItemEqPresetTitle" format="reference"/>
+		<attr name="ItemEqPresetTitle_2line" format="reference"/>
+		<attr name="ItemEqPresetLine2_2line" format="reference"/>
+		<attr name="ItemEqPresetLine2_3line" format="reference"/>
 		<attr name="ItemPopupSimpleTitle" format="reference"/>
 		<attr name="ItemPopupSimpleTitle_Text" format="reference"/>
 		<attr name="ItemPopupSimpleLine2" format="reference"/>
@@ -492,6 +497,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<attr name="TopListSearchEditText" format="reference"/>
 		<attr name="TopSearchTarget" format="reference"/>
 		<attr name="TopSearchTarget_Text" format="reference"/>
+
+		<attr name="SmallerSearchEditText_Text" format="reference"/>
 		
 		<attr name="TopNavbarBounds" format="reference"/>		
 		<attr name="TopNavbarContainer" format="reference"/>
@@ -631,8 +638,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<attr name="EqEquPresetButtonLayout_scene_button_menu" format="reference"/>
 		<attr name="EqEquPresetLabel" format="reference"/>
 		<attr name="EqEquPresetLabel_Text" format="reference"/>
+		<!-- @Deprecated -->
 		<attr name="EqEquSaveButton" format="reference"/>
+		<!-- @Deprecated -->
 		<attr name="EqEquResetButton" format="reference"/>
+		<attr name="EqMenu" format="reference"/>
+		<attr name="EqMenu_scene_item_menu" format="reference"/>
+		<attr name="EqMenuIcon" format="reference"/>
+		<attr name="EqMenuLayoutItems" format="reference"/>
 		<attr name="EqTonePanel" format="reference"/>
 		<attr name="EqBassToneKnobLayout" format="reference"/>
 		<attr name="EqTrebleToneKnobLayout" format="reference"/>
@@ -677,6 +690,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<attr name="EqParamColorPopupLayout_scene_item_menu" format="reference"/>
 		<attr name="EqParamColorPopupIcon" format="reference"/>
 		<attr name="EqParamEditButton" format="reference"/>
+		<attr name="EqParamLockButton" format="reference"/>
 		<attr name="EqParamLRPopupButtonLayout" format="reference"/>
 		<attr name="EqParamTypePopupButtonLayout" format="reference"/>
 		<attr name="EqParamQRoundKnob" format="reference"/>
@@ -689,6 +703,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		
 		<attr name="EqPresetDeviceAssignIcon" format="reference"/>
 		<attr name="EqPresetDeviceAssignCheckbox" format="reference"/>
+
 		<!--<attr name="" format="reference"/>
 		<attr name="" format="reference"/>
 		<attr name="" format="reference"/>
diff --git a/poweramp_skin_sdk/reference_resources/values/attrs-theme.xml b/poweramp_skin_sdk/reference_resources/values/attrs-theme.xml
index 285c00f9..192b3603 100644
--- a/poweramp_skin_sdk/reference_resources/values/attrs-theme.xml
+++ b/poweramp_skin_sdk/reference_resources/values/attrs-theme.xml
@@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<attr name="colorBgPrimaryAlpha" format="color"/>
 	<!-- A bit more pronounced alpha-faded primary background color -->
 	<attr name="colorBgLessAlpha" format="color"/>
+	<!-- This is expected to be strictly the colorBgPrimary color with a slight alpha -->
+	<attr name="colorBgPrimaryStrictAlpha" format="color"/>
 	<!-- Foreground color for inverted color controls -->
 	<attr name="colorInverse" format="color"/>
 	<!-- Inverse background color, e.g. black for Light theme -->
@@ -42,6 +44,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<attr name="colorStrokeHelp" format="color"/>
 	<!-- Tint/foreground color for a bit less contrast icons/buttons -->
 	<attr name="colorLessContrast" format="color"/>
+	<!-- Color used for the ripple on main playback buttons (v31+), since 964. Needed as ripple is rendered differently on v33 -->
+	<attr name="colorPlaybackRipple" format="color"/>
 	<!-- Shade colors for popup menus -->
 	<attr name="colorShade" format="color"/>
 	<!-- E.g. menu separator -->
@@ -50,6 +54,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<attr name="colorSeparatorLight" format="color"/>
 	<!-- Non-contrast bg. Used ATM for Search Frame bg -->
 	<attr name="colorBgLight" format="color"/>
+	<!-- Bg used for the checkable buttons in popups - should have some contrast over the popup bg color -->
+	<attr name="colorBgCheckedLight" format="color"/>
 	<!-- Semi-transparent background for text labels -->
 	<attr name="colorTextBgAlpha" format="color"/>
 
@@ -67,8 +73,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<attr name="colorIconDisabled" format="color"/>
 	<!-- Not used ATM -->
 	<attr name="colorItemActive" format="color"/>
-	<!-- Used for text disabled color in very few places where text is rendered by the view, e.g. in LinearKnob -->
+	<!-- Used for text disabled color in very few places where text is rendered by the view, e.g. in LinearKnob
+		 Should be visible/readable enough as this is also locked state where user should be able to read the text -->
 	<attr name="colorTextDisabled" format="color"/>
+	<!-- Same as colorTextDisabled, little less visible, but still readable -->
+	<attr name="colorTextDisabledSecondary" format="color"/>
+
 
 	<!-- Shade under status bar -->
 	<attr name="statusBarBg" format="color|reference"/>
diff --git a/poweramp_skin_sdk/reference_resources/values/attrs.xml b/poweramp_skin_sdk/reference_resources/values/attrs.xml
index c9355166..4bd67ce0 100644
--- a/poweramp_skin_sdk/reference_resources/values/attrs.xml
+++ b/poweramp_skin_sdk/reference_resources/values/attrs.xml
@@ -89,6 +89,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<attr name="overlap_knobs_hilite_mono" format="reference"/>
 		<attr name="overlap_knobs_hilite_color" format="reference"/>
 
+		<!-- Colorful gradient (graphic) frequency response curve -->
+		<attr name="overlap_graphic_frs_color" format="reference"/>
+
 		<!-- Extra globalOption attribute to apply when OptionRatingDisabled option is in effect -->
 		<attr name="overlap_OptionRatingDisabled" format="reference"/>
 		<!-- Extra globalOption attribute to apply when OptionRatingStarsMenu option is in effect -->
@@ -98,6 +101,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<!-- Navbar margins moved to theme to allow easy overriding for overlap_navbar_offset option -->
 	<attr name="navbar_marginLR" format="dimension"/>
 	<attr name="navbar_marginB" format="dimension"/>
+	<!-- NOTE: this is not used directly by the navbar as margin, but used for the DynamicDimensions calculation -->
+	<attr name="navbar_marginT" format="dimension"/>
 	<!-- These are theme attribute, usually pointint to some @dimen. Used in DynamicDimensions and allows theme to redefine navbar
 	     related sizes -->
 	<attr name="Navbar_height" format="dimension"/>
@@ -107,6 +112,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<attr name="NavbarSeekbar_height" format="dimension"/>
 	<attr name="NavbarSeekbar_marginBottom" format="dimension"/>
 
+	<declare-styleable name="DynamicDimensions_navbar_bounds_3lines_size">
+		<attr name="navbar_marginB"/>
+		<attr name="navbar_marginT"/>
+		<attr name="Navbar_height"/>
+		<attr name="NavbarList_marginBottom"/>
+		<attr name="NavbarSeekbar_marginTop"/>
+		<attr name="NavbarSeekbar_marginBottom"/>
+		<attr name="NavbarSeekbar_height"/>
+	</declare-styleable>
+
 	<!-- Needed for OptionHideMenu -->
 	<attr name="ItemTrackMenu_scene_aa_visibility">
 		<enum name="visible" value="0" />
diff --git a/poweramp_skin_sdk/reference_resources/values/black-styles.xml b/poweramp_skin_sdk/reference_resources/values/black-styles.xml
index 6cd75798..2bff24cb 100644
--- a/poweramp_skin_sdk/reference_resources/values/black-styles.xml
+++ b/poweramp_skin_sdk/reference_resources/values/black-styles.xml
@@ -31,9 +31,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="android:windowLightNavigationBar" tools:ignore="NewApi">false</item><!-- For 9.0 -->
 		<item name="windowLightNavigationBar">false</item>
 				
-		<!-- NOTE: any alpha value in this color enables transparent android navigation bar and appropriate Poweramp layout changes, i.e. layout spans behind that bar.
-			 Poweramp places id/navigation_bar_bg view under navigation bar, with navigationBarBg drawable, which can be any drawable, not just color.
-			 Use either android:navigationBarColor for just color, or navigationBarBg, but avoid using both to limit overdraw (set other to transparent/#0000)
+		<!-- NOTE: any alpha value in this color enables transparent android navigation bar and appropriate Poweramp layout changes,
+		     i.e. layout spans behind that bar.
+			 Poweramp places id/navigation_bar_bg view under navigation bar, with navigationBarBg drawable, which can be any drawable,
+			 not just color.
+			 Use either android:navigationBarColor for just color, or navigationBarBg, but avoid using both to limit overdraw
+			 (set other to transparent/#0000)
 			 
 			 NOTE: some devices may always ignore these colors (OnePlus - ignores #FF000000, but accepts #FF000001)
 		-->
@@ -62,12 +65,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="colorIconInverseForced">#fff</item>
 		<item name="colorIconDisabled">#7eee</item><!-- NOTE: used only in few places, e.g. vis/repeat/shuffle icons (alt) -->
 		
-		<item name="colorTextDisabled">#282828</item><!-- Used for text disabled color in very few places where text is rendered by the view, e.g. in LinearKnob -->
+		<item name="colorTextDisabled">#5a5a5a</item>
+		<item name="colorTextDisabledSecondary">#555555</item>
 		
 		<item name="colorBgPrimary">#222</item>
 		<item name="colorBgPrimaryAlpha">#4333</item>
 		<item name="colorBgLessAlpha">#d444</item>
-		<item name="colorInverse">#fff</item>
+		<item name="colorBgPrimaryStrictAlpha">#f0222222</item>
+		<item name="colorInverse">#fff</item><!-- REVISIT: use less contrasted color for the ripples? -->
+		<item name="colorPlaybackRipple">#999</item><!-- We change this for Android 13+ -->
 		<item name="colorBgInverse">#000</item>
 		<item name="colorBgInverseChecked">#222</item>
 		<item name="colorStroke">#5f5f5f</item>
@@ -79,6 +85,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		
 		<item name="colorShade">#88000000</item>
 		<item name="colorBgLight">#333</item><!-- Used ATM for the Search Frame bg -->
+		<item name="colorBgCheckedLight">#444</item>
 		<item name="colorItemPlayingMark">#282828</item>
 		
 		<item name="colorAABgColor">#000</item>
@@ -116,8 +123,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		
 		<item name="colorKnobPressed">#fff</item>
 		<item name="colorKnobBg">#222</item>
-		<item name="colorKnobDisabled">#111</item>
-		<item name="colorKnobHoleDisabled">#111</item>
+		<item name="colorKnobDisabled">#7444</item>
+		<item name="colorKnobHoleDisabled">#7444</item>
 		<item name="colorPreampBg">#111</item>
 		
 		<item name="colorTrackMeta">#999</item>
@@ -182,9 +189,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<!-- Skin overlap -->
 		<item name="overlap_more_buttons">@style/ActivityTheme_Blackpro_MoreButtons</item>
 		<item name="overlap_less_rounding">@style/ActivityTheme_Black_LessRounding</item>
-
 		<item name="overlap_alt_layout">@style/ActivityTheme_Black_AltLayout</item>
 		<item name="overlap_alt_layout2">@style/ActivityTheme_Black_AltLayout2</item>
+		<item name="overlap_graphic_frs_color">@style/ActivityTheme_Black_GraphicFrsColorful</item>
 
 		<item name="DialogForceLightSystemUIStyle">@style/ActivityTheme_Black_DialogForceLightSystemUIStyle</item>
 		<item name="DialogForceDarkSystemUIStyle">@style/ActivityTheme_Black_DialogForceDarkSystemUIStyle</item>
@@ -276,6 +283,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 	<!-- An overlay style -->
 	<style name="ActivityTheme_Blackpro_NoMainNavbarBg">
+		<!-- Disable possible extra background applied by system on some devices -->
+		<item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item>
+
 		<item name="Navbar">@style/Navbar_noBgNavbar</item>
 		<item name="Navbar_scene_navbar_1line_sheet">@style/Navbar_scene_navbar_1line_sheet_transparentNavbar</item>
 		<item name="Navbar_scene_navbar_2lines">@style/Navbar_scene_navbar_2lines_transparentNavbar</item>
diff --git a/poweramp_skin_sdk/reference_resources/values/default-styles-alt-font.xml b/poweramp_skin_sdk/reference_resources/values/default-styles-alt-font.xml
index 95ee48ba..4967e51a 100644
--- a/poweramp_skin_sdk/reference_resources/values/default-styles-alt-font.xml
+++ b/poweramp_skin_sdk/reference_resources/values/default-styles-alt-font.xml
@@ -66,6 +66,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="AccentedText">@style/AccentedText_AltFont</item>
 		<item name="Text">@style/Text_AltFont</item><!-- NOTE: used mostly in dialogs -->
 		<item name="LargerText">@style/LargerText_AltFont</item>
+
+		<item name="SmallerSearchEditText_Text">@style/SmallerSearchEditText_Text_AltFont</item>
 				
 		<item name="TopListScrollerView_Text">@style/TopListScrollerView_Text_AltFont</item>
 		<item name="TopTrackElapsedDuration_Text">@style/TopTrackElapsedDuration_Text_AltFont</item>
@@ -157,6 +159,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	</style>
 	<style name="Dialog_textAppearanceSmall_AltFont" parent="TextAppearance.AppCompat.Small"><!-- Plain text views, e.g. used for labels/some messages -->
 	</style>
+
+	<style name="SmallerSearchEditText_Text_AltFont" parent="textAppearanceMediumInverse_AltFont">
+		<item name="android:textSize">@dimen/large0_AltFont_textSize</item>
+	</style>
 	
 	<style name="HeadText_AltFont" parent="HeadText">
 		<item name="android:fontFamily">?AltFont_font</item>
@@ -327,7 +333,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	</style>
 	<style name="ItemPopupListTitleLarger_Text_AltFont" parent="ItemPopupListTitleLarger_Text">
 		<item name="android:fontFamily">?AltFont_font</item>
-		<item name="android:textSize">@dimen/medium2_AltFont_textSize</item>
+		<item name="android:textSize">@dimen/large1_AltFont_textSize</item>
 	</style>
 	<style name="ItemVisTitle_Text_AltFont" parent="ItemGenericTitle_Text">
 		<item name="android:fontFamily">?AltFont_medium_font</item>
@@ -390,12 +396,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		
 	<style name="EqButton_Text_AltFont" parent="EqButton_Text">
 		<item name="android:fontFamily">?AltFont_font</item>
-		<item name="android:textSize">@dimen/moderate2_AltFont_textSize</item>
+		<item name="android:textSize">@dimen/medium2_AltFont_textSize</item>
 		<item name="android:textAllCaps">false</item>
 	</style>
 	<style name="EqEquPresetLabel_Text_AltFont" parent="EqEquPresetLabel_Text">
 		<item name="android:fontFamily">?AltFont_font</item>
-		<item name="android:textSize">@dimen/moderate2_AltFont_textSize</item>
+		<item name="android:textSize">@dimen/medium2_AltFont_textSize</item>
 		<item name="android:textAllCaps">false</item>
 	</style>
 	
diff --git a/poweramp_skin_sdk/reference_resources/values/default-styles-alt2.xml b/poweramp_skin_sdk/reference_resources/values/default-styles-alt2.xml
index 1f08fec2..3fe4872b 100644
--- a/poweramp_skin_sdk/reference_resources/values/default-styles-alt2.xml
+++ b/poweramp_skin_sdk/reference_resources/values/default-styles-alt2.xml
@@ -35,7 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		+==========+ <- bottom of AA                                +
 		...                                                         |
 		title  (lrc) (menu) <- bottom attached to line2             |
-		line2        <- vertically centered                         |-> height == @dimen/Alt_TopAABounds_marginBottom
+		line2        <- vertically centered                         |-> height == @dimen/Alt2_TopAABounds_marginBottom
 		rating       <- top attached to line2                       |
 		...                                                         |
 		~~~~~~~~~~~~ <- bottom of ItemTrack view                    +
@@ -50,7 +50,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		+==========+ <- bottom of AA                                +
 		...                                                         |
 		title        <- bottom attached to 50%                      |
-		                                                            |-> height == @dimen/Alt_TopAABounds_marginBottom
+		                                                            |-> height == @dimen/Alt2_TopAABounds_marginBottom
 		line2 (lrc) (menu) <- top attached to 50%                   |
 		...                                                         |
 		~~~~~~~~~~~~ <- bottom of ItemTrack view                    +
@@ -181,10 +181,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="android:layout_marginBottom">@dimen/Alt2_TopAABounds_marginBottom</item>
 	</style>
 
-	<!-- Remove bottom margin for AA as we want to properly vertically center the title/line2/rating views -->
+	<!-- NOTE: some marginBottom added to compensate SubAA buttons also shifted by 4dp -->
 	<!-- Overridden in land -->
 	<style name="Alt2_ItemTrackAAImage_scene_aa" parent="Alt_ItemTrackAAImage_scene_aa">
-		<item name="android:layout_marginBottom">0dp</item>
+		<item name="android:layout_marginBottom">4dp</item>
 	</style>
 
 	<style name="Alt2_TopWaveseekLayout" parent="Alt_TopWaveseekLayout">
@@ -217,7 +217,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="android:layout_marginLeft">46dp</item>
 		<item name="android:layout_marginRight">46dp</item>
 		<item name="layout_attachBottom">50%</item>
-		<item name="android:layout_marginBottom">0dp</item><!-- Sligtly shift to bottom -->
+		<item name="android:layout_marginBottom">0dp</item>>
 	</style>
 
 	<style name="Alt2_ItemTrackLine2_scene_aa" parent="Base_Alt_ItemTrackLine2_scene_aa">
@@ -239,6 +239,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	</style>
 	<style name="Alt2_OptionRatingDisabled_ItemTrackLine2_scene_aa" parent="Alt2_ItemTrackLine2_scene_aa">
 		<item name="layout_attachTop">50%</item>
+		<item name="layout_attachBottom">parent</item><!-- Avoid rating cycle -->
 		<item name="android:layout_marginTop">1dp</item><!-- Slightly shift to bottom -->
 	</style>
 	<style name="Alt2_TrackLabelsCentered_OptionRatingDisabled_ItemTrackLine2_scene_aa" parent="Alt2_TrackLabelsCentered_ItemTrackLine2_scene_aa">
@@ -311,7 +312,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<!-- Move rating under AA. Just detach it from anything and it will be positioned under AA as AA consumes vertical space -->
 	<!-- NOTE: redefined in land -->
 	<style name="Alt2_ItemLikeUnlikeLayout_scene_aa" parent="Alt_ItemLikeUnlikeLayout_scene_aa">
-		<item name="android:layout_marginTop">1dp</item>
+		<item name="android:layout_marginTop">4dp</item>
 		<item name="android:layout_marginBottom">0dp</item>
 		<item name="layout_attachBottomToBottom">@null</item>
 		<item name="layout_attachBottom">@null</item>
@@ -328,7 +329,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	</style>
 
 	<style name="Alt2_ItemRatingBar_scene_aa" parent="Alt_ItemRatingBar_scene_aa">
-		<item name="android:layout_marginTop">1dp</item>
+		<item name="android:layout_marginTop">4dp</item>
 		<item name="android:layout_marginBottom">0dp</item>
 		<item name="android:layout_marginLeft">?Alt2_ItemRatingBar_scene_aa_marginLeft</item><!-- 14dp -->
 		<item name="layout_attachBottomToBottom">@null</item>
@@ -365,6 +366,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	</style>
 
 	<style name="Alt2_TopSubAAButtons" parent="Alt_TopSubAAButtons">
-		<item name="android:layout_marginTop">0dp</item>
+		<!-- Reserve some space as due to like unlike on top meta info can be moved to close to sub aa buttons.
+		     But this also introduces vertical assemitry, so extra 4dp is also added to line2 -->
+		<item name="android:layout_marginTop">4dp</item>
 	</style>
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values/default-styles-bold-font.xml b/poweramp_skin_sdk/reference_resources/values/default-styles-bold-font.xml
index 35a4745a..768c0cc6 100644
--- a/poweramp_skin_sdk/reference_resources/values/default-styles-bold-font.xml
+++ b/poweramp_skin_sdk/reference_resources/values/default-styles-bold-font.xml
@@ -85,6 +85,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="AccentedText">@style/AccentedText_BoldFont</item>
 		<item name="Text">@style/Text_BoldFont</item><!-- NOTE: used mostly in dialogs -->
 		<item name="LargerText">@style/LargerText_BoldFont</item>
+
+		<item name="SmallerSearchEditText_Text">@style/SmallerSearchEditText_Text_BoldFont</item>
 				
 		<item name="TopListScrollerView_Text">@style/TopListScrollerView_Text_BoldFont</item>
 		<item name="TopTrackElapsedDuration_Text">@style/TopTrackElapsedDuration_Text_BoldFont</item>
@@ -178,6 +180,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<style name="Dialog_textAppearanceSmall_BoldFont" parent="TextAppearance.AppCompat.Small"><!-- Plain text views, e.g. used for labels/some messages -->
 		<item name="android:fontFamily">?BoldFont_medium_font</item>
 	</style>
+
+	<style name="SmallerSearchEditText_Text_BoldFont" parent="textAppearanceMediumInverse_BoldFont">
+		<item name="android:textSize">@dimen/large2_AltFont_textSize</item>
+	</style>
 	
 	<style name="HeadText_BoldFont" parent="HeadText">
 		<item name="android:fontFamily">?BoldFont_font</item>
@@ -208,7 +214,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	</style>
 	<style name="TopSearchTarget_Text_BoldFont" parent="TopSearchTarget_Text">
 		<item name="android:fontFamily">?BoldFont_font</item>
-		<item name="android:textSize">@dimen/moderate1_AltFont_textSize</item>
+		<item name="android:textSize">@dimen/moderate3_AltFont_textSize</item>
 	</style>
 	<style name="TopListIndexerPopupView_Text_BoldFont" parent="TopListIndexerPopupView_Text">
 		<!-- Keep default dp size as this is not strictly a text, but a popup glyph -->
@@ -363,7 +369,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	</style>
 	<style name="ItemPopupListTitleLarger_Text_BoldFont" parent="ItemPopupListTitleLarger_Text">
 		<item name="android:fontFamily">?BoldFont_font</item>
-		<item name="android:textSize">@dimen/medium2_AltFont_textSize</item>
+		<item name="android:textSize">@dimen/large1_AltFont_textSize</item>
 	</style>
 	<style name="ItemVisTitle_Text_BoldFont" parent="ItemGenericTitle_Text">
 		<item name="android:fontFamily">?BoldFont_medium_font</item>
@@ -425,12 +431,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		
 	<style name="EqButton_Text_BoldFont" parent="EqButton_Text">
 		<item name="android:fontFamily">?BoldFont_font</item>
-		<item name="android:textSize">@dimen/moderate2_AltFont_textSize</item>
+		<item name="android:textSize">@dimen/medium1_AltFont_textSize</item>
 		<item name="android:textAllCaps">false</item>
 	</style>
 	<style name="EqEquPresetLabel_Text_BoldFont" parent="EqEquPresetLabel_Text">
 		<item name="android:fontFamily">?BoldFont_font</item>
-		<item name="android:textSize">@dimen/moderate2_AltFont_textSize</item>
+		<item name="android:textSize">@dimen/medium1_AltFont_textSize</item>
 		<item name="android:textAllCaps">false</item>
 	</style>
 	
diff --git a/poweramp_skin_sdk/reference_resources/values/default-styles-dialogs.xml b/poweramp_skin_sdk/reference_resources/values/default-styles-dialogs.xml
index b68d1ec5..f4cf6396 100644
--- a/poweramp_skin_sdk/reference_resources/values/default-styles-dialogs.xml
+++ b/poweramp_skin_sdk/reference_resources/values/default-styles-dialogs.xml
@@ -157,11 +157,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	
 	<style name="dialog_EqPresetsActivity" parent="CenteredDialog">
 		<item name="dialogContentLayout">@layout/dialog_content_eq_presets</item>
+		<item name="DialogFrame">@style/CenteredDialogFrame_EqPresetsActivity</item>
+		<item name="DialogFrame_scene_dialog_in">@style/CenteredDialogFrame_EqPresetsActivity_scene_dialog_in</item>
 		<item name="DialogContent">@style/CenteredDialogContentNoPadding</item>
 		<item name="DialogButtonBar">@style/DialogButtonBarHidden</item>
 		<item name="DialogTitleLayout">@style/DialogTitleLayoutHidden</item>
 	</style>
-
+	
 	<!-- NOTE: overridden in v29 -->
 	<style name="dialog_MusicFoldersActivity" parent="CenteredDialog">
 		<item name="dialogContentLayout">@layout/dialog_content_music_folders</item>
diff --git a/poweramp_skin_sdk/reference_resources/values/default-styles-system-font.xml b/poweramp_skin_sdk/reference_resources/values/default-styles-system-font.xml
new file mode 100644
index 00000000..cd07ed25
--- /dev/null
+++ b/poweramp_skin_sdk/reference_resources/values/default-styles-system-font.xml
@@ -0,0 +1,354 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) 2010-2023 Maksim Petrov
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted for themes, skins, widgets, plugins, applications and other software
+which communicate with Poweramp music player or Poweramp Equalizer applications on Android platform.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<!-- dp => sp 0.897 -->
+<!-- values -->
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+	<!--  -->
+	<!-- An overlap style
+		 NOTE: we have almost all text styles listed here, but we actually override only few of them, others are just left as-is:
+		 - titles/headers/buttons/items are set to alt font
+		 - other text styles use default font, but set to use scalable sp instead of dp (if not already using sp)  
+		
+		NOTE: don't override textColor here for item texts.
+		Text colors for text-color animated texts (like title/line2/meta etc. in items) are set on view level due to scene animations and ignored if overridden here -->
+	
+	<style name="ActivityTheme_SystemFont">
+		<item name="humanGridItemExtraSpace">18sp</item><!-- 4x, 3x grids. Overridden for alt/bold fonts -->
+		<item name="humanGridZoomedItemExtraSpace">24sp</item><!-- 2x grids. Overridden for alt/bold fonts -->
+
+		<!-- Also modify item scale a bit in some scenes -->
+		<item name="ItemTrackTitle_scene_grid_scale">.65</item>
+		<item name="ItemTrackTitle_scene_grid_zoomed_scale">.9</item>
+		<item name="ItemTrackTitle_scene_grid_1_alt_zoomed_scale">.75</item>
+		<item name="ItemTrackTitle_scene_item_menu_scale">.9</item>
+
+		<item name="ItemTrackLine2_scene_grid_scale">.65</item>
+		<item name="ItemTrackLine2_scene_grid_zoomed_scale">.9</item>
+		<item name="ItemTrackLine2_scene_item_menu_scale">.9</item>
+
+		<item name="ItemTrackTitle_scene_header_scale">.9</item>
+		<item name="ItemTrackLine2_scene_header_scale">.9</item>
+		<item name="ItemTrackMeta_scene_header_w_meta_base_scale">.9</item>
+
+		<item name="android:textAppearance">@style/textAppearance_SystemFont</item>
+		<item name="android:textAppearanceButton">@style/textAppearanceButton_SystemFont</item><!-- Apply font for few buttons which use textAppearanceButton, e.g. dialog buttons -->
+		<item name="android:textAppearanceMediumInverse">@style/textAppearanceMediumInverse_SystemFont</item><!-- Used by e.g. TopListSearchEditText and other possible EditTexts -->
+		<item name="android:textAppearanceMedium">@style/textAppearanceMedium_SystemFont</item><!-- Radio buttons in alert dialog -->
+		<item name="android:textAppearanceLargePopupMenu">@style/textAppearanceLargePopupMenu_SystemFont</item><!-- Used by some popups, like Eq Preset autocomplete --> 
+		<item name="Dialog_textAppearance">@style/Dialog_textAppearance_SystemFont</item>
+		<item name="Dialog_textAppearanceSmall">@style/Dialog_textAppearanceSmall_SystemFont</item><!-- Used by alert dialog messages -->
+		<item name="HeadText">@style/HeadText_SystemFont</item>
+		<item name="SubheadText">@style/SubheadText_SystemFont</item>
+		<item name="Hint">@style/Hint_SystemFont</item>
+		<item name="AccentedText">@style/AccentedText_SystemFont</item>
+		<item name="Text">@style/Text_SystemFont</item><!-- NOTE: used mostly in dialogs -->
+		<item name="LargerText">@style/LargerText_SystemFont</item>
+
+		<item name="SmallerSearchEditText_Text">@style/SmallerSearchEditText_Text_SystemFont</item>
+				
+		<item name="TopListScrollerView_Text">@style/TopListScrollerView_Text_SystemFont</item>
+		<item name="TopTrackElapsedDuration_Text">@style/TopTrackElapsedDuration_Text_SystemFont</item>
+		<item name="TopSearchTarget_Text">@style/TopSearchTarget_Text_SystemFont</item>
+		<item name="TopListIndexerPopupView_Text">@style/TopListIndexerPopupView_Text_SystemFont</item>
+		<item name="TopToastTitle_Text">@style/TopToastTitle_Text_SystemFont</item>
+		<item name="TopToastLine2_Text">@style/TopToastLine2_Text_SystemFont</item>
+		<item name="TopCounterLayout_Text">@style/TopCounterLayout_Text_SystemFont</item>
+		<item name="TopMetaInfoLabel_Text">@style/TopMetaInfoLabel_Text_SystemFont</item>
+		
+		<item name="TopHelp_Text">@style/TopHelp_Text_SystemFont</item>
+		<item name="TopHelpNormal_Text">@style/TopHelpNormal_Text_SystemFont</item>
+		<item name="TopHelpSmaller_Text">@style/TopHelpSmaller_Text_SystemFont</item>
+		<item name="TopHelpButton_Text">@style/TopHelpButton_Text_SystemFont</item>
+
+		<item name="NavbarExtensionLogoLabel_Text">@style/NavbarExtensionLogoLabel_Text_SystemFont</item>
+		<item name="NavbarExtensionMenuLine_Text">@style/NavbarExtensionMenuLine_Text_SystemFont</item>
+		<item name="PopupButton_Text">@style/PopupButton_Text_SystemFont</item>
+
+		<item name="DialogTitle_Text">@style/DialogTitle_Text_SystemFont</item>
+		<item name="DialogToastLine1_Text">@style/DialogToastLine1_Text_SystemFont</item>
+		<item name="DialogToastLine2_Text">@style/DialogToastLine2_Text_SystemFont</item>
+		<item name="DialogToastLineOnly1_Text">@style/DialogToastLineOnly1_Text_SystemFont</item>
+		
+		<item name="ItemTrackCatImage_Text">@style/ItemTrackCatImage_Text_SystemFont</item>
+		<item name="ItemTrackNum_Text">@style/ItemTrackNum_Text_SystemFont</item>
+		<item name="ItemTrackTitle_Text">@style/ItemTrackTitle_Text_SystemFont</item>
+		<item name="ItemTrackLine2_Text">@style/ItemTrackLine2_Text_SystemFont</item>
+		<item name="ItemTrackMeta_Text">@style/ItemTrackMeta_Text_SystemFont</item>
+		<item name="ItemAALEDecorText_Text">@style/ItemAALEDecorText_Text_SystemFont</item>
+		<item name="ItemMiniplayerPrevNextDecorText_Text">@style/ItemMiniplayerPrevNextDecorText_Text_SystemFont</item>
+		<item name="ItemGenericTitle_Text">@style/ItemGenericTitle_Text_SystemFont</item>
+		<item name="ItemGenericLine2_Text">@style/ItemGenericLine2_Text_SystemFont</item>
+		<item name="SeparatorWithButton_Text">@style/SeparatorWithButton_Text_SystemFont</item>
+		<item name="BlackButton_Text">@style/BlackButton_Text_SystemFont</item>
+		<item name="WhiteButton_Text">@style/WhiteButton_Text_SystemFont</item>
+		<item name="WhiteStrokedListHeaderButton_Text">@style/WhiteStrokedListHeaderButton_Text_SystemFont</item>
+		<item name="ItemTextTitle_Text">@style/ItemTextTitle_Text_SystemFont</item>
+		<item name="ItemTextLine2_Text">@style/ItemTextLine2_Text_SystemFont</item>
+		<item name="ItemEmptyListText_Text">@style/ItemEmptyListText_Text_SystemFont</item>
+		<item name="ItemMiniplayerTitle_Text">@style/ItemMiniplayerTitle_Text_SystemFont</item>
+		<item name="ItemMiniplayerLine2_Text">@style/ItemMiniplayerLine2_Text_SystemFont</item>
+		<item name="ItemPopupSimpleTitle_Text">@style/ItemPopupSimpleTitle_Text_SystemFont</item>
+		<item name="ItemPopupSimpleLine2_Text">@style/ItemPopupSimpleLine2_Text_SystemFont</item>
+		<item name="ItemPopupListTitle_Text">@style/ItemPopupListTitle_Text_SystemFont</item>
+		<item name="ItemPopupListTitleLarger_Text">@style/ItemPopupListTitleLarger_Text_SystemFont</item>
+		<item name="ItemVisTitle_Text">@style/ItemVisTitle_Text_SystemFont</item>
+		<item name="ItemVisLine2_Text">@style/ItemVisLine2_Text_SystemFont</item>
+
+		<item name="ItemLyricsTitle_Text">@style/ItemLyricsTitle_Text_SystemFont</item>
+		
+		<item name="PopupMenuItem_Text">@style/PopupMenuItem_Text_SystemFont</item>
+		<item name="PopupInfoTextTitle_Text">@style/PopupInfoTextTitle_Text_SystemFont</item>
+		
+		<item name="SelectionListContextButton_Text">@style/SelectionListContextButton_Text_SystemFont</item>
+		<item name="SelectionMenu_Text">@style/SelectionMenu_Text_SystemFont</item>
+		<item name="SleepTimerTitle_Text">@style/SleepTimerTitle_Text_SystemFont</item>
+		<item name="SleepTimerValue_Text">@style/SleepTimerValue_Text_SystemFont</item>		
+		
+		<item name="EqLinearKnob_Text">@style/EqLinearKnob_Text_SystemFont</item>
+		<item name="EqKnobLabel_Text">@style/EqKnobLabel_Text_SystemFont</item>
+		<item name="EqKnobValue_Text">@style/EqKnobValue_Text_SystemFont</item>
+		<item name="EqKnobValueLarger_Text">@style/EqKnobValueLarger_Text_SystemFont</item>
+		<item name="EqButton_Text">@style/EqButton_Text_SystemFont</item>
+		<item name="EqEquPresetLabel_Text">@style/EqEquPresetLabel_Text_SystemFont</item>
+		<item name="PeqEqEnableVisFrs_Text">@style/PeqEqEnableVisFrs_Text_SystemFont</item>
+	</style>
+	
+	<!-- NOTE: this sets font for quite specific cases, like Checkboxes (in SleepTimer dialog) -->
+	<style name="textAppearance_SystemFont" parent="TextAppearance.AppCompat">
+		<item name="android:textSize">@dimen/moderate2_AltFont_textSize</item>
+	</style>
+	<style name="textAppearanceButton_SystemFont" parent="TextAppearance.AppCompat.Widget.Button">
+		<item name="android:textSize">@dimen/textAppearanceButton_AltFont_size</item><!-- NOTE: increased as no caps -->
+		<item name="android:textAllCaps">false</item>
+	</style>
+	<style name="textAppearanceMediumInverse_SystemFont" parent="TextAppearance.AppCompat.Medium.Inverse">
+	</style>
+	<style name="textAppearanceMedium_SystemFont" parent="TextAppearance.AppCompat.Medium">
+	</style>
+	<style name="textAppearanceLargePopupMenu_SystemFont" parent="TextAppearance.AppCompat.Widget.PopupMenu.Large">
+	</style>
+	<style name="Dialog_textAppearance_SystemFont" parent="TextAppearance.AppCompat">
+	</style>
+	<style name="Dialog_textAppearanceSmall_SystemFont" parent="TextAppearance.AppCompat.Small"><!-- Plain text views, e.g. used for labels/some messages -->
+	</style>
+
+	<style name="SmallerSearchEditText_Text_SystemFont" parent="textAppearanceMediumInverse_SystemFont">
+		<item name="android:textSize">@dimen/large2_AltFont_textSize</item>
+	</style>
+	
+	<style name="HeadText_SystemFont" parent="HeadText">
+		<item name="android:textSize">@dimen/HeadText_AltFont_size</item>
+	</style>
+	<style name="SubheadText_SystemFont" parent="SubheadText">
+	</style>
+	<style name="Hint_SystemFont" parent="Hint">
+	</style>
+	<style name="AccentedText_SystemFont" parent="AccentedText">
+	</style>
+	<style name="Text_SystemFont" parent="Text">
+	</style>
+	<style name="LargerText_SystemFont" parent="LargerText">
+	</style>
+		
+	<style name="TopListScrollerView_Text_SystemFont" parent="TopListScrollerView_Text">
+	</style>
+	<style name="TopTrackElapsedDuration_Text_SystemFont" parent="TopTrackElapsedDuration_Text">
+		<item name="android:textSize">@dimen/TopTrackElapsedDuration_Text_AltFont_size</item>
+	</style>
+	<style name="TopSearchTarget_Text_SystemFont" parent="TopSearchTarget_Text">
+		<item name="android:textSize">@dimen/moderate3_AltFont_textSize</item>
+	</style>
+	<style name="TopListIndexerPopupView_Text_SystemFont" parent="TopListIndexerPopupView_Text">
+	</style>
+	<style name="TopToastTitle_Text_SystemFont" parent="TopToastTitle_Text">
+	</style>
+	<style name="TopToastLine2_Text_SystemFont" parent="TopToastLine2_Text">
+	</style>
+	<style name="TopCounterLayout_Text_SystemFont" parent="TopCounterLayout_Text">
+		<item name="android:textSize">@dimen/TopMetaInfoLabel_AltFont_textSize</item>
+	</style>
+	<style name="TopMetaInfoLabel_Text_SystemFont" parent="TopMetaInfoLabel_Text">
+	</style>
+
+	<style name="TopHelp_Text_SystemFont" parent="TopHelp_Text">
+	</style>
+	<style name="TopHelpNormal_Text_SystemFont" parent="TopHelp_Text">
+	</style>
+	<style name="TopHelpSmaller_Text_SystemFont" parent="TopHelpSmaller_Text">
+		<item name="android:textSize">@dimen/TopHelpSmaller_AltFont_textSize</item>
+	</style>
+	<style name="TopHelpButton_Text_SystemFont" parent="TopHelpButton_Text">
+	</style>
+	
+	<style name="NavbarExtensionLogoLabel_Text_SystemFont" parent="NavbarExtensionLogoLabel_Text">
+		<item name="android:textStyle">normal</item>
+		<item name="android:textSize">@dimen/moderate0_AltFont_textSize</item>
+	</style>
+	
+	<style name="NavbarExtensionMenuLine_Text_SystemFont" parent="NavbarExtensionMenuLine_Text">
+	</style>
+	<style name="PopupButton_Text_SystemFont" parent="PopupButton_Text">
+		<item name="android:textSize">@dimen/medium4_AltFont_textSize</item>
+	</style>
+		
+	<style name="DialogTitle_Text_SystemFont" parent="DialogTitle_Text">
+		<item name="android:textSize">@dimen/large1_AltFont_textSize</item>
+	</style>
+	<style name="DialogToastLine1_Text_SystemFont" parent="DialogToastLine1_Text"><!-- Bold -->
+		<item name="android:textSize">@dimen/medium2_AltFont_textSize</item>
+	</style>
+	<style name="DialogToastLine2_Text_SystemFont" parent="DialogToastLine2_Text">
+		<item name="android:textSize">@dimen/moderate1_AltFont_textSize</item>
+	</style>
+	<style name="DialogToastLineOnly1_Text_SystemFont" parent="DialogToastLineOnly1_Text">
+		<item name="android:textSize">@dimen/medium4_AltFont_textSize</item>
+	</style>
+	
+	<style name="ItemTrackCatImage_Text_SystemFont" parent="ItemTrackCatImage_Text">
+		<item name="android:textSize">@dimen/ItemTrackCatImage_Text_AltFont_size</item>
+	</style>
+	<style name="ItemTrackNum_Text_SystemFont" parent="ItemTrackNum_Text">
+		<item name="android:textSize">@dimen/medium3_AltFont_textSize</item>
+	</style>
+	<style name="ItemTrackTitle_Text_SystemFont" parent="ItemTrackTitle_Text"><!-- NOTE: style=bold -->
+		<item name="android:textSize">@dimen/large4_AltFont_textSize</item>
+	</style>
+	<style name="ItemTrackLine2_Text_SystemFont" parent="ItemTrackLine2_Text"><!-- NOTE: style=normal -->
+		<item name="android:textSize">@dimen/medium2_AltFont_textSize</item>
+	</style>
+	<style name="ItemTrackMeta_Text_SystemFont" parent="ItemTrackMeta_Text">
+		<item name="android:textSize">@dimen/moderate1_AltFont_textSize</item>
+	</style>
+	<style name="ItemAALEDecorText_Text_SystemFont" parent="ItemAALEDecorText_Text">
+		<item name="android:textSize">@dimen/moderate2_AltFont_textSize</item>
+	</style>
+	<style name="ItemMiniplayerPrevNextDecorText_Text_SystemFont" parent="ItemMiniplayerPrevNextDecorText_Text">
+		<item name="android:textSize">@dimen/small3_AltFont_textSize</item>
+	</style>
+	<style name="ItemGenericTitle_Text_SystemFont" parent="ItemGenericTitle_Text">
+		<item name="android:textSize">@dimen/moderate1_AltFont_textSize</item>
+	</style>
+	<style name="ItemGenericLine2_Text_SystemFont" parent="ItemGenericLine2_Text">
+		<item name="android:textSize">@dimen/small4_AltFont_textSize</item>
+	</style>
+	<style name="SeparatorWithButton_Text_SystemFont" parent="SeparatorWithButton_Text">
+		<item name="android:textSize">@dimen/moderate0_AltFont_textSize</item>
+		<item name="android:textAllCaps">false</item>
+	</style>
+	<style name="BlackButton_Text_SystemFont" parent="BlackButton_Text">
+		<item name="android:textSize">@dimen/medium2_AltFont_textSize</item>
+		<item name="android:textAllCaps">false</item>
+	</style>
+	<style name="WhiteButton_Text_SystemFont" parent="WhiteButton_Text">
+		<item name="android:textSize">@dimen/medium2_AltFont_textSize</item>
+		<item name="android:textAllCaps">false</item>
+	</style>
+	<style name="WhiteStrokedListHeaderButton_Text_SystemFont" parent="WhiteStrokedListHeaderButton_Text">
+		<item name="android:textSize">@dimen/medium2_AltFont_textSize</item>
+		<item name="android:textAllCaps">false</item><!-- NOTE: increased as no caps -->
+	</style>
+	<style name="ItemTextTitle_Text_SystemFont" parent="ItemTextTitle_Text">
+		<item name="android:textSize">@dimen/large4_AltFont_textSize</item>
+	</style>
+	<style name="ItemTextLine2_Text_SystemFont" parent="ItemTextLine2_Text">
+		<item name="android:textSize">@dimen/small3_AltFont_textSize</item>
+	</style>
+	<style name="ItemEmptyListText_Text_SystemFont" parent="ItemEmptyListText_Text">
+	</style>
+	<style name="ItemMiniplayerTitle_Text_SystemFont" parent="ItemGenericTitle_Text">
+		<item name="android:textSize">@dimen/moderate3_AltFont_textSize</item>
+	</style>
+	<style name="ItemMiniplayerLine2_Text_SystemFont" parent="ItemGenericLine2_Text">
+		<item name="android:textSize">@dimen/small3_AltFont_textSize</item>
+	</style>
+	<style name="ItemPopupSimpleTitle_Text_SystemFont" parent="ItemPopupSimpleTitle_Text">
+		<item name="android:textSize">@dimen/medium2_AltFont_textSize</item>
+	</style>
+	<style name="ItemPopupSimpleLine2_Text_SystemFont" parent="ItemPopupSimpleLine2_Text">
+		<item name="android:textSize">@dimen/small4_AltFont_textSize</item>
+	</style>
+	<style name="ItemPopupListTitle_Text_SystemFont" parent="ItemGenericTitle_Text">
+		<item name="android:textSize">@dimen/moderate1_AltFont_textSize</item>
+	</style>
+	<style name="ItemPopupListTitleLarger_Text_SystemFont" parent="ItemPopupListTitleLarger_Text">
+		<item name="android:textSize">@dimen/large1_AltFont_textSize</item>
+	</style>
+	<style name="ItemVisTitle_Text_SystemFont" parent="ItemGenericTitle_Text">
+		<item name="android:textSize">@dimen/moderate1_AltFont_textSize</item>
+	</style>
+	<style name="ItemVisLine2_Text_SystemFont" parent="ItemGenericLine2_Text">
+		<item name="android:textSize">@dimen/small4_AltFont_textSize</item>
+	</style>
+
+	<style name="ItemLyricsTitle_Text_SystemFont" parent="ItemLyricsTitle_Text">
+	</style>
+
+	<style name="PopupMenuItem_Text_SystemFont" parent="PopupMenuItem_Text">
+		<item name="android:textSize">@dimen/medium4_AltFont_textSize</item>
+	</style>
+	<style name="PopupInfoTextTitle_Text_SystemFont" parent="PopupInfoTextTitle_Text">
+		<item name="android:textSize">@dimen/large2_AltFont_textSize</item>
+	</style>
+	
+	<style name="SelectionListContextButton_Text_SystemFont" parent="SelectionListContextButton_Text">
+		<item name="android:textSize">@dimen/moderate0_AltFont_textSize</item>
+	</style>
+	<style name="SelectionMenu_Text_SystemFont" parent="SelectionMenu_Text">
+	</style>
+	
+	<style name="SleepTimerTitle_Text_SystemFont" parent="SleepTimerTitle_Text">
+		<item name="android:textSize">@dimen/large1_AltFont_textSize</item>
+	</style>
+	
+	<style name="SleepTimerValue_Text_SystemFont" parent="SleepTimerValue_Text">
+		<item name="android:textSize">@dimen/large3_AltFont_textSize</item>
+	</style>
+			
+	
+	<style name="EqLinearKnob_Text_SystemFont" parent="EqLinearKnob_Text">
+		<item name="android:textSize">@dimen/moderate2_AltFont_textSize</item>
+	</style>
+	<style name="EqKnobLabel_Text_SystemFont" parent="EqKnobLabel_Text">
+		<item name="android:textSize">@dimen/moderate1_AltFont_textSize</item>
+	</style>
+	<style name="EqKnobValue_Text_SystemFont" parent="EqKnobValue_Text">
+		<item name="android:textSize">@dimen/small3_AltFont_textSize</item>
+	</style>
+	<style name="EqKnobValueLarger_Text_SystemFont" parent="EqKnobValue_Text">
+		<item name="android:textSize">@dimen/moderate1_AltFont_textSize</item>
+	</style>
+		
+	<style name="EqButton_Text_SystemFont" parent="EqButton_Text">
+		<item name="android:textSize">@dimen/medium1_AltFont_textSize</item>
+		<item name="android:textAllCaps">false</item>
+	</style>
+	<style name="EqEquPresetLabel_Text_SystemFont" parent="EqEquPresetLabel_Text">
+		<item name="android:textSize">@dimen/medium1_AltFont_textSize</item>
+		<item name="android:textAllCaps">false</item>
+	</style>
+	
+	<style name="PeqEqEnableVisFrs_Text_SystemFont" parent="EqButton_Text">
+		<item name="android:textSize">@dimen/small2_AltFont_textSize</item>
+		<item name="android:textAllCaps">false</item>
+	</style>
+				
+</resources>
diff --git a/poweramp_skin_sdk/reference_resources/values/default-styles.xml b/poweramp_skin_sdk/reference_resources/values/default-styles.xml
index 5a05c6fb..5099ab3c 100644
--- a/poweramp_skin_sdk/reference_resources/values/default-styles.xml
+++ b/poweramp_skin_sdk/reference_resources/values/default-styles.xml
@@ -103,7 +103,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="android:statusBarColor">#0000</item><!-- Still may be used by Android. Either this, or statusBarBg should have some color, but not both -->
 		<item name="statusBarBg">#5000</item><!-- Used by TopFitsStatusBarView -->
 
-		<item name="navigationBarBg">#0000</item><!-- Used by TopFitsNavigationBarView. We don't actually draw android navigation bar by TopFitsNavigationBarView in this theme, but some color is needed -->
+		<!-- Used by TopFitsNavigationBarView. We don't actually draw android navigation bar by TopFitsNavigationBarView in this theme, but some color is needed -->
+		<item name="navigationBarBg">#0000</item>
 
 		<!-- The code below make the status bar light -->
 		<!-- <item name="android:statusBarColor">#4fff</item>
@@ -138,7 +139,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="colorBgPrimary">#fff</item>
 		<item name="colorBgPrimaryAlpha">#55F5F5F5</item>
 		<item name="colorBgLessAlpha">#dfff</item>
+		<item name="colorBgPrimaryStrictAlpha">#bfff</item>
 		<item name="colorInverse">#fff</item>
+		<item name="colorPlaybackRipple">#999</item><!-- Using color which will work fine for both dark and light buttons. We change this for Android 13+ -->
 		<item name="colorBgInverse">#000</item>
 		<item name="colorBgInverseChecked">#000</item>
 		<item name="colorStroke">#555</item>
@@ -147,6 +150,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="colorLessContrast">#333</item><!-- Used for e.g. for the main screen tinted icons, some text -->
 		<item name="colorShade">#88000000</item>
 		<item name="colorBgLight">#f0f0f0</item><!-- Used ATM for the Search Frame bg -->
+		<item name="colorBgCheckedLight">#333</item>
 		<item name="colorItemPlayingMark">#eee</item>
 		<item name="colorTextBgAlpha">#c8000000</item>
 
@@ -157,7 +161,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="colorIconInverseForced">#fff</item>
 		<item name="colorIconDisabled">#9333</item><!-- NOTE: used only in few places, e.g. vis/repeat/shuffle icons (alt) -->
 
-		<item name="colorTextDisabled">#d6d6d6</item><!-- Used for text disabled color in very few places where text is rendered by the view, e.g. in LinearKnob -->
+		<!-- Used for text disabled color in very few places where text is rendered by the view, e.g. in LinearKnob
+			 Should be visible/readable enough as this is also locked state where user should be able to read the text -->
+		<item name="colorTextDisabled">#d6d6d6</item>
+		<!-- Same as colorTextDisabled, little less visible, but still readable -->
+		<item name="colorTextDisabledSecondary">#d6d6d6</item>
 
 		<!-- Basically, the main background color for Poweramp main activity, as Milk visualization/AA blur is always on background, except lock screen mode.
 		     Though, in lock screen mode, this color is also used as background color by lock screen code -->
@@ -181,7 +189,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="colorEqKnobsLines1">#aaa</item>
 		<item name="colorEqKnobsLines2">#333</item>
 
-		<item name="colorFrs">#000</item>
 		<item name="colorFrsTone">#aa000000</item>
 		<item name="colorFrsToneAlpha">@null</item>
 		<item name="colorFrsToneFill">#28000000</item>
@@ -211,6 +218,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="colorKnobHiliteEndPressed">#0000</item>
 		<item name="colorKnobHiliteEnd">#0000</item>
 
+		<!-- Overridden by overlap_knobs_hilite_color (ActivityTheme_GraphicFrsColorful) -->
+		<item name="graphicColorMax">#0000</item>
+		<item name="graphicColor75">#0000</item>
+		<item name="colorFrs">#000</item>
+		<item name="graphicColor25">#0000</item>
+		<item name="graphicColorMin">#0000</item>
+
 		<item name="colorTrackMeta">#999</item>
 		<item name="colorTrackNum">#999</item>
 		<item name="colorSeparator">#FF888888</item>
@@ -325,6 +339,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="pre_chromecast">@drawable/pre_chromecast</item>
 		<item name="pre_other">@drawable/pre_other</item>
 
+		<item name="equ_graphic_small">@drawable/equ_graphic_small</item>
+		<item name="equ_parametric_small">@drawable/equ_parametric_small</item>
+
+
 		<item name="folder_cat_icon">@drawable/folder_16dp</item>
 
 		<!-- List type icons. Shown in Library and as Playing Now icon -->
@@ -421,6 +439,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="import_24dp">@drawable/import_24dp</item>
 		<item name="bookmark">@drawable/bookmark_stroke</item>
 		<item name="share_24dp">@drawable/share_24dp</item>
+		<item name="reset_24dp">@drawable/reset_24dp</item>
+		<item name="save_24dp">@drawable/save_24dp</item>
+		<item name="save_assign_24dp">@drawable/save_assign_24dp</item>
+		<item name="autosave_24dp">@drawable/autosave_24dp</item>
 
 		<item name="clear_q_24dp">@drawable/clear_q_stroke_24dp</item>
 		<item name="artists_24dp">@drawable/artists_stroke_24dp</item>
@@ -430,6 +452,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="folder_24dp">@drawable/folder_stroke_24dp</item>
 		<item name="rename_24dp">@drawable/rename_24dp</item>
 		<item name="delete_24dp">@drawable/delete_stroke_24dp</item>
+		<item name="lock_24dp_tinted">@drawable/lock_24dp_tinted</item>
+		<item name="lock_24dp">@drawable/lock_24dp</item>
+		<item name="lock_solid_24dp">@drawable/lock_solid_24dp</item>
+		<item name="lock_unlock_24dp">@drawable/lock_unlock_24dp</item>
+		<item name="lock_unlock_24dp_selector">@drawable/lock_unlock_24dp_selector</item>
 		<item name="assign_eq_24dp">@drawable/assign_eq_24dp</item>
 		<item name="playlist_24dp">@drawable/playlist_24dp</item>
 		<item name="play_24dp">@drawable/play_24dp</item>
@@ -477,6 +504,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="logo_navbar">@drawable/logo_navbar_hamburger</item>
 		<item name="meta_info_bg">@drawable/alpha_popup_button_layout_bg</item>
 
+
 		<!-- Android mediarouter icons -->
 		<item name="media_route" tools:ignore="PrivateResource">@drawable/mr_button_light</item>
 		<item name="mediaRouteCloseDrawable" tools:ignore="PrivateResource">@drawable/mr_dialog_close_light</item>
@@ -499,6 +527,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="LargerText">@style/LargerText</item>
 		<item name="AccentedText">@style/AccentedText</item>
 		<item name="Hint">@style/Hint</item>
+		<item name="SmallerSearchEditText_Text">@style/SmallerSearchEditText_Text</item>
+
 
 		<!-- Elevation -->
 		<item name="dialogFrame_elevation">16dp</item>
@@ -528,7 +558,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="corners_popup">24dp</item>
 		<item name="corners_medium_minus">6dp</item>
 		<item name="corners_medium">28dp</item>
-		<item name="corners_medium_plus">16dp</item>
+		<item name="corners_medium_plus">20dp</item><!-- Preamp, scroll popup -->
 		<item name="corners_navbar">24dp</item>
 		<item name="corners_searchbar">24dp</item>
 		<item name="corners_mini">24dp</item>
@@ -742,11 +772,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="overlap_knobs_hilite_mono">@style/ActivityTheme_Whitepro_EqKnobsHiliteMonochromatic</item>
 		<!-- NOTE: overridden for Material You colors -->
 		<item name="overlap_knobs_hilite_color">@style/ActivityTheme_Whitepro_EqKnobsHiliteColorful</item>
+		<item name="overlap_graphic_frs_color">@style/ActivityTheme_White_GraphicFrsColorful</item>
 
 		<!-- Navbar margins to allow easy overriding for overlap_navbar_offset option -->
 		<item name="navbar_marginLR">8dp</item>
 		<!-- NOTE: there is also increased margin, but we need exactly Navbar_normal_marginB value for TopContainer reduceBottomInset -->
 		<item name="navbar_marginB">@dimen/Navbar_marginB_more_rounded</item>
+		<!-- Navbar top margin shouldn't be changed dynamically, e.g. for offset navbar option -->
+		<!-- NOTE: this is not used directly by the navbar as margin, but used for the DynamicDimensions calculation -->
+		<item name="navbar_marginT">4dp</item>
 
 		<item name="Navbar_height">@dimen/Navbar_height</item>
 		<item name="NavbarSeekbar_marginLR">16dp</item>
@@ -775,9 +809,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 		<item name="ItemTrackMenu_scene_aa_visibility">visible</item>
 		<item name="ItemTrackLyrics_scene_aa_visibility">visible</item><!-- NOTE: we allow lyrics button to be visible, but it still will be gone if no lyrics are in the track -->
-		<item name="AAImage_scaleType">centerCrop</item><!-- By default, (modified) centerCrop is used. Can be overridden by OptionAAKeepAspect/OptionAACrop -->
+		<!-- By default, the (modified, we crop just the height) centerCrop is used. Can be overridden by OptionAAKeepAspect/OptionAACrop -->
+		<item name="AAImage_scaleType">centerCrop</item>
 
 		<item name="EqParamColorSet">@array/EqParamColorSet_Default</item>
+		<!-- Overridden for Peq -->
+		<item name="EqTonePanel_paddingTop">@dimen/EqTonePanel_paddingTop</item>
+		<item name="EqTonePanel_paddingBottom">@dimen/EqTonePanel_paddingBottom</item>
 
 		<!-- Not themeable functional attributes -->
 
@@ -788,6 +826,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="settings_target_equ">audio_equ</item>
 		<item name="EqLockLabelStyle">@null</item>
 
+		<item name="popupEnterAnimTime">350</item>
+		<item name="popupExitAnimTime">300</item>
+
 		<!-- Globally enables debug rectangle around fast text view text/drawables. Can be set per specific FastTextViews as well -->
 		<!--<item name="debugRectColor">#ffaaaaaa</item>-->
 		<!-- Deprecated stuff -->
@@ -800,6 +841,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="ItemTrackMeta_scene_item_menu_marginLeft">-2dp</item>
 		<!-- @Deprecated - not used -->
 		<item name="ItemTrackMeta_scene_item_menu_marginBottom">4dp</item>
+
 		<!-- NOTE: this is not used anymore. Here the deprecated single value per all possible configurations is defined
 		     for old 3rd party skins, though this shouldn't be ever used directly.
 		      See values-dimensions.xml for the replacement -->
@@ -869,11 +911,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="nav_search">@drawable/search_rounded</item>
 		<item name="nav_hamburger">@drawable/hamburger_rounded</item>
 
+		<!-- Disable possible extra background applied by system on some devices -->
+		<item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item>
+
 		<item name="Navbar">@style/Navbar_noBgNavbar</item>
 		<item name="Navbar_scene_navbar_1line_sheet">@style/Navbar_scene_navbar_1line_sheet_transparentNavbar</item>
 		<item name="Navbar_scene_navbar_2lines">@style/Navbar_scene_navbar_2lines_transparentNavbar</item>
 	</style>
 
+	<style name="ActivityTheme_NoAndroidNavbarBg">
+		<!-- Disable possible extra background applied by system on some devices -->
+		<item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item>
+		<item name="android:navigationBarColor">#0000</item><!-- Make android navigation bar transparent -->
+		<item name="navigationBarBg">#0000</item>
+	</style>
+
 	
 	<style name="SelectionMenuSubcontainer_scenes_hidden_transparentNavbar" parent="SelectionMenuSubcontainer_scenes_hidden">
 		<item name="jumpVisibility">false</item><!-- Avoid jumping visibility, let it properly fade -->
@@ -898,6 +950,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="colorInverse">#000</item>
 		<item name="colorBgInverse">#fff</item>
 		<item name="colorBgInverseChecked">#ccc</item><!-- Used for checkable buttons. As we don't inverse text to white, use some grey for checked state -->
+		<item name="colorBgCheckedLight">#ccc</item>
 		<item name="android:textColorPrimaryInverse">#000</item>
 		<item name="colorIconInverse">#000</item>
 		<item name="colorIconInverseForced">#000</item>
@@ -965,11 +1018,30 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="corners_text_bg">4dp</item>
 		<item name="corners_generic">8dp</item>
 		<item name="corners_small_labels">2dp</item>
-		<item name="corners_aa_scene_aa">8dp</item>
+		<item name="corners_aa_scene_aa">12dp</item>
 		<item name="corners_miniplayer_aa">4dp</item>
 		<item name="corners_toast">16dp</item>
 		<item name="corners_large">10dp</item>
 
+		<item name="corners_aa_tracks_menu">10dp</item>
+		<item name="corners_aa_albums_menu">10dp</item>
+
+		<item name="corners_aa_tracks">8dp</item>
+		<item name="corners_aa_albums">4dp</item>
+
+		<item name="corners_aa_tracks_zoomed">10dp</item>
+		<item name="corners_aa_albums_zoomed">6dp</item>
+
+		<item name="corners_aa_tracks_grid">8dp</item>
+		<item name="corners_aa_albums_grid">4dp</item>
+
+		<item name="corners_aa_tracks_grid_zoomed">12dp</item>
+		<item name="corners_aa_albums_grid_zoomed">10dp</item>
+
+		<item name="corners_aa_tracks_small">4dp</item>
+
+		<item name="OptionRoundedScreenCorners_corners_header">8dp</item>
+
 		<item name="ItemTrackTitle_paddingLR">8dp</item>
 		<item name="ItemTrackLine2_paddingLR">8dp</item>
 		<item name="ItemTrackMeta_drawablePaddingStart">8dp</item>
@@ -995,6 +1067,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="pause_small_narrow">@drawable/pause_small_narrow</item>
 		<item name="back_10s_round">@drawable/back_10s_round</item>
 		<item name="forward_10s_round">@drawable/forward_10s_round</item>
+		<item name="play_24dp">@drawable/play_small</item>
 
 		<item name="play_core">@drawable/play_core_tinted</item>
 		<item name="pause_core">@drawable/pause_core_tinted</item>
@@ -1013,6 +1086,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="colorInverse">#000</item>
 		<item name="colorBgInverse">#fff</item>
 		<item name="colorBgInverseChecked">#ccc</item><!-- Used for checkable buttons. As we don't inverse text to white, use some grey for checked state -->
+		<item name="colorBgCheckedLight">#ccc</item>
 		<item name="android:textColorPrimaryInverse">#000</item>
 		<item name="colorIconInverse">#000</item>
 		<item name="colorIconInverseForced">#000</item>
@@ -1034,7 +1108,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		-->
 	</style>
 	<style name="ActivityTheme_White_LessRounding_LightButtons" parent="Base_ActivityTheme_White_LessRounding_LightButtons">
-		<!-- Overridden for v31 -->
 	</style>
 
 	
diff --git a/poweramp_skin_sdk/reference_resources/values/dimens-eq.xml b/poweramp_skin_sdk/reference_resources/values/dimens-eq.xml
index 997151a1..3fea533d 100644
--- a/poweramp_skin_sdk/reference_resources/values/dimens-eq.xml
+++ b/poweramp_skin_sdk/reference_resources/values/dimens-eq.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (C) 2010-2022 Maksim Petrov
+Copyright (C) 2010-2023 Maksim Petrov
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted for themes, skins, widgets, plugins, applications and other software
@@ -36,7 +36,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	
 	<dimen name="EqInfoLabel_maxWidth">300dp</dimen>
 	
-	<dimen name="preamp_knob_width">56dp</dimen>
+	<dimen name="preamp_knob_width">60dp</dimen>
+	<dimen name="preamp_bg_insetRight">4dp</dimen>
+	
 	<dimen name="eq_frs_height">38dp</dimen>
 	<dimen name="EqInfoBase_marginTB">4dp</dimen><!-- Increased for longer screens -->
 	
@@ -51,45 +53,72 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	
 	<dimen name="RoundKnob_arcWidth">3dp</dimen>
 	<dimen name="RoundKnob_arcOffset">3dp</dimen>
+
+
 	
 	<dimen name="EqLinearKnob_thumbWidth">24dp</dimen>
 	<dimen name="EqLinearKnob_thumbHeight">48dp</dimen>
-	<dimen name="EqLinearKnob_paddingTB">0dp</dimen>
+	<dimen name="EqLinearKnob_paddingTB">2dp</dimen>
+	<dimen name="EqParamFreqLabelAndValue_marginBottom">4dp</dimen>
 
-	<dimen name="knob_thumb_indicator_top_bottom">23.5dp</dimen>
-	<dimen name="knob_thumb_indicator_left_right">4.5dp</dimen>
+	<dimen name="knob_thumb_indicator_top_bottom">23dp</dimen>
+	<dimen name="knob_thumb_indicator_left_right">7.5dp</dimen>
 	<dimen name="knob_thumb_radius">16dp</dimen>
 	<dimen name="knob_thumb_radius_less_rounded">9dp</dimen>
+
+	<dimen name="knob_thumb_lock_size">16dp</dimen>
+	<dimen name="knob_thumb_lock_top">16dp</dimen>
+	<dimen name="knob_thumb_lock_left">4dp</dimen>
 	
-	<dimen name="EqButton_layout_width">48dp</dimen>
-	<dimen name="EqButton_layout_height">24dp</dimen>
-	<dimen name="EqButton_paddingLR">12dp</dimen>
+	<dimen name="EqButton_width">48dp</dimen>
+	<dimen name="EqButton_height">28dp</dimen>
 
-	<dimen name="EqParamPlaceholder2_height">64dp</dimen>
-	<dimen name="EqParamRoundKnobPortBase_paddingBottom">36sp</dimen>
+	<dimen name="EqParamPopupButtonLayout_height_port">28dp</dimen>
+	<dimen name="EqParamPlaceholder2_height_port">68dp</dimen><!-- 4 + 28 + 4 + 28 + 4 -->
+	<dimen name="EqParamTypePopupButtonLayout_marginBottom_port">4dp</dimen>
 	
+	<dimen name="EqMenu_size">28dp</dimen>
+	<dimen name="EqButton_paddingLR">12dp</dimen>
+
+	<dimen name="EqParamRoundKnobPortBase_paddingBottom">38sp</dimen>
+	<dimen name="EqParamFreqLabelAndValue_marginBottom_port">2dp</dimen>
+
 	<dimen name="EqParamGainLinearKnob_layout_marginLeft">14dp</dimen>
 	
-	<dimen name="EqButton_layout_maxWidth">70dp</dimen>
+	<dimen name="EqButton_maxWidth">70dp</dimen>
 	<dimen name="EqButton_marginSide">4dp</dimen>
-	<dimen name="EqButton_textSize">10dp</dimen>
+	<dimen name="EqButton_textSize">11dp</dimen><!-- Default (fixed) font -->
 	
 	<dimen name="EqEquButton_maxWidth">70dp</dimen>
-	<dimen name="EqTonePanel_marginTop">14dp</dimen>
-	<dimen name="EqTonePanel_offsetTB">2dp</dimen>
-	<dimen name="EqTonePanel_offsetLeft">16dp</dimen>
-	
+
+	<fraction name="EqTonePanel_widthPercent">15%</fraction><!-- Used for land only, reduced for the longer phones -->
+	<dimen name="EqTonePanel_paddingTop">12dp</dimen>
+	<dimen name="EqTonePanel_paddingBottom">0dp</dimen>
+	<!-- This is increased for Peq + longer screens -->
+	<dimen name="Peq_EqTonePanel_paddingTop">14dp</dimen>
+	<dimen name="Peq_EqTonePanel_paddingBottom">2dp</dimen>
+
+	<dimen name="EqMenuIcon_size">20dp</dimen>
+
+
+	<dimen name="ItemPopupListFrs_marginRight">8dp</dimen>
+	<dimen name="ItemEqPresetTitle_drawablePadding">4dp</dimen>
 	
 	<dimen name="EqVolPanel1_paddingTop">0px</dimen>
 	
 	<dimen name="EqRoundKnobLabel_maxWidth">120dp</dimen>
+	<dimen name="EqRoundKnobLabel_marginTop">4dp</dimen><!-- Reduced for land -->
 	<dimen name="EqToneRoundKnobLabel_maxWidth">50dp</dimen>
-	<dimen name="EqToneRoundKnobLabel_marginRight">-1dp</dimen>
-	
+	<!-- Used for land + large only -->
+	<dimen name="EqToneKnobLayout_marginOffset">0dp</dimen>
+	<!-- Used for land + large only -->
+	<dimen name="EqRoundKnobValueLabel_marginBottom">0dp</dimen>
+
 	<dimen name="RoundKnobLabelLeftTop_marginRight">4dp</dimen>
 	<dimen name="RoundKnobLabelLeftTop_marginTop">8dp</dimen>
 	<dimen name="RoundKnobLabelLeftTop_minWidth">72dp</dimen>
-	<dimen name="EqEquPresetButtonLayout_layout_width">70dp</dimen>
+	<dimen name="EqEquPresetButtonLayout_width">120dp</dimen>
+	<dimen name="EqMenu_marginBottom">0dp</dimen><!-- For land large -->
 
 	<dimen name="EqKnob_spacing">4dp</dimen>
 	<dimen name="EqReverbPanel3_paddingTop">8dp</dimen><!-- == EqKnob_spacing*2 --> 
@@ -108,11 +137,31 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<dimen name="EqSmallRoundKnob_maxSize">80dp</dimen>
 	<dimen name="EqToneRoundKnob_maxSize">140dp</dimen>
 	<dimen name="EqRoundKnob_maxSize">140dp</dimen>
-	<dimen name="EqParamRoundKnobBase_maxSize">140dp</dimen>
+	<dimen name="EqParamRoundKnobBase_maxSize_port">140dp</dimen>
 	<dimen name="EqLargerRoundKnob_maxSize">180dp</dimen>
-	
-	<dimen name="EqParamTypePopupButtonLayout_marginBottom">12dp</dimen>
+
+	<!-- Land and port on the small devices, reduced for real land -->
+	<dimen name="EqParamLRPopupButtonLayout_marginBottom_land">8dp</dimen>
+	<dimen name="EqParamTypePopupButtonLayout_marginBottom_land">16dp</dimen>
+
 	<dimen name="EqParamRoundKnob_marginBottom">4dp</dimen>
 	<dimen name="Peq_EqParamRoundKnob_marginBottom">4dp</dimen>
-		
+
+	<dimen name="EqPresetButtonLayoutBase_listItemSize">64dp</dimen>
+
+	<!-- Overridden for longer screens (reduced), and increased here for smaller screens -->
+	<fraction name="EqEquPresetButtonLayout_scene_button_menu_heightPercent">70%</fraction>
+
+	<fraction name="left_buttons_width">20%</fraction>
+	<fraction name="tone_panel_width">75%</fraction>
+
+	<dimen name="TopPeqEqLayoutBase_paddingBottom">8dp</dimen>
+
+	<!-- @Deprecated -->
+	<dimen name="EqTonePanel_offsetLeft">16dp</dimen>
+	<!-- @Deprecated -->
+	<dimen name="EqTonePanel_marginTop">12dp</dimen>
+	<!-- @Deprecated -->
+	<dimen name="EqToneRoundKnobLabel_marginRight">-1dp</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values/dimens-player.xml b/poweramp_skin_sdk/reference_resources/values/dimens-player.xml
index 1e15455f..918c29ee 100644
--- a/poweramp_skin_sdk/reference_resources/values/dimens-player.xml
+++ b/poweramp_skin_sdk/reference_resources/values/dimens-player.xml
@@ -24,8 +24,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<dimen name="TopSubAAButtons_marginTop">0dp</dimen><!-- Need less margin for shorter screens -->
 	<dimen name="TopWaveseekLayout_paddingTop">4dp</dimen>
 	<dimen name="ListSubstyleBase2_aaMarginBottom">200dp</dimen>
-	<dimen name="ListSubstyleBase2_searchHeaderSize">140dp</dimen>
-	<dimen name="ListSubstyleBase2_targetSearchHeaderSize">140dp</dimen>
+	<dimen name="ListSubstyleBase2_searchHeaderSize">144dp</dimen><!-- REVISIT: includes sp text size, so should be sp based or dynamic -->
+	<dimen name="ListSubstyleBase2_targetSearchHeaderSize">144dp</dimen>
 	
 	<dimen name="TopWaveseek_maxHeight">128dp</dimen>
 	
@@ -133,10 +133,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<dimen name="ActivityTheme_AltLayout2_Alt2_ItemRatingBar_scene_aa_marginLeft">14dp</dimen>
 	<dimen name="Alt2_TracksLabelsNoBg_Alt2_ItemRatingBar_scene_aa_marginLeft">16dp</dimen>
 
-	<dimen name="EqPresetButtonLayoutBase_listItemSize">56dp</dimen>
-
-
-
 	<!-- @Deprecated -->
 	<dimen name="Alt_ItemTrackLine_scene_aa_marginTop">-3dp</dimen>
 	<!-- @Depeicated -->
diff --git a/poweramp_skin_sdk/reference_resources/values/dimens-powerui.xml b/poweramp_skin_sdk/reference_resources/values/dimens-powerui.xml
index 857d1018..41a4c08a 100644
--- a/poweramp_skin_sdk/reference_resources/values/dimens-powerui.xml
+++ b/poweramp_skin_sdk/reference_resources/values/dimens-powerui.xml
@@ -31,15 +31,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<dimen name="LargerTopBottomSheetDialogFrame_maxHeight">600dp</dimen>
 	<dimen name="DialogFrame_maxWidth">680dp</dimen>
 	
-	<dimen name="DialogButtonStyle_layout_maxWidth">148dp</dimen>
+	<dimen name="DialogButtonStyle_maxWidth">148dp</dimen>
 	
 	<dimen name="CenterDialogFrame_maxWidth">380dp</dimen>
 	
-	<dimen name="TopToastContainer_layout_height">200dp</dimen><!-- Ensure 2-3 line fits -->
-	<dimen name="TopToastContainer_scenes_non_main_layout_height">146dp</dimen><!-- Not used -->
+	<dimen name="TopToastContainer_height">200dp</dimen><!-- Ensure 2-3 line fits -->
+	<dimen name="TopToastContainer_scenes_non_main_height">146dp</dimen><!-- Not used -->
 	<dimen name="TopToastFrame_maxWidth">300dp</dimen>
 	<dimen name="TopToastFrame_paddingLR">16dp</dimen>
-	<dimen name="TopToastFrame_paddingTB">8dp</dimen>
+	<dimen name="TopToastFrame_paddingTB">10dp</dimen>
 	<dimen name="TopToastTile_marginLeft">44dp</dimen><!-- NOTE: defines space for icon + padding -->
 	
 	<dimen name="TopUpperToastFrame_maxWidth">9999dp</dimen><!-- Not limited in portrait, limited in land -->
@@ -49,17 +49,22 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<dimen name="Text_size">14sp</dimen>
 	<dimen name="Hint_size">11sp</dimen>
 	<dimen name="LargerText_size">16sp</dimen>
-	
-	<dimen name="TopBaseButtonLayout_layout_width">58dp</dimen>
-	<dimen name="TopBaseButtonLayout_layout_height">30dp</dimen>
+	<dimen name="SmallerSearchEditText_Text_size">17dp</dimen>
+
+	<dimen name="TopBaseButtonLayout_width">58dp</dimen>
+	<dimen name="TopBaseButtonLayout_height">30dp</dimen>
 	<dimen name="PopupButtons_drawableSize">28dp</dimen>
 	<dimen name="PopupButton_scene_button_menu">56dp</dimen>
 	<dimen name="SmallerPopupButton_marginLeft">-8dp</dimen>
 	<dimen name="SmallerPopupButtons_drawableSize">24dp</dimen>
-	<dimen name="PopupButtons_paddingLeft">15dp</dimen><!-- Sync with TopBaseButtonLayout_layout_width=>PopupButtons_paddingLeft + 32dp (icon size) + PopupButtons_paddingLeft -->
+	<dimen name="PopupButtons_paddingLeft">15dp</dimen><!-- Sync with TopBaseButtonLayout_width=>PopupButtons_paddingLeft + 32dp (icon size) + PopupButtons_paddingLeft -->
 	<dimen name="PopupMenuItem_drawableWidth">24dp</dimen>
 	<dimen name="SmallerPopupButtons_paddingLeft">16.5dp</dimen>
 
+	<dimen name="TopSelectionMenuContainer_height">300dp</dimen>
+	<!-- This should be ~ max selection menu height -->
+	<dimen name="EqEquPresetButtonLayout_scene_button_menu_marginBottom">164dp</dimen>
+
 	<dimen name="NavbarExtensionMenuLine_drawableSize">24dp</dimen>
 	
 	<dimen name="TopSleepTimerButtonLayout_scene_item_menu_width">340dp</dimen>
diff --git a/poweramp_skin_sdk/reference_resources/values/ids-predefined.xml b/poweramp_skin_sdk/reference_resources/values/ids-predefined.xml
index 563eb699..d178243b 100644
--- a/poweramp_skin_sdk/reference_resources/values/ids-predefined.xml
+++ b/poweramp_skin_sdk/reference_resources/values/ids-predefined.xml
@@ -43,8 +43,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<item type="id" name="_q_label_and_value"/>
 	<item type="id" name="_color"/>
 	<item type="id" name="_edit"/>
+	<item type="id" name="_lock"/>
 	<item type="id" name="_left_label"/>
 	<item type="id" name="_right_label"/>
+	<item type="id" name="_button"/>
+	<item type="id" name="_icon"/>
 
 	<item type="id" name="vis_frame"/>
 	<item type="id" name="milk_frs"/>
diff --git a/poweramp_skin_sdk/reference_resources/values/styles-dialogs.xml b/poweramp_skin_sdk/reference_resources/values/styles-dialogs.xml
index f7e41e07..57c62a04 100644
--- a/poweramp_skin_sdk/reference_resources/values/styles-dialogs.xml
+++ b/poweramp_skin_sdk/reference_resources/values/styles-dialogs.xml
@@ -502,7 +502,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<style name="DialogButtonStyle" parent="@style/Widget.AppCompat.Button.ButtonBar.AlertDialog">
 		<item name="android:layout_width">wrap_content</item>
 		<item name="android:layout_height">wrap_content</item>
-		<item name="layout_maxWidth">@dimen/DialogButtonStyle_layout_maxWidth</item>
+		<item name="layout_maxWidth">@dimen/DialogButtonStyle_maxWidth</item>
 		<item name="animOnClick">true</item>
 		<item name="android:textAppearance">?android:attr/textAppearanceButton</item>
 		<item name="drawableTint">?colorIconPrimary</item>
diff --git a/poweramp_skin_sdk/reference_resources/values/styles-dynamicpopupbutton.xml b/poweramp_skin_sdk/reference_resources/values/styles-dynamicpopupbutton.xml
new file mode 100644
index 00000000..f2546088
--- /dev/null
+++ b/poweramp_skin_sdk/reference_resources/values/styles-dynamicpopupbutton.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2010-2023 Maksim Petrov
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted for themes, skins, widgets, plugins, applications and other software
+which communicate with Poweramp music player or Poweramp Equalizer applications on Android platform.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<resources
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:w="http://schemas.android.com/apk/res-auto"
+	>
+
+	<!-- NOTE: this is a DynamicPopupButton, which is FastLayout itself:
+	 - we have additional styles for the inner icon and label views
+	 - some derived attribures used to configure normal PopupButton, such as drawable attributes are ignored
+
+	+====================================+ <- DynamicPopupButton (-> FastLayout)
+	| +===========+ +==================+ |    - buttonStyle (while in button scene)
+	| |dynamicIcon| | dynamicLabel     | |    - menuButtonStyle (while in menu scene)
+	| +===========+ +==================+ |
+	+====================================+
+
+-->
+	<style name="DynamicPopupButton" parent="PopupButton">
+		<item name="recalcChildren">on_start</item>
+		<item name="android:layout_width">wrap_content</item>
+		<item name="android:layout_gravity">center_horizontal</item>
+
+		<item name="dynamicIconStyle">@style/DynamicPopupButtonIcon</item>
+		<item name="dynamicIconStyle_scene_menu">@style/DynamicPopupButtonIcon_scene_menu</item>
+		<item name="dynamicLabelStyle">@style/DynamicPopupButtonLabel</item>
+		<item name="dynamicLabelStyle_scene_menu">@style/DynamicPopupButtonLabel_scene_menu</item>
+		<item name="dynamicLabel2Style">@style/DynamicPopupButtonLabel2</item>
+		<item name="dynamicLabel2Style_scene_menu">@style/DynamicPopupButtonLabel2_scene_menu</item>
+	</style>
+	<style name="DynamicPopupButton_scene_button_menu">
+		<item name="scene">@id/scene_button_menu</item>
+		<item name="recalcChildren">on_start</item>
+		<item name="android:visibility">visible</item>
+		<item name="android:alpha">1</item>
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">@dimen/PopupButton_scene_button_menu</item>
+		<item name="layout_consumeSpace">vertical</item>
+		<item name="applyViewParams">true</item>
+		<item name="drawableTint">?colorIconPrimaryForced</item><!-- NOTE: @null/@empty is not supported ATM, need an explicit tint, thus using forced -->
+		<item name="android:background">@drawable/ripple_with_check_selector</item>
+	</style>
+	<style name="DynamicPopupButtonIcon" parent="PopupButton">
+		<item name="recalcChildren">on_start</item>
+		<item name="android:layout_width">wrap_content</item>
+		<item name="android:layout_height">match_parent</item>
+		<item name="layout_consumeSpace">horizontal</item>
+
+		<item name="drawableTint">?colorIconPrimary</item>
+		<item name="drawableWidth">24dp</item>
+		<item name="drawableHeight">24dp</item>
+		<!-- Ensure that we have icon properly positioned centered in the button by resetting all the derived paddings -->
+		<item name="drawablePaddingStart">0dp</item>
+		<item name="android:paddingLeft">0dp</item>
+		<item name="android:paddingRight">0dp</item>
+		<item name="android:drawablePadding">0dp</item>
+
+		<item name="drawableOnly">true</item>
+		<item name="android:visibility">visible</item><!-- Force icon visibility as PopupButton is gone by default -->
+	</style>
+	<style name="DynamicPopupButtonIcon_scene_menu">
+		<item name="scene">@id/scene_button_menu</item>
+		<item name="recalcChildren">on_start</item>
+		<item name="android:visibility">visible</item>
+
+		<item name="android:layout_width">wrap_content</item>
+		<item name="android:layout_height">match_parent</item>
+		<item name="layout_consumeSpace">horizontal</item>
+		<item name="android:layout_marginLeft">15dp</item><!-- Synchronizes visually to the usual popup buttons -->
+		<item name="android:layout_marginRight">0dp</item>
+	</style>
+
+	<style name="DynamicPopupButtonLabel" parent="PopupButton">
+		<item name="recalcChildren">on_start</item>
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">match_parent</item>
+		<item name="android:paddingLeft">8dp</item>
+		<item name="layout_consumeSpace">@null</item>
+		<item name="android:visibility">visible</item><!-- Ensure we don't have label initially visible -->
+		<item name="android:background">@null</item>
+	</style>
+	<style name="DynamicPopupButtonLabel_scene_menu">
+		<item name="scene">@id/scene_button_menu</item>
+		<item name="recalcChildren">on_start</item>
+		<item name="android:visibility">gone</item>
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">match_parent</item>
+		<item name="layout_consumeSpace">@null</item>
+		<item name="android:layout_marginLeft">5dp</item><!-- Synchronizes visually to the usual popup buttons -->
+		<item name="android:layout_marginRight">8dp</item>
+	</style>
+
+	<style name="DynamicPopupButtonLabel2" parent="DynamicPopupButtonLabel">
+		<item name="android:visibility">gone</item>
+	</style>
+	<style name="DynamicPopupButtonLabel2_scene_menu" parent="DynamicPopupButtonLabel_scene_menu">
+		<item name="android:visibility">visible</item>
+	</style>
+
+</resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values/styles-eq-menu.xml b/poweramp_skin_sdk/reference_resources/values/styles-eq-menu.xml
new file mode 100644
index 00000000..ee3d35c0
--- /dev/null
+++ b/poweramp_skin_sdk/reference_resources/values/styles-eq-menu.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2010-2023 Maksim Petrov
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted for themes, skins, widgets, plugins, applications and other software
+which communicate with Poweramp music player application on Android platform.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<resources
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools" xmlns:w="http://schemas.android.com/apk/res-auto"
+>
+	<!-- NOTE: icon is a separate view, as this is actually a popup layout, not just a simple button -->
+	<style name="EqMenuBase" parent="EqButton">
+		<item name="android:paddingLeft">0dp</item>
+		<item name="android:paddingRight">0dp</item>
+		<item name="android:paddingTop">0dp</item>
+		<item name="android:paddingBottom">0dp</item>
+		<!-- NOTE: generally this matches EqButton height, but we'll increase that a bit for land, where buttons are small -->
+		<item name="android:layout_width">@dimen/EqMenu_size</item>
+		<item name="android:layout_height">@dimen/EqMenu_size</item>
+
+		<item name="menuPlaceholder">@id/menu_placeholder</item>
+		<item name="openOnClick">true</item>
+		<item name="innerScrolling">true</item>
+		<item name="android:clickable">true</item>
+		<item name="android:focusable">true</item>
+		<item name="android:focusableInTouchMode">false</item>
+		<item name="android:background">@drawable/rounded_stroke_button_layout_bg</item>
+
+		<!-- Needed to avoid other views waiting to update until popup is closed -->
+		<item name="disableParentLayoutForPopup">false</item>
+	</style>
+
+	<style name="EqMenu" parent="EqMenuBase">
+		<item name="layout_attachBottom">@id/tone_panel</item>
+		<item name="layout_attachRight">parent</item>
+		<item name="android:layout_marginTop">0dp</item>
+		<item name="android:layout_marginRight">8dp</item>
+		<item name="android:layout_marginLeft">@dimen/EqButton_marginSide</item><!-- Specifically overridden for smaller screens -->
+		<item name="popupExpandDirection">top|left</item>
+	</style>
+	<style name="EqMenu_scene_item_menu" parent="TopMetaInfo_scene_item_menu">
+		<item name="android:layout_width">0dp</item>
+		<item name="layout_widthPercent">65%</item>
+		<item name="layout_maxWidth">340dp</item>
+	</style>
+
+	<style name="EqMenuIcon">
+		<item name="android:layout_height">match_parent</item>
+		<item name="layout_matchDimension">widthToHeight</item>
+
+		<item name="android:drawable">@drawable/menu</item>
+		<item name="drawableTint">?colorIconPrimary</item>
+
+		<item name="android:paddingTop">0dp</item>
+		<item name="android:paddingBottom">0dp</item>
+		<item name="drawableWidth">@dimen/EqMenuIcon_size</item>
+		<item name="drawableHeight">@dimen/EqMenuIcon_size</item>
+
+		<item name="android:disabledAlpha">0</item>
+		<item name="android:clickable">false</item><!-- NOTE: we delegate clicking processing to the layout -->
+
+		<item name="android:textSize">14dp</item><!-- Force fixed text size to avoid scaling this button with user text scale setting -->
+		<item name="drawableOnly">true</item>
+		<item name="drawablePosition">forceGravity</item>
+		<item name="android:gravity">center</item>
+	</style>
+
+	<style name="EqMenuLayoutItems">
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="layout_unlimitedMeasure">true</item>
+	</style>
+
+</resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values/styles-eq-param.xml b/poweramp_skin_sdk/reference_resources/values/styles-eq-param.xml
index 9b5d0d71..4f4944ff 100644
--- a/poweramp_skin_sdk/reference_resources/values/styles-eq-param.xml
+++ b/poweramp_skin_sdk/reference_resources/values/styles-eq-param.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (C) 2010-2021 Maksim Petrov
+Copyright (C) 2010-2023 Maksim Petrov
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted for themes, skins, widgets, plugins, applications and other software
@@ -68,8 +68,11 @@ Here we have base + "landscape" layout styles
 	</style>
 	
 	<!-- Gain always gets whole height to the left -->
+	<!-- NOTE: same style for port and land -->
 	<style name="EqParamGainLinearKnob" parent="EqLinearKnob">
 		<item name="android:id">@id/_gain</item>
+		<item name="android:contentDescription">@string/band_gain</item>
+
 		<item name="android:layout_width">wrap_content</item>	
 		<item name="android:layout_height">match_parent</item>
 		<item name="layout_consumeSpace">horizontal</item>
@@ -80,32 +83,35 @@ Here we have base + "landscape" layout styles
 		<item name="labelBackgroundPaddingLeft">5sp</item>
 		<item name="labelBackgroundPaddingRight">5sp</item>
 	</style>
-	
-	<!-- NOTE: action buttons should fit in vis modes when bands are shrank due to vis panel
-	     This is mostly defined by the size percentage for round knobs -->
-	<style name="EqParamEditButtonBase">
-		<item name="android:id">@id/_edit</item>
+
+	<style name="EqParamToolButtonBase">
 		<item name="android:layout_height">32dp</item>
 		<item name="android:layout_width">32dp</item>
-		
 		<item name="android:clickable">true</item>
 		<item name="android:focusable">true</item>
 		<item name="android:focusableInTouchMode">false</item>
 		<item name="android:background">@drawable/ripple_rounded_large</item>
-		
 		<item name="drawableOnly">true</item>
 		<item name="drawablePosition">forceGravity</item>
-		<item name="android:gravity">center</item>	
-		<item name="android:drawable">@drawable/edit_24dp</item>
+		<item name="android:gravity">center</item>
 		<item name="drawableTint">?colorKnob</item>
 		<item name="animOnClick">true</item>
 	</style>
+
+	<!-- NOTE: action buttons should fit in vis modes when bands are shrank due to vis panel
+	     This is mostly defined by the size percentage for round knobs -->
+	<style name="EqParamEditButtonBase" parent="EqParamToolButtonBase">
+		<item name="android:id">@id/_edit</item>
+		<item name="android:drawable">@drawable/edit_24dp</item>
+		<item name="android:contentDescription">@string/edit</item>
+	</style>
 	
 	<style name="EqParamColorPopupLayoutBase">
 		<item name="android:id">@id/_color</item>
 		<!-- NOTE: can't use dynamic size due to current popup behavior, when we can't return to new size -->
 		<item name="android:layout_height">32dp</item>
 		<item name="android:layout_width">32dp</item>
+		<item name="android:contentDescription">@string/color</item>
 				
 		<item name="android:clickable">true</item>
 		<item name="android:focusable">true</item>
@@ -113,7 +119,21 @@ Here we have base + "landscape" layout styles
 		<item name="menuItemsLayout">@layout/merge_eq_param_colors</item>		
 		<item name="android:background">@drawable/rounded_no_stroke_button_layout_bg</item>
 	</style>
-	
+
+	<style name="EqParamLockButtonBase" parent="EqParamToolButtonBase">
+		<item name="android:id">@id/_lock</item>
+		<item name="android:drawable">?lock_unlock_24dp_selector</item>
+		<item name="android:padding">4dp</item><!-- The icon is 24dp while size is 32dp, so add 4dp+4dp of padding -->
+		<item name="android:contentDescription">@string/lock_unlock</item>
+	</style>
+
+	<!-- land -->
+	<style name="EqParamLockButton" parent="EqParamLockButtonBase">
+		<item name="layout_attachLeftToLeft">@id/_edit</item>
+		<item name="layout_attachBottom">@id/_color</item>
+		<!--<item name="android:background">#0ff</item>-->
+	</style>
+
 	<style name="EqParamColorPopupLayout_scene_item_menu" parent="ItemPopupMenu_scene_item_menu">
 		<item name="android:layout_width">match_parent</item>
 		<item name="layout_maxWidth">@dimen/TopSleepTimerButtonLayout_scene_item_menu_width</item>
@@ -147,6 +167,8 @@ Here we have base + "landscape" layout styles
 		<item name="borderWidth" tools:ignore="PxUsage">2px</item>
 		
 		<item name="android:clickable">true</item>
+
+		<item name="android:importantForAccessibility">no</item>
 	</style>
 	
 		
@@ -170,13 +192,12 @@ Here we have base + "landscape" layout styles
 	
 	
 	<style name="EqParamRoundKnobBase" parent="EqResizableRoundKnob">
-		<item name="layout_maxHeight">@dimen/EqParamRoundKnobBase_maxSize</item>
+		<item name="android:gravity">bottom|center_horizontal</item><!-- Prefer bottom if we have more height than width -->
 
 		<item name="valueLabel">@null</item>
 		<item name="dependentLabel">@null</item>
 
 		<item name="offsetWhenNoArc">4dp</item><!-- Apply some extra offset for knob to compensate no arc -->
-
 	</style>
 
 
@@ -192,7 +213,8 @@ Here we have base + "landscape" layout styles
 		<item name="android:longClickable">true</item>
 		
 		<item name="android:layout_marginTop">0dp</item>
-		<item name="android:layout_marginBottom">0dp</item>
+		<!-- Applied to land mode only (both small port and land) and should follow EqLinearKnob_paddingTB size -->
+		<item name="android:layout_marginBottom">@dimen/EqParamFreqLabelAndValue_marginBottom</item>
 	</style>
 	
 	
@@ -238,6 +260,7 @@ Here we have base + "landscape" layout styles
 		<item name="drawableOnly">true</item>
 		<item name="drawablePosition">forceGravity</item>
 		<item name="android:gravity">center</item>
+		<item name="android:importantForAccessibility">no</item>
 		
 		<item name="applyEvenIfGone">true</item><!-- NOTE: as this is view is generaly force-hidden, it's not processed by Scene by default, thus using applyEvenIfGone=true -->
 	</style>
@@ -251,7 +274,8 @@ Here we have base + "landscape" layout styles
 		
 		<item name="android:layout_height">10dp</item>
 		<item name="android:layout_width">100dp</item>
-		<item name="android:layout_marginRight">8dp</item>
+		<item name="android:layout_marginRight">0dp</item>
+		<!--<item name="android:background">#ff0</item>-->
 	</style>
 	<!-- land -->
 	<style name="EqParamPlaceholder2">
@@ -264,16 +288,21 @@ Here we have base + "landscape" layout styles
 
 	<!-- land -->	
 	<style name="EqParamEditButton" parent="EqParamEditButtonBase">
-		<item name="layout_attachRightToRight">@id/_q</item>
-		<item name="android:layout_marginTop">6dp</item>
+		<item name="layout_attachLeft">@id/_q</item>
+		<item name="layout_attachBottom">parent</item>
+		<item name="android:layout_marginBottom">6dp</item>
+		<item name="android:layout_marginTop">0dp</item>
 		<item name="android:layout_marginRight">0dp</item>
 	</style>
+	
 	<!-- land -->
 	<style name="EqParamColorPopupLayout" parent="EqParamColorPopupLayoutBase">
 		<item name="layout_attachLeftToLeft">@id/_edit</item>
-		<item name="layout_attachTop">@id/_edit</item>
+		<item name="layout_attachBottom">@id/_edit</item>
+		<!--<item name="android:background">#f0f</item>-->
 	</style>
-	
+
+
 	<!-- land -->
 	<style name="EqParamLRPopupButtonLayout" parent="EqParamLRPopupButtonLayoutBase">
 		<item name="layout_attachTop">@null</item>
@@ -281,10 +310,9 @@ Here we have base + "landscape" layout styles
 
 		<item name="layout_gravityTarget">@+id/_placeholder1</item>
 		<item name="android:layout_gravity">center_horizontal|top</item>
-		<!--suppress AndroidDomInspection -->
 		<item name="layout_consumeSpace">@null</item>
 		
-		<item name="android:layout_marginBottom">8dp</item>
+		<item name="android:layout_marginBottom">@dimen/EqParamLRPopupButtonLayout_marginBottom_land</item><!-- 8dp -->
 		
 	</style>
 	
@@ -295,52 +323,59 @@ Here we have base + "landscape" layout styles
 
 		<item name="layout_gravityTarget">@+id/_placeholder1</item>
 		<item name="android:layout_gravity">center_horizontal|top</item>
-		<!--suppress AndroidDomInspection -->
 		<item name="layout_consumeSpace">@null</item>
 				
-		<item name="android:layout_marginBottom">16dp</item>
+		<item name="android:layout_marginBottom">@dimen/EqParamTypePopupButtonLayout_marginBottom_land</item><!-- 16dp -->
 	</style>	
 		
 	
 	<!-- land -->
 	<style name="EqParamRoundKnobLandBase" parent="EqParamRoundKnobBase">
 		<item name="android:layout_width">90dp</item>
+		<!-- NOTE: max size is defined by width here, and we need round knob to move to bottom closer to labels -->
+		<item name="layout_maxHeight">@null</item>
 		<item name="layout_attachTop">42%</item>
 		<item name="layout_attachBottom">@+id/_freq_label_and_value</item>
 		<item name="android:layout_marginBottom">4dp</item>
 		<item name="android:layout_gravity">center_horizontal</item>
+		<!--<item name="android:background">#5f00</item>-->
 	</style>
 		
 	<!-- land -->
 	<style name="EqParamQRoundKnob" parent="EqParamRoundKnobLandBase">
 		<item name="android:id">@+id/_q</item>
+		<item name="android:contentDescription">@string/q_factor</item>>
+
 		<item name="layout_gravityTarget">@+id/_placeholder2</item>
+		<!--<item name="android:background">#500f</item>-->
 	</style>
 
 	<!-- land -->
 	<style name="EqParamQLabelAndValue" parent="EqParamLabelAndValueBase">
 		<item name="android:id">@+id/_q_label_and_value</item>
+		<item name="android:importantForAccessibility">no</item>
 		
 		<item name="layout_attachBottom">parent</item>
 		<item name="layout_gravityTarget">@id/_placeholder2</item>
 		<item name="android:layout_gravity">center_horizontal</item>
-		<item name="android:layout_marginBottom">2dp</item>
 	</style>
 	
 	<!-- land -->
 	<style name="EqParamFreqRoundKnob" parent="EqParamRoundKnobLandBase">
 		<item name="android:id">@+id/_freq</item>
+		<item name="android:contentDescription">@string/frequency</item>
+
 		<item name="layout_gravityTarget">@+id/_placeholder1</item>
 	</style>
 	
 	<!-- land -->
 	<style name="EqParamFreqLabelAndValue" parent="EqParamLabelAndValueBase">
 		<item name="android:id">@+id/_freq_label_and_value</item>
-		
+		<item name="android:importantForAccessibility">no</item>
+
 		<item name="layout_attachBottom">parent</item>
 		<item name="layout_gravityTarget">@id/_placeholder1</item>
 		<item name="android:layout_gravity">center_horizontal</item>
-		<item name="android:layout_marginBottom">2dp</item>
 	</style>
 		
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values/styles-eq.xml b/poweramp_skin_sdk/reference_resources/values/styles-eq.xml
index 9b2e5ae7..030efdb0 100644
--- a/poweramp_skin_sdk/reference_resources/values/styles-eq.xml
+++ b/poweramp_skin_sdk/reference_resources/values/styles-eq.xml
@@ -37,6 +37,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		
 		<item name="holeStartColor">@color/peq_eq_arc_start_mono_selector</item>
 		<item name="holeEndColor">@color/peq_eq_arc_end_mono_selector</item>
+
+		<item name="arcGlowStartColor">@color/peq_eq_arc_start_mono_selector</item>
+		<item name="arcGlowEndColor">@color/peq_eq_arc_end_mono_selector</item>
+
+		<item name="holeGlowStartColor">@color/peq_eq_arc_start_mono_selector</item>
+		<item name="holeGlowEndColor">@color/peq_eq_arc_end_mono_selector</item>
 	</style>
 
 	<style name="ActivityTheme_Whitepro_EqKnobsHiliteColorful">
@@ -48,22 +54,34 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="colorKnobHiliteEnd">#F00</item>
 
 		<item name="arcStartColor">@color/eq_arc_start_colorful_selector</item>
-		<!--<item name="arcMidColor">@color/eq_arc_mid_colorful_selector</item>-->
 		<item name="arcEndColor">@color/eq_arc_end_colorful_selector</item>
 		
 		<item name="arcGlowStartColor">@color/eq_arc_start_colorful_selector</item>
-		<!--<item name="arcGlowMidColor">@color/eq_arc_mid_colorful_selector</item>-->
 		<item name="arcGlowEndColor">@color/eq_arc_end_colorful_selector</item>
 		
 		<item name="holeStartColor">@color/eq_arc_start_colorful_selector</item>
-		<!--<item name="holeMidColor">@color/eq_arc_mid_colorful_selector</item>-->
 		<item name="holeEndColor">@color/eq_arc_end_colorful_selector</item>
 		
 		<item name="holeGlowStartColor">@color/eq_arc_start_colorful_selector</item>
-		<!--<item name="holeGlowMidColor">@color/eq_arc_mid_colorful_selector</item>-->
 		<item name="holeGlowEndColor">@color/eq_arc_end_colorful_selector</item>
 	</style>
 
+	<!-- NOTE: ActivityTheme_White_GraphicFrsColorful colors are slightly darker for the better contrast on the white background -->
+	<style name="ActivityTheme_White_GraphicFrsColorful">
+		<item name="graphicColorMax">#FFe80000</item>
+		<item name="graphicColor75">#FFe8ba00</item>
+		<item name="colorFrs">#FF00e800</item>
+		<item name="graphicColor25">#FF01dee8</item>
+		<item name="graphicColorMin">#FF0000e8</item>
+	</style>
+	<style name="ActivityTheme_Black_GraphicFrsColorful">
+		<item name="graphicColorMax">#FFFF0000</item>
+		<item name="graphicColor75">#FFffcc00</item>
+		<item name="colorFrs">#FF00FF00</item>
+		<item name="graphicColor25">#FF01f4ff</item>
+		<item name="graphicColorMin">#FF0000FF</item>
+	</style>
+
 	<style name="EqPagesLayout">
 		<item name="android:layout_width">match_parent</item>
 		<item name="android:layout_height">match_parent</item>
@@ -135,7 +153,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="layout_consumeSpace">horizontal</item>
 		<item name="android:layout_width">wrap_content</item>
 		<item name="android:layout_height">match_parent</item>
-		<item name="android:layout_marginBottom">2dp</item>
+		<item name="android:layout_marginBottom">2dp</item><!-- NOTE: see also EqLinearKnob_paddingTB. Total is 4dp for port -->
 		
 		<item name="android:disabledAlpha">1</item><!-- NOTE: keeping it full alpha - using xml drawable disabled state instead -->
 		<item name="layout_unlimitedMeasure">true</item>
@@ -179,11 +197,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		
 	<style name="EqPreampLinearKnob" parent="EqLinearKnob">
 		<item name="android:layout_gravity">center_horizontal</item>
-		<!--suppress AndroidDomInspection -->
 		<item name="layout_consumeSpace">@null</item>
 		<item name="android:background">@null</item>
 		<item name="labelBackground">@null</item>
-		
+
 		<item name="holeColorStartPoint">0.5</item>				
 	</style>
 		
@@ -284,8 +301,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<style name="EqButton" parent="WhiteButtonBase"><!-- styles-eq usage only -->
 		<item name="android:gravity">center</item>
 		<item name="android:layout_marginLeft">8dp</item>
-		<item name="android:layout_height">@dimen/EqButton_layout_height</item><!-- 32dp -->
-		<item name="android:minWidth">@dimen/EqButton_layout_width</item><!-- 64dp -->
+		<item name="android:layout_height">@dimen/EqButton_height</item><!-- 32dp -->
+		<item name="android:minWidth">@dimen/EqButton_width</item><!-- 64dp -->
 		<item name="android:ellipsize">end</item>
 		<item name="android:textAppearance">?EqButton_Text</item>
 		<item name="android:paddingLeft">@dimen/EqButton_paddingLR</item><!-- 12dp -->
@@ -302,6 +319,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 			
 	
 	<style name="EqEquButton" parent="EqCheckButton">
+		<item name="layout_widthPercent">@fraction/left_buttons_width</item>
 		<item name="android:layout_marginBottom">0dp</item>
 		<item name="layout_attachBottom">@id/tone_panel</item>
 		<item name="layout_attachLeft">parent</item>
@@ -311,6 +329,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	</style>
 	
 	<style name="EqToneButton" parent="EqCheckButton">
+		<item name="layout_widthPercent">@fraction/left_buttons_width</item>
 		<item name="android:layout_marginTop">6dp</item>
 		<item name="layout_attachTop">@id/equ_button</item>
 		<item name="layout_attachLeft">parent</item>
@@ -324,6 +343,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	</style>
 		
 	<style name="EqLimiterButton" parent="EqCheckButton">
+		<item name="layout_widthPercent">@fraction/left_buttons_width</item>
 		<item name="android:layout_marginTop">6dp</item>
 		<item name="android:layout_marginBottom">0dp</item>
 		<item name="layout_attachTop">@id/tone_button</item>
@@ -335,8 +355,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<style name="EqPresetButtonLayoutBase" parent="TopBaseButtonLayout">
 		<!-- Avoid paddings here as they apply to list as well -->
 		<item name="android:background">@drawable/rounded_stroke_button_layout_bg</item>
+
 		<!-- NOTE: can't use dynamic size due to current popup behavior, when we can't return to new size -->
-		<item name="android:layout_height">@dimen/EqButton_layout_height</item>
+		<item name="android:layout_height">@dimen/EqButton_height</item>
 		<item name="android:clickable">true</item>
 		<item name="android:focusable">true</item>
 		<item name="android:focusableInTouchMode">false</item>
@@ -344,16 +365,70 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		
 		<item name="listItemSize">@dimen/EqPresetButtonLayoutBase_listItemSize</item>
 		<item name="disableParentLayoutForPopup">false</item>
+
+		<item name="popupListStyle">@style/EqPresetPopupListLayoutList</item>
+	</style>
+
+	<!-- NOTE: this is used for the EqPresetActivity - dialog_content_eq_presets -->
+	<style name="EqPresetListLayout" parent="ExpandedListLayoutBase">
+	</style>
+
+	<!-- See EqEquPresetButtonLayout_scene_button_menu for the popup height -->
+	<style name="EqPresetPopupListLayoutList" parent="PopupListLayoutList">
+		<item name="android:layout_height">match_parent</item><!-- This grows to max available size we allow for popups -->
 	</style>
+
 	<style name="EqEquPresetButtonLayout" parent="EqPresetButtonLayoutBase">
-		<item name="android:layout_width">@dimen/EqEquPresetButtonLayout_layout_width</item>
-		<item name="layout_attachRight">@id/save_button</item>
+		<item name="android:layout_width">@dimen/EqEquPresetButtonLayout_width</item>
+		<item name="layout_attachRight">@null</item>
+		<item name="android:layout_gravity">center_horizontal</item>
 		<item name="layout_attachBottom">@id/tone_panel</item>
 		<item name="android:layout_marginTop">8dp</item>
-		<item name="android:layout_marginLeft">@dimen/EqButton_marginSide</item>
+		<!-- This is needed as list can be overlapped by the selection menu, so we may want to have this space always available -->
+		<item name="bottomReservedSpace">100dp</item>
+	</style>
+
+	<!-- REVISIT: somehow generalize dialog size so there is no need for multiple same layout definitions? -->
+	<!-- NOTE: this should have same layout as EqEquPresetButtonLayout_scene_button_menu, except for margins,
+	     which are already applied for the dialog -->
+	<style name="CenteredDialogFrame_EqPresetsActivity" parent="CenteredDialogFrame">
+		<item name="android:layout_width">0dp</item>
+		<item name="android:layout_height">0dp</item>
+		<!-- TODO: limit for port and land, limit for tablets, min height/width -->
+		<item name="layout_widthPercent">100%</item>
+		<item name="layout_heightPercent">@fraction/EqEquPresetButtonLayout_scene_button_menu_heightPercent</item><!-- ~60% -->
+		<item name="layout_maxHeight">10240dp</item>
+		<item name="layout_maxWidth">560dp</item>
+	</style>
+
+	<!-- NOTE: this should have same layout as EqEquPresetButtonLayout_scene_button_menu, except for margins,
+	     which are already applied for the dialog -->
+	<style name="CenteredDialogFrame_EqPresetsActivity_scene_dialog_in" parent="CenteredDialogFrame_scene_dialog_in">
+		<item name="android:layout_width">0dp</item>
+		<item name="android:layout_height">0dp</item>
+		<!-- TODO: limit for port and land, limit for tablets, min height/width -->
+		<item name="layout_widthPercent">100%</item>
+		<item name="layout_heightPercent">@fraction/EqEquPresetButtonLayout_scene_button_menu_heightPercent</item><!-- ~60% -->
+		<item name="layout_maxHeight">10240dp</item>
+		<item name="layout_maxWidth">560dp</item>
 	</style>
+
+	<!-- This defines preset popup size -->
+	<!-- NOTE: we need enough room on the bottom to fit selection menu.
+	     Also, for the landscape we need different layout -->
 	<style name="EqEquPresetButtonLayout_scene_button_menu" parent="ItemPopupList_scene_item_menu">
-		<item name="android:layout_width">@dimen/ItemPopupMenu_larger_scene_item_menu_width</item>		
+		<item name="android:layout_width">0dp</item>
+		<item name="android:layout_height">0dp</item>
+		<!-- TODO: limit for port and land, limit for tablets, min height/width -->
+		<item name="layout_widthPercent">100%</item>
+		<item name="layout_heightPercent">@fraction/EqEquPresetButtonLayout_scene_button_menu_heightPercent</item><!-- ~60% -->
+		<item name="layout_maxHeight">10240dp</item>
+		<item name="layout_minHeight">300dp</item>
+		<item name="layout_maxWidth">560dp</item>
+		<item name="android:layout_marginLeft">16dp</item>
+		<item name="android:layout_marginRight">16dp</item>
+		<item name="android:layout_marginTop">16dp</item>
+		<item name="android:layout_marginBottom">16dp</item>
 	</style>
 	
 	<!-- Text should be similar to EqButton -->
@@ -376,43 +451,50 @@ s		<item name="android:textAppearance">?EqEquPresetLabel_Text</item>
 		<item name="android:textSize">@dimen/EqButton_textSize</item>
 		<item name="android:textAllCaps">true</item>		
 	</style>
-	
+
+	<!-- Not used anymore -->
+	<!-- @Deprecated -->
 	<style name="EqEquSaveButton" parent="EqCheckButton">
 		<item name="layout_attachBottom">@id/tone_panel</item>
-		<item name="layout_attachRight">@id/reset_button</item>
+		<item name="layout_attachRight">@id/eq_menu</item>
 		<item name="android:layout_marginTop">8dp</item>
 		<item name="android:layout_marginLeft">@dimen/EqButton_marginSide</item><!-- Specifically overridden for smaller screens -->
 		
-		<item name="layout_maxWidth">@dimen/EqButton_layout_maxWidth</item>
+		<item name="layout_maxWidth">@dimen/EqButton_maxWidth</item>
 		<item name="android:textColor">@color/button_primary_text_color_selector</item>
 	</style>
-	
+
+	<!-- Not used anymore -->
+	<!-- @Deprecated -->
 	<style name="EqEquResetButton" parent="EqButton">
 		<item name="layout_attachBottom">@id/tone_panel</item>
 		<item name="layout_attachRight">parent</item>
 		<item name="android:layout_marginTop">8dp</item>
 		<item name="android:layout_marginRight">8dp</item>
 		<item name="android:layout_marginLeft">@dimen/EqButton_marginSide</item><!-- Specifically overridden for smaller screens -->
-		<item name="layout_maxWidth">@dimen/EqButton_layout_maxWidth</item>
+		<item name="layout_maxWidth">@dimen/EqButton_maxWidth</item>
 		<item name="android:ellipsize">end</item>
 	</style>
 		
 	
-	<!-- TonePanel contains bass and treble knob layouts. Size of TonePanel (calculated from the size of inner knobs) defines size of other components.
+	<!-- TonePanel contains bass and treble knob layouts. Size of TonePanel (calculated from the size of inner knobs)
+	     defines size of other components.
 		 layout_marginLeft offsets panel by the size of the left buttons (equ/tone/limit).
-		 We also compensate implicit bottom navbar padding with marginTop 
+		 We also compensate implicit bottom navbar padding with marginTop.
+		 NOTE: preferring padding over margin here - to allow a bit more room for the possible round knob hilite blur
+		 (which may be drawn slightly outside the bounds)
 	 -->
 	<style name="EqTonePanel">
-		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_width">0dp</item>
+		<item name="layout_widthPercent">@fraction/tone_panel_width</item>
 		<item name="android:layout_height">wrap_content</item>
 		<item name="layout_attachBottom">parent</item>
+		<item name="layout_attachRight">parent</item>
 		
-		<item name="android:layout_marginLeft">@dimen/EqEquButton_maxWidth</item>
-		<item name="android:layout_marginTop">@dimen/EqTonePanel_marginTop</item>
-		<item name="android:paddingLeft">@dimen/EqTonePanel_offsetLeft</item>
 		<item name="android:paddingRight">8dp</item>
-		<item name="android:paddingTop">@dimen/EqTonePanel_offsetTB</item>
-		<item name="android:paddingBottom">@dimen/EqTonePanel_offsetTB</item>
+		<!-- This is different for Pa vs Peq - for Peq we add a bit more room -->
+		<item name="android:paddingTop">?EqTonePanel_paddingTop</item>
+		<item name="android:paddingBottom">?EqTonePanel_paddingBottom</item>
 				
 		<item name="android:clipChildren">false</item>
 		<item name="android:clipToPadding">false</item>
@@ -434,11 +516,8 @@ s		<item name="android:textAppearance">?EqEquPresetLabel_Text</item>
 	<style name="EqBassToneKnobLayout" parent="EqToneKnobLayoutBase">
 		<item name="android:layout_width">0px</item>
 		<item name="layout_widthPercent">50%</item>
-		<item name="layout_attachRight">50%</item>
 		<item name="android:layout_height">wrap_content</item>
 		<item name="layout_maxHeight">@dimen/EqToneRoundKnobLayout_maxSize</item>
-		<item name="layout_maxWidth">@dimen/EqToneRoundKnobLayout_maxWidth</item><!-- Further limit width for large tablets -->
-		<item name="android:layout_marginRight">@dimen/EqToneKnobLayout_marginSide</item>
 	</style>
 	
 	<style name="EqTrebleToneKnobLayout" parent="EqToneKnobLayoutBase">
@@ -446,17 +525,16 @@ s		<item name="android:textAppearance">?EqEquPresetLabel_Text</item>
 		<item name="layout_widthPercent">50%</item>
 		<item name="android:layout_height">wrap_content</item>
 		<item name="layout_attachLeft">50%</item>
-				
 		<item name="layout_maxHeight">@dimen/EqToneRoundKnobLayout_maxSize</item>
-		<item name="layout_maxWidth">@dimen/EqToneRoundKnobLayout_maxWidth</item><!-- Further limit width for large tablets -->
-		<item name="android:layout_marginLeft">@dimen/EqToneKnobLayout_marginSide</item>
+		<!--<item name="android:background">#5f00</item>-->
 	</style>
 		
 	
 	<!-- NOTE: size of the tone round knob defines size of the parent layouts, location of buttons, position of frs and size of linear knobs.
 	     Tone knobs will try to fit available width (minus labels and buttons to the left) or size will be maxed up to EqRoundKnobLayout_maxSize -->
 	<style name="EqToneRoundKnob" parent="EqRoundKnob">
-		<item name="android:layout_width">match_parent</item><!-- Tries to get max avail width (minus labels and paddings/margins) -->
+		<item name="android:layout_width">0px</item><!-- Tries to get max avail width (minus labels and paddings/margins) -->
+		<item name="layout_widthPercent">63%</item>
 		<item name="android:layout_height">0px</item>
 		<item name="layout_matchDimension">heightToWidth</item>
 		<!-- We use fixed offset for knob, as it's unknown what will be the actual label (bass/treble) width as it depends on many factors (font, screen scale, translation, etc.),
@@ -464,20 +542,25 @@ s		<item name="android:textAppearance">?EqEquPresetLabel_Text</item>
 		<item name="layout_maxWidth">@dimen/EqToneRoundKnob_maxSize</item>
 		<item name="layout_maxHeight">@dimen/EqToneRoundKnob_maxSize</item>
 		<item name="android:layout_gravity">right</item>
+		<item name="layout_consumeSpace">horizontal</item>
+		<!--<item name="android:background">#50f0</item>-->
 	</style>
-	
+
+	<!-- NOTE: don't consume space as label may consume space depeding on the text size, causing knob to differ for tone -->
 	<style name="EqToneRoundKnobLabel" parent="EqLabelBg">
-		<item name="android:layout_width">@dimen/EqToneRoundKnobLabel_maxWidth</item>
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_marginLeft">4dp</item>
+		<item name="layout_maxWidth">@dimen/EqToneRoundKnobLabel_maxWidth</item>
 		<item name="android:layout_height">wrap_content</item>
 		<item name="android:layout_marginTop">@dimen/RoundKnobLabelLeftTop_marginTop</item>
-		<item name="layout_maxWidth">@dimen/EqToneRoundKnobLabel_maxWidth</item>
-		<item name="android:layout_marginRight">@dimen/EqToneRoundKnobLabel_marginRight</item><!-- Make label closer to round knob, thus leaving more space for the knob - knob grows -->
+		<!-- Force knob to be laid our first, so it consumes space and label puts itself into leftover space -->
+		<item name="layout_after">@id/_knob</item>
+		<item name="android:layout_marginRight">0dp</item>
 		<item name="android:maxLines">1</item>
 		<item name="android:ellipsize">end</item>
-		<!-- NOTE: don't consume space as label may consume space depeding on the text size, causing knob to differ for tone -->
-		<item name="layout_consumeSpace">horizontal</item>
 		<item name="android:id">@id/_label</item>
 		<item name="android:textAppearance">?EqKnobLabel_Text</item>
+		<!--<item name="android:background">#0f0</item>-->
 	</style>
 	
 	<style name="EqToneRoundKnobValueLabel" parent="EqLabelBg">
@@ -485,10 +568,10 @@ s		<item name="android:textAppearance">?EqEquPresetLabel_Text</item>
 		<item name="android:layout_height">wrap_content</item>
 		<item name="layout_attachTop">@id/_label</item>
 		<item name="layout_attachLeftToLeft">@id/_label</item>
-		<item name="android:layout_marginRight">@dimen/RoundKnobLabelLeftTop_marginRight</item><!-- REVISIT: makes little sense? -->
 		<item name="android:layout_marginTop">@dimen/EqRoundKnobValueLabel_marginTop</item>
 		
 		<item name="android:id">@id/_value_label</item>
+		<item name="android:importantForAccessibility">no</item>
 		<item name="android:gravity">left</item>
 		<item name="android:textAppearance">?EqKnobValueLarger_Text</item>
 	</style>
@@ -531,7 +614,7 @@ s		<item name="android:textAppearance">?EqEquPresetLabel_Text</item>
 	</style>
 	
 	<style name="EqResizableRoundKnobBase" parent="EqRoundKnob">
-		<!-- Wrap content means here take minumum available parent dimension and be a rectangle -->
+		<!-- Wrap content means here take available parent room and be a rectangle -->
 		<item name="android:layout_width">wrap_content</item>
 		<item name="android:layout_height">wrap_content</item>
 		<item name="android:layout_gravity">center_horizontal</item>
@@ -580,7 +663,7 @@ s		<item name="android:textAppearance">?EqEquPresetLabel_Text</item>
 		<item name="android:gravity">center</item>
 		<item name="android:layout_gravity">center_horizontal</item>
 		<item name="layout_attachTop">@id/_knob</item>
-		<item name="android:layout_marginTop">4dp</item>
+		<item name="android:layout_marginTop">@dimen/EqRoundKnobLabel_marginTop</item>
 		<item name="layout_maxWidth">@dimen/EqRoundKnobLabel_maxWidth</item>
 		
 		<item name="allowZeroHeight">true</item>
@@ -591,9 +674,10 @@ s		<item name="android:textAppearance">?EqEquPresetLabel_Text</item>
 	
 	<style name="EqRoundKnobValueLabel" parent="EqLabelBg">
 		<item name="android:id">@id/_value_label</item>
+		<item name="android:importantForAccessibility">no</item>
 		<item name="layout_attachTop">@id/_label</item>
 		<item name="android:layout_marginTop">@dimen/EqRoundKnobValueLabel_marginTop</item><!-- Extra margin applied for scripts with tall characters, such as Chinese -->
-				
+		<item name="android:layout_marginBottom">@dimen/EqRoundKnobValueLabel_marginBottom</item><!-- Increased for land large -->
 		<item name="android:layout_width">wrap_content</item>
 		<item name="android:layout_height">wrap_content</item>
 		<item name="android:layout_gravity">center_horizontal</item>
@@ -862,14 +946,14 @@ s		<item name="android:textAppearance">?EqEquPresetLabel_Text</item>
 	<!-- reverb_panel3 -->
 	
 	<style name="EqReverbCheckButton" parent="EqCheckButton">
-		<item name="layout_maxWidth">@dimen/EqButton_layout_maxWidth</item>
+		<item name="layout_maxWidth">@dimen/EqButton_maxWidth</item>
 		<item name="android:ellipsize">end</item>
 	</style>
 	
 	<style name="EqReverbPresetButtonLayoutBase" parent="EqPresetButtonLayoutBase">
 		<item name="android:background">@drawable/rounded_stroke_button_layout_bg</item>
-		<item name="android:layout_height">@dimen/EqButton_layout_height</item>
-		<item name="layout_maxWidth">@dimen/EqButton_layout_maxWidth</item>
+		<item name="android:layout_height">@dimen/EqButton_height</item>
+		<item name="layout_maxWidth">@dimen/EqButton_maxWidth</item>
 				
 		<item name="android:clickable">true</item>
 		<item name="android:focusable">true</item>
@@ -881,7 +965,7 @@ s		<item name="android:textAppearance">?EqEquPresetLabel_Text</item>
 	<style name="EqReverbPresetButtonLayout" parent="EqReverbPresetButtonLayoutBase">
 		<!-- Avoid paddings here as they apply to list as well -->
 		<item name="layout_attachRight">@id/reverb_save_button</item>
-		<item name="android:layout_width">@dimen/EqEquPresetButtonLayout_layout_width</item>
+		<item name="android:layout_width">@dimen/EqPresetButtonLayout_width</item>
 	</style>
 	<style name="EqReverbPresetButtonLayout_scene_button_menu" parent="ItemPopupList_scene_item_menu">		
 	</style>
@@ -902,7 +986,7 @@ s		<item name="android:textAppearance">?EqEquPresetLabel_Text</item>
 		<item name="layout_attachRight">@id/reverb_reset_button</item>
 		
 		<item name="android:layout_marginLeft">@dimen/EqButton_marginSide</item><!-- Specifically overridden for smaller screens -->
-		<item name="layout_maxWidth">@dimen/EqButton_layout_maxWidth</item>
+		<item name="layout_maxWidth">@dimen/EqButton_maxWidth</item>
 		<item name="android:ellipsize">end</item>
 	</style>
 	
@@ -912,7 +996,7 @@ s		<item name="android:textAppearance">?EqEquPresetLabel_Text</item>
 		<item name="layout_consumeSpace">vertical</item>
 		
 		<item name="android:layout_marginLeft">@dimen/EqButton_marginSide</item><!-- Specifically overridden for smaller screens -->
-		<item name="layout_maxWidth">@dimen/EqButton_layout_maxWidth</item>
+		<item name="layout_maxWidth">@dimen/EqButton_maxWidth</item>
 		<item name="android:ellipsize">end</item>
 	</style>
 		
@@ -953,6 +1037,7 @@ s		<item name="android:textAppearance">?EqEquPresetLabel_Text</item>
 	<!-- This is a value attached to the left side of the knob -->
 	<style name="EqReverbRoundKnobValueLabelLeftTop">
 		<item name="android:id">@id/_value_label</item>
+		<item name="android:importantForAccessibility">no</item>
 		<item name="android:textAppearance">?EqKnobValue_Text</item>
 		<item name="android:gravity">left</item>
 		<item name="android:layout_width">wrap_content</item>
@@ -1048,5 +1133,103 @@ s		<item name="android:textAppearance">?EqEquPresetLabel_Text</item>
 		<item name="android:textAppearance">?Hint</item>
 		<item name="android:textColor">?android:textColorTertiary</item>
 	</style>
-			
+
+
+	<style name="EqPresetSearchLayout">
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">wrap_content</item>
+		<!-- NOTE: this puts us above the list items and also gives shadow -->
+		<item name="android:translationZ">6dp</item>
+
+		<item name="android:paddingBottom">4dp</item>
+
+		<!-- We're going beyond layout dimension to better indicate scrollable filters -->
+		<item name="android:clipToPadding">false</item>
+		<item name="android:clipChildren">false</item>
+		<item name="android:background">@drawable/alpha_strict_rounded_large</item>
+		<item name="android:outlineProvider">none</item>
+	</style>
+
+	<style name="EqPresetSearchPanel" parent="TopSearchPanel">
+		<item name="android:layout_height">40dp</item>
+		<item name="android:layout_marginTop">7dp</item>
+		<item name="android:layout_marginBottom">0dp</item>
+		<item name="android:layout_marginLeft">6dp</item>
+		<item name="android:layout_marginRight">6dp</item>
+	</style>
+
+	<style name="EqPresetSearchCloseButton" parent="TopSearchCloseButton">
+	</style>
+
+	<!-- NOTE: background is provided by the panel, not the edit text -->
+	<style name="EqPresetSearchEditText" parent="TopListSearchEditText">
+		<item name="android:padding">@null</item>
+		<item name="android:paddingTop">2dp</item>
+		<item name="android:paddingBottom">2dp</item>
+		<item name="android:paddingRight">8dp</item>
+		<item name="android:paddingLeft">16dp</item>
+		<item name="android:drawablePadding">10dp</item>
+		<item name="drawableWidth">22dp</item>
+		<item name="drawableHeight">22dp</item>
+		<item name="android:textAppearance">?SmallerSearchEditText_Text</item>
+		<item name="android:layout_gravity">center_vertical</item>
+	</style>
+
+	<style name="EqPresetSearchCatsLayout" parent="TopSearchCatsLayout">
+		<item name="android:paddingTop">0dp</item>
+		<item name="android:layout_marginTop">0dp</item>
+		<item name="android:paddingBottom">2dp</item>
+		<!-- We're going beyond layout dimension to better indicate scrollable filters -->
+		<item name="android:clipToPadding">false</item>
+		<item name="android:clipChildren">false</item>
+		<item name="android:paddingLeft">2dp</item><!-- NOTE: buttons have leftMargin=2dp -->
+		<item name="android:paddingRight">4dp</item>
+	</style>
+
+	<style name="EqPresetSearchCatButton" parent="TopSearchCatButton">
+		<item name="layout_consumeSpace">horizontal</item>
+		<item name="android:layout_marginTop">4dp</item>
+		<item name="android:background">@drawable/checkable_non_tr_lighter_rounded_large</item>
+	</style>
+
+	<style name="EqPresetSearchCatSeparator">
+		<item name="android:layout_width">1dp</item>
+		<item name="android:layout_height">0dp</item>
+		<item name="layout_consumeSpace">horizontal</item>
+		<item name="layout_unlimitedMeasure">true</item>
+		<item name="android:layout_marginLeft">4dp</item>
+		<item name="android:layout_marginRight">0dp</item><!-- NOTE: button has marginLeft=4dp, so it's 8dp in total -->
+		<item name="android:layout_marginTop">6dp</item>
+		<item name="android:layout_marginBottom">4dp</item>
+		<item name="android:background">?colorStroke</item>
+	</style>
+
+	<style name="EqPresetSearchAssignLayout" parent="EqPresetSearchLayout">
+		<item name="android:paddingTop">4dp</item>
+	</style>
+
+	<style name="EqPresetSearchAssignCb">
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="layout_consumeSpace">vertical</item>
+		<item name="layout_attachLeft">parent</item>
+		<item name="android:layout_marginTop">8dp</item>
+		<item name="android:layout_marginBottom">0dp</item>
+		<item name="android:layout_marginLeft">4dp</item>
+		<item name="android:layout_marginRight">8dp</item>
+
+		<item name="android:gravity">center_vertical</item>
+		<item name="android:paddingTop">0dp</item>
+		<item name="android:paddingBottom">0dp</item>
+		<item name="android:paddingLeft">4dp</item>
+		<item name="drawablePaddingStart">12dp</item>
+		<item name="android:paddingRight">16dp</item>
+		<item name="android:clickable">true</item>
+		<item name="android:focusable">true</item>
+		<item name="android:drawable">?android:attr/listChoiceIndicatorMultiple</item>
+	</style>
+
+	<style name="EqPresetSearchDontSuggestCb" parent="EqPresetSearchAssignCb">
+		<item name="android:layout_marginTop">0dp</item>
+	</style>
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values/styles-item-eq-preset.xml b/poweramp_skin_sdk/reference_resources/values/styles-item-eq-preset.xml
new file mode 100644
index 00000000..ac069889
--- /dev/null
+++ b/poweramp_skin_sdk/reference_resources/values/styles-item-eq-preset.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2010-2023 Maksim Petrov
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted for themes, skins, widgets, plugins, applications and other software
+which communicate with Poweramp music player application on Android platform.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<resources
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:w="http://schemas.android.com/apk/res-auto"
+	>
+	<style name="ItemPopupListFrs" parent="ItemGenericImage">
+		<item name="android:clickable">false</item>
+		<item name="miniMode">true</item>
+		<item name="android:layout_width">80dp</item>
+		<item name="android:layout_height">36dp</item>
+		<item name="android:layout_marginRight">@dimen/ItemPopupListFrs_marginRight</item>
+
+		<item name="lineColor">?colorFrs</item>
+		<item name="glowColor">#0000</item>
+		<item name="lineWidth">1.5dp</item>
+		<item name="parametricLineWidth">1dp</item>
+		<item name="blurWidth">0</item>
+		<item name="backLineColor">?colorFrsBackline</item>
+		<item name="toneFillColor">?colorFrsToneFill</item>
+		<item name="toneLineColor">?colorFrsTone</item>
+		<item name="toneLineWidth">0.5dp</item>
+		<item name="toneGlowColor">#0000</item>
+
+		<!-- NOTE: theme default colors acceppted by Frs as well: graphicColorMax, etc. -->
+	</style>
+
+	<style name="ItemEqPresetTitle" parent="ItemPopupListTitleLarger">
+		<item name="android:layout_marginLeft">0dp</item>
+		<item name="android:drawablePadding">@dimen/ItemEqPresetTitle_drawablePadding</item>
+		<item name="android:ellipsize">marquee</item>
+	</style>
+	<style name="ItemEqPresetTitle_2line" parent="ItemPopupListTitleLarger_2line">
+		<item name="layout_attachBottom">@id/line2</item>
+		<item name="android:layout_marginLeft">0dp</item>
+		<item name="android:drawablePadding">@dimen/ItemEqPresetTitle_drawablePadding</item>
+		<item name="android:ellipsize">marquee</item>
+	</style>
+
+	<style name="ItemEqPresetLine2_2line" parent="ItemPopupListMicroIconBase">
+		<item name="layout_attachTop">50%</item>
+		<item name="android:layout_marginRight">4dp</item>
+		<item name="android:layout_marginLeft">20dp</item>
+		<item name="android:layout_marginTop">4dp</item>
+		<item name="layout_goneWhenEmpty">true</item>
+		<item name="layout_maxWidth">@null</item>
+		<item name="layout_consumeSpace">vertical</item>
+	</style>
+	<style name="ItemEqPresetLine2_3line" parent="ItemEqPresetLine2_2line">
+		<item name="layout_attachTop">@null</item>
+		<item name="android:layout_gravity">center_vertical|left</item>
+		<item name="android:layout_marginTop">2dp</item>
+		<item name="android:layout_marginBottom">2dp</item>
+	</style>
+
+	<!-- Spacer used to align icons to ItemPopupListTitleLarger_2line padding -->
+	<style name="ItemPopupListMicroIconSpace">
+		<item name="android:layout_width">17dp</item>
+		<item name="android:layout_height">0dp</item>
+		<item name="layout_consumeSpace">horizontal</item>
+	</style>
+
+	<style name="ItemPopupListMicroIconBase">
+		<item name="android:layout_width">wrap_content</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="layout_consumeSpace">horizontal</item>
+
+		<item name="drawableTint">?android:textColorSecondary</item>
+		<item name="android:textColor">?android:textColorSecondary</item>
+		<item name="android:textAppearance">?Hint</item>
+		<item name="android:gravity">center_vertical</item>
+		<item name="android:singleLine">true</item>
+		<item name="android:ellipsize">end</item>
+		<item name="android:drawablePadding">3dp</item>
+		<item name="drawablePaddingEndNoText">-3dp</item>
+		<item name="android:layout_marginLeft">2dp</item>
+		<item name="layout_alignToContent">all</item>
+		<item name="eatFontPads">true</item>
+		<item name="android:clipToPadding">false</item>
+		<item name="android:paddingTop">4dp</item>
+		<item name="android:paddingBottom">4dp</item>
+	</style>
+
+	<style name="ItemPopupListMicroIcon" parent="ItemPopupListMicroIconBase">
+		<item name="layout_attachTop">@id/line2</item>
+		<item name="layout_maxWidth">100dp</item>
+		<item name="android:layout_marginTop">4dp</item>
+	</style>
+
+
+	<style name="ItemEqPreset" parent="ItemPopupList">
+		<item name="android:paddingLeft">8dp</item>
+	</style>
+
+	<style name="ItemEqPresetLock" parent="PeqLockLabelBase">
+		<item name="layout_gravityTarget">@id/frs</item>
+		<item name="android:layout_gravity">center</item>
+		<item name="android:padding">6dp</item>
+		<item name="android:background">@drawable/ripple_primary_bg_generic</item>
+	</style>
+
+	<style name="ItemEqPresetSelectBox" parent="ItemPopupListSelectBox">
+		<item name="layout_consumeSpace">none</item><!-- Don't consume space as when it appears from GONE, it forces new consumed space value due to layout_attachLeftToLeft -->
+		<item name="layout_attachLeftToLeft">@id/frs</item>
+		<item name="android:layout_marginLeft">4dp</item>
+	</style>
+</resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values/styles-item-track.xml b/poweramp_skin_sdk/reference_resources/values/styles-item-track.xml
index 7b1a9a12..4ef104bc 100644
--- a/poweramp_skin_sdk/reference_resources/values/styles-item-track.xml
+++ b/poweramp_skin_sdk/reference_resources/values/styles-item-track.xml
@@ -1205,6 +1205,9 @@ NOTE: outlineProvider="@null" causes default outline provider (some shadow), use
 		<item name="layout_attachTop">@id/title</item>
 	</style>
 	<style name="ItemTrackLine2_scene_bottom_toolbar">
+		<!-- NOTE: we still need layout here to avoid keeping some previous layout which may reference us in cycles (e.g. rating) -->
+		<item name="android:layout_width">0px</item>
+		<item name="android:layout_height">0px</item>
 		<item name="android:visibility">gone</item>
 	</style>
 	<style name="ItemTrackLine2_scene_lyrics" parent="ItemTrackLine2_scene_item_menu">
@@ -1633,6 +1636,8 @@ NOTE: outlineProvider="@null" causes default outline provider (some shadow), use
 	<!-- NOTE: this is an interactive rating, which is visible only in aa and menu scenes.
 	           The list rating is cat_image static icon.
 		 NOTE: tint is done via drawable, see drawable/rating_star_24dp.xml -->
+	<!-- REVISIT: for the default style (==list item), do not attach to any other children to avoid possible cycles if some
+	     scene is not defined for layout, thus we may get into cycles -->
 	<style name="ItemRatingBar">
 		<item name="android:clickable">true</item>
 		<item name="android:focusable">true</item>
@@ -1640,8 +1645,7 @@ NOTE: outlineProvider="@null" causes default outline provider (some shadow), use
 		<item name="android:longClickable">true</item>
 		<item name="android:layout_width">wrap_content</item>
 		<item name="android:layout_height">wrap_content</item>
-		<item name="layout_attachTop">@+id/line2</item>
-		<item name="layout_attachLeftToLeft">@id/title</item>
+		<item name="android:layout_gravity">bottom|left</item>
 
 		<item name="android:outlineProvider">none</item>
 		<item name="android:translationZ">?over_aa_elevation</item>
@@ -1665,12 +1669,12 @@ NOTE: outlineProvider="@null" causes default outline provider (some shadow), use
 		<!-- NOTE: inivisible by default (e.g. when animating from a list) -->
 		<item name="android:visibility">invisible</item>
 	</style>
+	<!-- NOTE: avoid any references to other child here as it can cause cycles in some option combinations (such as rating in menu) -->
 	<style name="ItemRatingBar_scenes_invisible">
 		<item name="android:visibility">invisible</item>
 		<item name="android:layout_width">wrap_content</item>
 		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_gravity">bottom</item>
-		<item name="layout_attachLeftToLeft">@id/title</item>
+		<item name="android:layout_gravity">left|bottom</item>
 	</style>
 	<style name="ItemRatingBar_scene_aa">
 		<item name="android:visibility">visible</item>
@@ -1689,9 +1693,12 @@ NOTE: outlineProvider="@null" causes default outline provider (some shadow), use
 		<item name="lineBackground">@drawable/text_bg_alpha_rounded</item>
 		<item name="drawableTint">?colorRating</item>
 	</style>
-	<style name="ItemRatingBar_scene_aa_menu" parent="ItemRatingBar_scenes_invisible">
+	<style name="ItemRatingBar_scene_aa_menu">
 		<item name="android:visibility">gone</item>
-
+		<!-- Avoid attaching to title thus any layout cycles. Need layout for this -->
+		<item name="android:layout_width">wrap_content</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:layout_gravity">bottom</item>
 	</style>
 	<style name="ItemRatingBar_scene_item_menu_lu">
 		<item name="android:visibility">visible</item>
@@ -1951,6 +1958,7 @@ NOTE: outlineProvider="@null" causes default outline provider (some shadow), use
 		<item name="android:layout_width">match_parent</item>
 		<item name="android:layout_height">match_parent</item>
 		<item name="android:paddingLeft">10dp</item>
+		<item name="android:paddingRight">10dp</item>
 		<item name="android:gravity">left|center_vertical</item>
 	</style>
 
@@ -1963,6 +1971,9 @@ NOTE: outlineProvider="@null" causes default outline provider (some shadow), use
 		<item name="android:layout_width">wrap_content</item>
 		<item name="android:layout_height">match_parent</item>
 		<item name="android:textAppearance">?SeparatorWithButton_Text</item><!-- NOTE: text styling is e.g. for the derived SeparatorWithButtonButton -->
+		<!--<item name="lineBackground">@drawable/in_popup_rounded_large</item>&lt;!&ndash; Should have some contrast in popups as well &ndash;&gt;-->
+		<item name="android:paddingTop">2dp</item>
+		<item name="android:paddingBottom">2dp</item>
 	</style>
 	<!-- NOTE: shared between SeparatorWithButtonTitle/SeparatorWithButtonButton styles -->
 	<style name="SeparatorWithButton_Text" parent="TextAppearance.AppCompat">
@@ -1970,6 +1981,16 @@ NOTE: outlineProvider="@null" causes default outline provider (some shadow), use
 		<item name="android:textStyle">bold</item>
 	</style>
 
+	<style name="SeparatorLine">
+		<item name="android:layout_height">1dp</item>
+		<item name="layout_attachLeft">@id/title</item>
+		<item name="android:layout_gravity">center_vertical</item>
+		<item name="layout_gravityTarget">@id/title</item>
+		<item name="layout_attachRight">@id/line2</item>
+		<item name="android:background">?colorBgLight</item>
+		<item name="android:layout_marginRight">16dp</item>
+	</style>
+
 	<style name="SeparatorWithButtonButton" parent="ListItemSimpleSeparator">
 		<!-- NOTE: uses SeparatorWithButton_Text textAppearance -->
 		<item name="animOnClick">true</item>
@@ -2179,7 +2200,7 @@ NOTE: outlineProvider="@null" causes default outline provider (some shadow), use
 		<item name="android:maxLines">1</item>
 		<item name="android:paddingLeft">15dp</item>
 		<item name="android:paddingRight">15dp</item>
-		<item name="android:paddingTop">2dp</item>
+		<item name="android:paddingTop">2dp</item><!-- NOTE: added to possible drawable size -->
 		<item name="android:paddingBottom">2dp</item>
 
 		<item name="android:transformPivotX">0px</item>
diff --git a/poweramp_skin_sdk/reference_resources/values/styles-item.xml b/poweramp_skin_sdk/reference_resources/values/styles-item.xml
index c15d678b..d4185bfd 100644
--- a/poweramp_skin_sdk/reference_resources/values/styles-item.xml
+++ b/poweramp_skin_sdk/reference_resources/values/styles-item.xml
@@ -33,7 +33,7 @@ NOTE: outlineProvider="@null" causes default outline provider (some shadow), use
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:w="http://schemas.android.com/apk/res-auto"
 >
-	<!-- NOTE: derived by ItemPopupList_scene_item_menu -->
+	<!-- NOTE: derived by ItemPopupList_scene_item_menu. Defines the popup layout in the popup (expanded) state -->
 	<style name="ItemPopupMenu_scene_item_menu">
 		<item name="recalcChildren">on_start</item>
 		<item name="applyViewParams">true</item>
@@ -168,6 +168,7 @@ NOTE: outlineProvider="@null" causes default outline provider (some shadow), use
 	</style>
 	
 	<style name="ItemEmptyListSettingsButton" parent="ItemEmptyListSettingsButtonBase">
+		<item name="android:layout_marginTop">8dp</item>
 		<item name="android:layout_gravity">center_horizontal</item>
 		<item name="android:drawable">@drawable/settings_24dp</item>
 		<item name="drawableOnly">true</item>
@@ -343,7 +344,7 @@ NOTE: outlineProvider="@null" causes default outline provider (some shadow), use
 	
 	<style name="ItemPopupList" parent="ItemGenericBase">
 		<item name="android:background">@drawable/ripple_with_check_selector</item>
-		<item name="android:paddingRight">48dp</item><!-- NOTE: padding is needed for check icon in background -->
+		<item name="android:paddingRight">40dp</item><!-- NOTE: padding is needed for check icon in background -->
 		<item name="android:paddingLeft">16dp</item>
 	</style>
 	<style name="ItemPopupListMorePadding" parent="ItemPopupList">
@@ -372,7 +373,7 @@ NOTE: outlineProvider="@null" causes default outline provider (some shadow), use
 		<item name="hiRes">false</item>
 	</style>
 		
-	
+
 	<style name="ItemPopupListTitle" parent="ItemGenericTitle">
 		<item name="layout_attachBottom">@null</item>
 		<item name="android:layout_gravity">center_vertical</item>
@@ -381,14 +382,21 @@ NOTE: outlineProvider="@null" causes default outline provider (some shadow), use
 		<item name="android:layout_marginTop">0dp</item>
 		<item name="android:layout_marginBottom">0dp</item>
 		<item name="android:layout_marginLeft">12dp</item>
-		<item name="android:textAppearance">?ItemPopupListTitle_Text</item><!-- By default => ItemGenericTitle_Text -->
+		<item name="android:textAppearance">?ItemPopupListTitle_Text</item>
 	</style>
-	
+
 	<style name="ItemPopupListTitleLarger" parent="ItemPopupListTitle">
-		<item name="android:textAppearance">?ItemPopupListTitleLarger_Text</item><!-- By default => ItemGenericTitle_Text -->
+		<item name="android:drawablePadding">4dp</item>
+		<item name="drawablePaddingStart">0dp</item>
+		<item name="android:paddingLeft">0dp</item>
+		<item name="android:layout_marginLeft">16dp</item>
+
+		<item name="android:gravity">left|center_vertical</item>
+		<item name="android:textAppearance">?ItemPopupListTitleLarger_Text</item>
+		<item name="drawableTint">?android:textColorSecondary</item>
 	</style>
 	<style name="ItemPopupListTitleLarger_Text" parent="ItemGenericTitle_Text">
-		<item name="android:textSize">15dp</item>
+		<item name="android:textSize">17dp</item>
 	</style>
 	<style name="ItemPopupListTitleLarger_2line" parent="ItemPopupListTitleLarger">
 		<item name="layout_attachLeft">@null</item>
@@ -397,8 +405,9 @@ NOTE: outlineProvider="@null" causes default outline provider (some shadow), use
 		<item name="layout_attachBottom">50%</item>
 		<item name="android:layout_marginBottom">4dp</item>
 	</style>
-	
-	<style name="ItemPopupListLine2" parent="ItemGenericLine2"><!-- NOTE: not used ATM -->
+
+	<!-- NOTE: not used ATM -->
+	<style name="ItemPopupListLine2" parent="ItemGenericLine2">
 		<item name="layout_attachTop">@null</item>
 		<item name="android:layout_gravity">center_vertical</item>
 		<item name="android:layout_marginTop">0dp</item>
@@ -466,48 +475,6 @@ NOTE: outlineProvider="@null" causes default outline provider (some shadow), use
 		<item name="android:visibility">gone</item>
 	</style>
 		
-	<!-- eq -->
-	
-	<style name="ItemPopupListFrs" parent="ItemGenericImage">
-		<item name="android:clickable">false</item>
-		<item name="miniMode">true</item>
-		<item name="android:layout_width">80dp</item>
-		<item name="android:layout_height">36dp</item>
-		
-		<item name="lineColor">?colorFrs</item>
-		<item name="glowColor">#0000</item>
-		<item name="lineWidth">1dp</item>
-		<item name="blurWidth">0</item>
-		<item name="backLineColor">?colorFrsBackline</item>
-		<item name="toneFillColor">?colorFrsToneFill</item>
-		<item name="toneLineColor">?colorFrsTone</item>
-		<item name="toneLineWidth">0.5dp</item>
-		<item name="toneGlowColor">#0000</item>
-	</style>
-	
-	<!-- Spacer used to align icons to ItemPopupListTitleLarger_2line padding -->
-	<style name="ItemPopupListMicroIconSpace">
-		<item name="android:layout_width">10dp</item>
-		<item name="android:layout_height">0dp</item>
-		<item name="layout_consumeSpace">horizontal</item>
-	</style>
-	
-	<style name="ItemPopupListMicroIcon">
-		<item name="android:layout_width">wrap_content</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="layout_attachTop">50%</item>
-		<item name="android:layout_marginTop">4dp</item>
-		<item name="layout_consumeSpace">horizontal</item>
-		<item name="drawableTint">?android:textColorSecondary</item>
-		<item name="android:textColor">?android:textColorSecondary</item>
-		<item name="android:textAppearance">?Hint</item>
-		<item name="android:gravity">center_vertical</item>
-		<item name="android:singleLine">true</item>
-		<item name="layout_maxWidth">100dp</item>
-		<item name="android:ellipsize">end</item>
-		<item name="android:drawablePadding">3dp</item>
-	</style>
-	
 	<style name="ItemPopupListSelectBox" parent="ItemTrackSelectBox">
 		<item name="layout_consumeSpace">none</item><!-- Don't consume space as when it appears from GONE, it forces new consumed space value due to layout_attachLeftToLeft -->
 		<item name="layout_attachLeftToLeft">@id/aa_image</item>
@@ -523,14 +490,4 @@ NOTE: outlineProvider="@null" causes default outline provider (some shadow), use
 		<item name="android:layout_marginLeft">12dp</item>
 		<item name="android:layout_marginRight">8dp</item>
 	</style>
-
-	<style name="ItemEqPreset" parent="ItemPopupList">
-		<item name="android:paddingLeft">8dp</item>
-	</style>
-		
-	<style name="ItemEqPresetSelectBox" parent="ItemPopupListSelectBox">
-		<item name="layout_consumeSpace">none</item><!-- Don't consume space as when it appears from GONE, it forces new consumed space value due to layout_attachLeftToLeft -->
-		<item name="layout_attachLeftToLeft">@id/frs</item>
-		<item name="android:layout_marginLeft">4dp</item>
-	</style>
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values/styles-navbar.xml b/poweramp_skin_sdk/reference_resources/values/styles-navbar.xml
index 1c360fc6..d39091bd 100644
--- a/poweramp_skin_sdk/reference_resources/values/styles-navbar.xml
+++ b/poweramp_skin_sdk/reference_resources/values/styles-navbar.xml
@@ -129,6 +129,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="android:focusable">true</item>
 		<item name="clickDelay">@integer/activity_start_navbar_click_delay</item>
 		<item name="android:background">@drawable/ripple_rounded_mini</item>
+		<item name="android:contentDescription">@string/app_name</item>
 	</style>
 
 	<style name="NavbarExtensionLogoLabel">
@@ -224,6 +225,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<style name="NavbarPeqExtensionLogo" parent="NavbarExtensionLogo">
 		<item name="android:drawable">@drawable/logo_navbar_peq</item><!-- NOTE: overridden in Peq -->
 		<item name="android:layout_height">25dp</item>
+		<item name="android:contentDescription">@string/peq_app_name</item>
 	</style>
 
 	<style name="NavbarSeekbar" parent="@android:style/Widget.Material.SeekBar">
diff --git a/poweramp_skin_sdk/reference_resources/values/styles-options.xml b/poweramp_skin_sdk/reference_resources/values/styles-options.xml
index af57be90..523aa5ea 100644
--- a/poweramp_skin_sdk/reference_resources/values/styles-options.xml
+++ b/poweramp_skin_sdk/reference_resources/values/styles-options.xml
@@ -124,9 +124,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 	<style name="OptionNoHeaderButtons">
 		<item name="ItemTextHeaderShuffleButton_scene_header">@style/ItemTextHeaderButton_invisible</item>
+		<item name="ItemTextHeaderShuffleButton_scene_search_header">@style/ItemTextHeaderButton_invisible</item>
 		<item name="ItemTextHeaderPlayButton_scene_header">@style/ItemTextHeaderButton_invisible</item>
+		<item name="ItemTextHeaderPlayButton_scene_search_header">@style/ItemTextHeaderButton_invisible</item>
 		<item name="ItemTextHeaderSearchButton_scene_header">@style/ItemTextHeaderButton_invisible</item>
 		<item name="ItemTextHeaderSelectButton_scene_header">@style/ItemTextHeaderButton_invisible</item>
+		<item name="ItemTextHeaderSelectButton_scene_search_header">@style/ItemTextHeaderButton_invisible</item>
 		<item name="ItemTextMenu_scene_search_header">@style/ItemTextHeaderButton_invisible</item>
 		<item name="ItemTextMenu_scene_header">@style/ItemTextHeaderButton_invisible</item>
 		<item name="ItemTextMenu_scene_top_header">@style/ItemTextHeaderButton_invisible</item>
diff --git a/poweramp_skin_sdk/reference_resources/values/styles-peq-eq.xml b/poweramp_skin_sdk/reference_resources/values/styles-peq-eq.xml
index 601429ff..dbe775a1 100644
--- a/poweramp_skin_sdk/reference_resources/values/styles-peq-eq.xml
+++ b/poweramp_skin_sdk/reference_resources/values/styles-peq-eq.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (C) 2010-2020 Maksim Petrov
+Copyright (C) 2010-2023 Maksim Petrov
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted for themes, skins, widgets, plugins, applications and other software
@@ -23,18 +23,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:w="http://schemas.android.com/apk/res-auto"
 >	
-	<style name="ActivityTheme_Whitepro_PeqEqKnobsHiliteMonochromatic">
-		<item name="arcStartColor">@color/peq_eq_arc_start_mono_selector</item>
-		<item name="arcEndColor">@color/peq_eq_arc_end_mono_selector</item>
-		<item name="arcGlowStartColor">@color/peq_eq_arc_start_mono_selector</item>
-		<item name="arcGlowEndColor">@color/peq_eq_arc_end_mono_selector</item>
-				
-		<item name="holeStartColor">@color/peq_eq_arc_start_mono_selector</item>
-		<item name="holeEndColor">@color/peq_eq_arc_end_mono_selector</item>
-		<item name="holeGlowStartColor">@color/peq_eq_arc_start_mono_selector</item>
-		<item name="holeGlowEndColor">@color/peq_eq_arc_end_mono_selector</item>
-	</style>
-	
 	<!-- eqtab  -->
 		
 	<style name="PeqEqEnableVisFrs" parent="WhiteButtonBase">
@@ -65,27 +53,107 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 	<style name="PeqVisButtonLayoutBase" parent="EqPresetButtonLayoutBase">
 		<item name="android:background">@drawable/checkable_rounded_stroke_button_layout_bg</item>
-		<item name="buttonStyle">@style/PeqEqPopupButton</item>
-		<item name="menuButtonStyle">@style/PopupButton_scene_button_menu</item><!-- Use style with the forced tint -->
 		<item name="android:disabledAlpha">0</item><!-- Hide this completely when disabled (e.g. in PA) -->
+		<item name="dynamicButtons">true</item>
+
+		<item name="buttonStyle">@style/PeqEqPopupButton</item>
+		<item name="menuButtonStyle">@style/PeqEqPopupButton_scene_button_menu</item>
 	</style>
-	
-	
+
 	<style name="PeqVisButtonLayout" parent="PeqVisButtonLayoutBase">
+		<item name="android:layout_width">0dp</item>
+		<item name="layout_widthPercent">@fraction/left_buttons_width</item>
 		<item name="layout_attachTop">@+id/limiter_button</item>
-		<item name="android:layout_width">64dp</item>
+		<item name="layout_maxWidth">@dimen/EqEquButton_maxWidth</item>
 		<item name="android:layout_marginTop">6dp</item>
 		<item name="android:layout_marginLeft">8dp</item>
 		<item name="android:layout_marginBottom">0dp</item>
 	</style>
+
+	<!-- NOTE: this is a DynamicPopupButton, which is FastLayout itself:
+	     - we have additional styles for the inner icon and label views
+	     - some derived attribures used to configure normal PopupButton, such as drawable attributes are ignored
+
+		+====================================+ <- PeqEqPopupButton (==DynamicPopupButton -> FastLayout)
+		| +===========+ +==================+ |    - buttonStyle (while in button scene)
+		| |dynamicIcon| | dynamicLabel     | |    - menuButtonStyle (while in menu scene)
+		| +===========+ +==================+ |
+		+====================================+
+
+    -->
 	<style name="PeqEqPopupButton" parent="PopupButton">
-		<item name="drawableTint">@color/eq_icon_tint_color_selector</item><!-- NOTE: this removes "disabled" alpha from the icon and we use bg to indicate enabled state -->
+		<item name="recalcChildren">on_start</item>
+		<item name="android:paddingLeft">0dp</item>
+		<item name="android:paddingRight">0dp</item>
+		<item name="android:layout_width">wrap_content</item>
+		<item name="android:layout_gravity">center_horizontal</item>
+
+		<item name="dynamicIconStyle">@style/PeqEqPopupButtonIcon</item>
+		<item name="dynamicIconStyle_scene_menu">@style/PeqEqPopupButtonIcon_scene_menu</item>
+		<item name="dynamicLabelStyle">@style/PeqEqPopupButtonLabel</item>
+		<item name="dynamicLabelStyle_scene_menu">@style/PeqEqPopupButtonLabel_scene_menu</item>
+	</style>
+	<style name="PeqEqPopupButton_scene_button_menu">
+		<item name="scene">@id/scene_button_menu</item>
+		<item name="recalcChildren">on_start</item>
+		<item name="android:visibility">visible</item>
+		<item name="android:alpha">1</item>
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">@dimen/PopupButton_scene_button_menu</item>
+		<item name="layout_consumeSpace">vertical</item>
+		<item name="applyViewParams">true</item>
+		<item name="drawableTint">?colorIconPrimaryForced</item><!-- NOTE: @null/@empty is not supported ATM, need an explicit tint, thus using forced -->
+		<item name="android:background">@drawable/ripple_with_check_selector</item>
+	</style>
+
+	<style name="PeqEqPopupButtonIcon" parent="PopupButton">
+		<item name="recalcChildren">on_start</item>
+		<item name="android:layout_width">wrap_content</item>
+		<item name="android:layout_height">match_parent</item>
+		<item name="layout_consumeSpace">horizontal</item>
+
+		<item name="drawableTint">@color/eq_icon_tint_color_selector</item>
 		<item name="drawableWidth">28dp</item>
 		<item name="drawableHeight">28dp</item>
-		<item name="drawablePaddingStart">18dp</item>
-		<item name="android:paddingLeft">18dp</item>
+		<!-- Ensure that we have icon properly positioned centered in the button by resetting all the derived paddings -->
+		<item name="drawablePaddingStart">0dp</item>
+		<item name="android:paddingLeft">0dp</item>
+		<item name="android:paddingRight">0dp</item>
+		<item name="drawableOnly">true</item>
+		<item name="android:visibility">visible</item><!-- Force icon visibility as PopupButton is gone by default -->
+	</style>
+	<style name="PeqEqPopupButtonIcon_scene_menu">
+		<item name="scene">@id/scene_button_menu</item>
+		<item name="recalcChildren">on_start</item>
+		<item name="android:visibility">visible</item>
+		<item name="android:layout_width">wrap_content</item>
+		<item name="android:layout_height">match_parent</item>
+		<item name="layout_consumeSpace">horizontal</item>
+		<item name="android:layout_marginLeft">15dp</item><!-- Synchronizes visually to the usual popup buttons -->
+		<item name="android:layout_marginRight">0dp</item>
 	</style>
 
+	<style name="PeqEqPopupButtonLabel" parent="PopupButton">
+		<item name="recalcChildren">on_start</item>
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">match_parent</item>
+		<item name="android:paddingLeft">8dp</item>
+		<item name="layout_consumeSpace">@null</item>
+		<item name="android:visibility">gone</item><!-- Ensure we don't have label initially visible -->
+		<item name="android:background">@null</item>
+	</style>
+	<style name="PeqEqPopupButtonLabel_scene_menu">
+		<item name="scene">@id/scene_button_menu</item>
+		<item name="recalcChildren">on_start</item>
+		<item name="android:visibility">visible</item>
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">match_parent</item>
+		<item name="layout_consumeSpace">@null</item>
+		<item name="android:layout_marginLeft">5dp</item><!-- Synchronizes visually to the usual popup buttons -->
+		<item name="android:layout_marginRight">8dp</item>
+	</style>
+
+
 	
 	<!-- vol tab -->
 	
@@ -185,26 +253,30 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	
 	<style name="PeqVolumeKnobLayout" parent="EqVolumeKnobLayout">
 	</style>
-	
-	<style name="PeqLockLabel">
+
+	<style name="PeqLockLabelBase">
 		<item name="android:layout_width">wrap_content</item>
 		<item name="android:layout_height">wrap_content</item>
-		<item name="android:textAppearance">?EqKnobValueLarger_Text</item>
-		<item name="layout_gravityTarget">@id/_knob</item>
-		<item name="android:layout_gravity">center</item>
-		<item name="android:id">@id/_lock_label</item>
-		<item name="android:translationZ">10dp</item>
 		<item name="android:drawable">@drawable/lock_24dp</item>
-		<item name="drawableTint">?colorIconPrimary</item>
 		<item name="drawableOnly">true</item>
+		<item name="drawableTint">?colorIconPrimary</item>
 		<item name="android:padding">4dp</item>
 		<item name="android:background">@drawable/ripple_rounded_mini</item>
+		<item name="android:translationZ">10dp</item>
 		<item name="android:elevation">?control_elevation</item>
 		<item name="android:clickable">true</item>
 		<item name="animOnClick">true</item>
 		<item name="busId">@id/bus_app_cmd</item>
 		<item name="msgId">@id/cmd_app_open_settings</item>
 		<item name="string">peq_singlepane#buy_stub</item>
+		<item name="android:visibility">gone</item>
+		<item name="android:outlineProvider">none</item>
+	</style>
+
+	<style name="PeqLockLabel" parent="PeqLockLabelBase">
+		<item name="layout_gravityTarget">@id/_knob</item>
+		<item name="android:layout_gravity">center</item>
+		<item name="android:id">@id/_lock_label</item>
 	</style>
 		
 	<!-- Reverb -->
diff --git a/poweramp_skin_sdk/reference_resources/values/styles-peq.xml b/poweramp_skin_sdk/reference_resources/values/styles-peq.xml
index 1b668860..8d52a6e9 100644
--- a/poweramp_skin_sdk/reference_resources/values/styles-peq.xml
+++ b/poweramp_skin_sdk/reference_resources/values/styles-peq.xml
@@ -42,14 +42,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	</style>
 
 	<style name="PeqStyles">
+		<item name="EqTonePanel_paddingTop">@dimen/Peq_EqTonePanel_paddingTop</item>
+		<item name="EqTonePanel_paddingBottom">@dimen/Peq_EqTonePanel_paddingBottom</item>
 	</style>
 
 
 	<style name="TopPeqEqLayoutBase" parent="TopEqLayoutBase">
 		<item name="android:visibility">visible</item>
 		<item name="layout_marginBottomRef">@id/navbar_bounds_size</item>
-		<!--<item name="android:layout_marginBottom">8dp</item>-->
-		<item name="android:paddingBottom">8dp</item>
+		<item name="android:paddingBottom">@dimen/TopPeqEqLayoutBase_paddingBottom</item><!-- 8dp, reduced for land -->
 		<item name="layout_attachLeft">inset</item>
 		<item name="layout_attachRight">inset</item>
 	</style>
@@ -57,7 +58,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	</style>
 
 	<style name="TopPeqEqLayoutBase_scenes_vis" parent="TopPeqEqLayout">
-		<!-- Margin top: 48dp + 8dp -->
+		<!-- Margin top: 48dp + 8dp. Overridden for land -->
 		<item name="android:layout_marginTop">@dimen/TopPeqEqLayoutBase_scenes_vis_marginTop</item>
 	</style>
 	<style name="TopPeqEqLayout_scenes_vis" parent="TopPeqEqLayoutBase_scenes_vis">
diff --git a/poweramp_skin_sdk/reference_resources/values/styles-popup.xml b/poweramp_skin_sdk/reference_resources/values/styles-popup.xml
index dba63d52..3c58be28 100644
--- a/poweramp_skin_sdk/reference_resources/values/styles-popup.xml
+++ b/poweramp_skin_sdk/reference_resources/values/styles-popup.xml
@@ -62,19 +62,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="layout_attachBottomToBottom">@+id/dsp_info_text</item>
 		<item name="android:layout_marginLeft">23dp</item>
 	</style>
-	
-	<style name="PopupDSPInfoText" parent="PopupInfoText">		
+
+	<!-- NOTE: text styles are taken from theme -->
+	<style name="PopupDSPInfoText" parent="PopupInfoText">
 		<item name="android:layout_marginLeft">38dp</item>
 		<item name="android:layout_marginTop">6dp</item>
 		<item name="drawableTint">?colorIconPrimary</item>
 		<item name="unknownIcon">@drawable/question_24dp</item>
-		
+
+		<item name="subheadPadding">4sp</item>
+
 		<item name="arrowWidth">10dp</item>
 		<item name="arrowHeight">8dp</item>
 		<item name="arrowOffset">1dp</item>
 		<item name="arrowLineWeight">2dp</item>
 		<item name="arrowFillColor">?android:textColorSecondary</item>
-		<!-- NOTE: text styles are taken from theme -->
 	</style>
 	<style name="PopupDSPInfoText_HeadText" parent="HeadText">
 		<item name="android:textStyle">normal</item>
diff --git a/poweramp_skin_sdk/reference_resources/values/styles-powerui-popup.xml b/poweramp_skin_sdk/reference_resources/values/styles-powerui-popup.xml
index 563c5352..173f5f54 100644
--- a/poweramp_skin_sdk/reference_resources/values/styles-powerui-popup.xml
+++ b/poweramp_skin_sdk/reference_resources/values/styles-powerui-popup.xml
@@ -44,7 +44,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		
 		<item name="android:gravity">left|center_vertical</item>
 		<item name="drawablePaddingStart">16dp</item>
-<!--		<item name="android:background">?android:selectableItemBackground</item>-->
+		<!--<item name="android:background">?android:selectableItemBackground</item>-->
 		<item name="android:background">@drawable/ripple_rounded_mini</item>
 	</style>
 	<style name="PopupMenuItem_Text" parent="TextAppearance.AppCompat">
@@ -56,25 +56,33 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="layout_consumeSpace">horizontal|reset_auto</item>
 		<item name="android:maxLines">1</item>
 	</style>
+
+	<style name="CheckablePopupItem" parent="PopupMenuItem">
+		<item name="android:background">@drawable/ripple_with_check_selector</item>
+	</style>
 	
 	<!-- Popup Buttons -->
 	<!-- NOTE: PopupButton clickability is manipulated by PopupButtonLayout as needed -->
-	<!-- NOTE: rather large buttons, e.g. sub-aa buttons on main screen -->
+	<!-- NOTE: these are rather large buttons, e.g. sub-aa buttons on main screen -->
 	<style name="PopupButton">
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">match_parent</item>
+
 		<item name="drawablePaddingStart">@dimen/PopupButtons_paddingLeft</item><!-- Padding before image -->
 		<item name="android:paddingLeft">@dimen/PopupButtons_paddingLeft</item><!-- 18dp -->
 		<item name="android:paddingRight">40dp</item><!-- Extra padding to the right for a possible check drawable -->
 		<item name="android:paddingTop">2dp</item>
 		<item name="android:paddingBottom">2dp</item>
-		<item name="android:layout_width">match_parent</item>
-		<item name="android:layout_height">match_parent</item>
+
 		<item name="drawablePosition">left</item>
 		<item name="drawableWidth">@dimen/PopupButtons_drawableSize</item><!-- ~32dp, smaller for smaller screens -->
 		<item name="drawableHeight">@dimen/PopupButtons_drawableSize</item>
 		<item name="android:hapticFeedbackEnabled">true</item>
 		<item name="drawableTint">?colorIconLessContrast</item>
   		<item name="android:maxLines">1</item>
-		
+
+		<item name="android:visibility">gone</item><!-- Maniuplated by the code and scenes -->
+
   		<item name="android:textAppearance">?PopupButton_Text</item>
   		
 		<item name="android:ellipsize">end</item>
@@ -86,11 +94,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   			 NOTE: thus using optimized #000000000 color instead (causes no extra drawables in FastButton) 
   		-->
   		<!-- <item name="android:background">@empty</item> -->
-  		<item name="android:background">#00000000</item><!-- NOTE: still, extra drawable is created when button is created with this style -->
+  		<item name="android:background">#00000000</item>
   		<item name="android:gravity">left|center_vertical</item>
 		<item name="applyViewParams">true</item><!-- NOTE: needed for tint -->
   		<item name="recalcChildren">on_start</item>
-  		<item name="android:visibility">gone</item>
   	</style>
 	<style name="PopupButton_Text" parent="TextAppearance.AppCompat">
 		<item name="android:textSize">16dp</item>
@@ -140,12 +147,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<style name="PopupDialogListLayoutList"><!-- Used for separate dialogs with popup lists, e.g. for Playlist select dialog -->
 		<item name="android:layout_width">match_parent</item>
 		<item name="android:layout_height">match_parent</item>
+		<!-- NOTE: disabled as default Android seekbars do not play well with the rounded backgrounds -->
 <!--		<item name="android:scrollbars">vertical</item>-->
 		<item name="android:nestedScrollingEnabled">true</item>
 	</style>
 	
 	<style name="ExpandedListLayoutBase" parent="PopupDialogListLayoutList">
 		<item name="android:layout_width">match_parent</item>
+		<!-- NOTE: disabled as default Android seekbars do not play well with the rounded backgrounds -->
 <!--		<item name="android:scrollbars">vertical</item>-->
 		<item name="android:nestedScrollingEnabled">true</item>
 	</style>
@@ -154,14 +163,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="android:layout_height">224dp</item><!-- 64 * 3.5 -->
 	</style>
 	
-	<style name="EqPresetListLayout" parent="ExpandedListLayoutBase">
-		<item name="android:layout_height">@dimen/PopupLayoutList_height</item>
-	</style>
-	
 	<style name="PopupListLayoutList">
 		<item name="android:layout_width">match_parent</item>
 		<item name="android:layout_height">@dimen/PopupLayoutList_height</item>
-<!--		<item name="android:scrollbars">vertical</item>-->
+		<!-- NOTE: disabled as default Android seekbars do not play well with the rounded backgrounds -->
+		<!--<item name="android:scrollbars">vertical</item>-->
 	</style>
 		
 	<style name="PopupListLayoutLabel">
@@ -180,6 +186,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	</style>
 
 	<style name="GenericPowerList">
+		<!-- NOTE: disabled as default Android seekbars do not play well with the rounded backgrounds -->
 <!--		<item name="android:scrollbars">vertical</item>-->
 	</style>
 	
diff --git a/poweramp_skin_sdk/reference_resources/values/styles-powerui-styles.xml b/poweramp_skin_sdk/reference_resources/values/styles-powerui-styles.xml
index e5cb16e0..57d7c9c4 100644
--- a/poweramp_skin_sdk/reference_resources/values/styles-powerui-styles.xml
+++ b/poweramp_skin_sdk/reference_resources/values/styles-powerui-styles.xml
@@ -100,7 +100,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="ItemPopupListMicroIconSpace">@style/ItemPopupListMicroIconSpace</item>
 		<item name="ItemPopupListFrs">@style/ItemPopupListFrs</item>
 		<item name="ItemEqPreset">@style/ItemEqPreset</item>
+		<item name="ItemEqPresetLock">@style/ItemEqPresetLock</item>
 		<item name="ItemEqPresetSelectBox">@style/ItemEqPresetSelectBox</item>
+		<item name="ItemEqPresetTitle">@style/ItemEqPresetTitle</item>
+		<item name="ItemEqPresetTitle_2line">@style/ItemEqPresetTitle_2line</item>
+		<item name="ItemEqPresetLine2_2line">@style/ItemEqPresetLine2_2line</item>
+		<item name="ItemEqPresetLine2_3line">@style/ItemEqPresetLine2_3line</item>
 		
 		<item name="ItemPopupSimpleTitle">@style/ItemPopupSimpleTitle</item>
 		<item name="ItemPopupSimpleTitle_Text">@style/ItemPopupSimpleTitle_Text</item>
@@ -145,6 +150,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="PopupMenuItem">@style/PopupMenuItem</item>
 		<item name="PopupMenuItem_Text">@style/PopupMenuItem_Text</item>
 		<item name="PopupMenuItem50">@style/PopupMenuItem50</item>
+		<item name="CheckablePopupItem">@style/CheckablePopupItem</item>
 		
 		<item name="BlackButton_Text">@style/BlackButton_Text</item>
 		<item name="WhiteButton_Text">@style/WhiteButton_Text</item>
@@ -566,7 +572,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="TopMilk">@style/TopMilk</item>
 		<item name="TopListWidget">@style/TopListWidget</item>
 		<item name="TopAABounds">@style/TopAABounds2</item>
-		
+
 		<item name="TopListScrollerView">@style/TopListScrollerView</item>
 		<item name="TopListScrollerView_Text">@style/TopListScrollerView_Text</item>
 		<item name="TopListScrollerView_state_scrollbar_pressed">@style/TopListScrollerView_state_scrollbar_pressed</item>
@@ -702,8 +708,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="EqEquPresetButtonLayout_scene_button_menu">@style/EqEquPresetButtonLayout_scene_button_menu</item>
 		<item name="EqEquPresetLabel">@style/EqEquPresetLabel</item>
 		<item name="EqEquPresetLabel_Text">@style/EqEquPresetLabel_Text</item>
+		<item name="EqMenu">@style/EqMenu</item>
+		<item name="EqMenu_scene_item_menu">@style/EqMenu_scene_item_menu</item>
+		<item name="EqMenuIcon">@style/EqMenuIcon</item>
+		<item name="EqMenuLayoutItems">@style/EqMenuLayoutItems</item>
+		<!--
 		<item name="EqEquSaveButton">@style/EqEquSaveButton</item>
 		<item name="EqEquResetButton">@style/EqEquResetButton</item>
+		-->
+
 		<item name="EqTonePanel">@style/EqTonePanel</item>
 		<item name="EqBassToneKnobLayout">@style/EqBassToneKnobLayout</item>
 		<item name="EqTrebleToneKnobLayout">@style/EqTrebleToneKnobLayout</item>
@@ -735,6 +748,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="EqParamColorPopupLayout_scene_item_menu">@style/EqParamColorPopupLayout_scene_item_menu</item>
 		<item name="EqParamColorPopupIcon">@style/EqParamColorPopupIcon</item>
 		<item name="EqParamEditButton">@style/EqParamEditButton</item>
+		<item name="EqParamLockButton">@style/EqParamLockButton</item>
 		<item name="EqParamLRPopupButtonLayout">@style/EqParamLRPopupButtonLayout</item>
 		<item name="EqParamTypePopupButtonLayout">@style/EqParamTypePopupButtonLayout</item>
 		<item name="EqParamQRoundKnob">@style/EqParamQRoundKnob</item>
@@ -817,6 +831,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="TopUpperToastLine2_Text">@style/TopUpperToastLine2_Text</item>
 		<item name="TopUpperToastTitle_no_icon">@style/TopUpperToastTitle_no_icon</item>
 		<item name="TopUpperToastLine2_no_icon">@style/TopUpperToastLine2_no_icon</item>
+		<item name="TopUpperToastSeparator">@style/TopUpperToastSeparator</item>
 	</style>
 	
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values/styles-selection-menu.xml b/poweramp_skin_sdk/reference_resources/values/styles-selection-menu.xml
index 25b42f69..c32c3c71 100644
--- a/poweramp_skin_sdk/reference_resources/values/styles-selection-menu.xml
+++ b/poweramp_skin_sdk/reference_resources/values/styles-selection-menu.xml
@@ -220,7 +220,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="layout_consumeSpace">vertical</item>
 		<item name="applyViewParams">true</item>
 		<item name="drawableTint">?colorIconPrimaryForced</item><!-- NOTE: @null/@empty is not supported ATM, need explicit tint, thus using forced -->
-		<item name="android:background">@drawable/ripple_with_small_check_selector</item>
+		<item name="android:background">@drawable/ripple_with_check_selector</item>
 	</style>
 
 	<style name="SelectionListContextPopupButtonLayout">
@@ -241,18 +241,116 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 		<item name="android:background">@drawable/popup_button_layout_ripple_bg</item>
 
-		<item name="buttonStyle">@style/SelectionListContextPopupButton</item>
-		<item name="menuButtonStyle">@style/SelectionListContextPopupButtonInMenu</item>
 		<item name="android:disabledAlpha">0.7</item><!-- Match our disabled alpha for buttons as otherwise we're pulling this from the global or Android theme -->
+
+		<item name="dynamicButtons">true</item>
+
+		<item name="buttonStyle">@style/SelectionListContext_DynamicPopupButton</item>
+		<item name="menuButtonStyle">@style/SelectionListContext_DynamicPopupButtonInMenu</item>
 	</style>
 
 	<style name="SelectionListContextPopupButtonLayout_scene_item_menu" parent="ItemPopupMenu_scene_item_menu">
+		<!--<item name="recalcChildren">dynamic</item>&lt;!&ndash; Avoid not so good animation for the active button &ndash;&gt;-->
 		<item name="android:layout_width">wrap_content</item>
+		<!-- NOTE: BusSelectablePopupButtonLayout will try to fit popup into the button width by default,
+		     but if minWidth is specified, it will also try to apply that, allowing larger popup -->
+		<item name="layout_minWidth">260dp</item>
 		<item name="android:layout_marginLeft">16dp</item>
 		<item name="android:layout_marginRight">16dp</item>
-		<item name="recalcChildren">dynamic</item><!-- Avoid not so good animation for the active button -->
 		<item name="android:layout_gravity">top|left</item>
 		<item name="layout_attachBottom">parent</item>
 	</style>
 
+	<style name="SelectionListContext_DynamicPopupButton" parent="SelectionListContextPopupButton">
+		<item name="android:background">#00000000</item>
+		<item name="android:gravity">left|top</item>
+		<item name="android:paddingTop">0dp</item>
+		<item name="android:paddingBottom">0dp</item>
+		<item name="android:paddingLeft">0dp</item>
+		<item name="android:paddingRight">0dp</item>
+		<item name="dynamicIconStyle">@style/SelectionListContext_DynamicPopupButtonIcon</item>
+		<item name="dynamicIconStyle_scene_menu">@style/SelectionListContext_DynamicPopupButtonIcon_scene_menu</item>
+		<item name="dynamicLabelStyle">@style/SelectionListContext_DynamicPopupButtonLabel</item>
+		<item name="dynamicLabelStyle_scene_menu">@style/SelectionListContext_DynamicPopupButtonLabel_scene_menu</item>
+		<item name="dynamicLabel2Style">@style/SelectionListContext_DynamicPopupButtonLabel2</item>
+		<item name="dynamicLabel2Style_scene_menu">@style/SelectionListContext_DynamicPopupButtonLabel2_scene_menu</item>
+	</style>
+
+	<style name="SelectionListContext_DynamicPopupButtonInMenu" parent="SelectionListContextPopupButtonInMenu">
+		<item name="recalcChildren">dynamic</item>
+		<item name="scene">@id/scene_button_menu</item>
+		<item name="android:layout_marginTop">0dp</item>
+		<item name="android:layout_marginBottom">0dp</item>
+		<item name="android:layout_height">48dp</item>
+	</style>
+
+	<!-- NOTE: this should copy visual style of SelectionListContextPopupButton icon.
+	     We also replace padding with the margins to allow animating these -->
+	<style name="SelectionListContext_DynamicPopupButtonIcon" parent="DynamicPopupButtonIcon">
+		<item name="android:layout_width">wrap_content</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="layout_consumeSpace">vertical</item>
+		<item name="android:layout_gravity">center_horizontal</item>
+
+		<item name="android:paddingTop">4dp</item>
+		<item name="android:paddingBottom">0dp</item>
+
+		<item name="android:layout_marginTop">0dp</item>
+
+		<item name="drawableWidth">24dp</item>
+		<item name="drawableHeight">24dp</item>
+		<item name="drawableTint">?colorIconPrimary</item>
+		<item name="drawablePosition">left</item>
+	</style>
+	<style name="SelectionListContext_DynamicPopupButtonIcon_scene_menu" parent="DynamicPopupButtonIcon_scene_menu">
+		<item name="android:layout_width">wrap_content</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="layout_consumeSpace">horizontal</item>
+		<item name="android:layout_gravity">left|center_vertical</item>
+		<item name="android:layout_marginBottom">2dp</item><!-- Compensate paddingTop -->
+
+		<item name="android:layout_marginLeft">16dp</item>
+		<item name="android:layout_marginRight">16dp</item>
+	</style>
+
+	<!-- We replace padding with the margins to allow animating these -->
+	<style name="SelectionListContext_DynamicPopupButtonLabel" parent="SelectionListContextPopupButton">
+		<item name="android:layout_width">wrap_content</item>
+		<item name="android:layout_gravity">center_horizontal</item>
+		<item name="android:layout_marginTop">2dp</item>
+		<item name="android:layout_marginBottom">6dp</item>
+		<item name="android:visibility">visible</item>
+		<item name="android:gravity">left|top</item>
+
+		<item name="android:paddingLeft">0dp</item>
+		<item name="android:paddingRight">0dp</item>
+		<item name="android:paddingTop">0dp</item>
+		<item name="android:paddingBottom">0dp</item>
+	</style>
+	<style name="SelectionListContext_DynamicPopupButtonLabel_scene_menu" parent="DynamicPopupButtonLabel_scene_menu">
+		<!--<item name="recalcChildren">dynamic</item>-->
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:layout_gravity">center_vertical</item>
+		<item name="android:visibility">gone</item>
+		<!-- As non-active buttons are GONE for the initial state (we show just one active button),
+		     they won't properly animate anything for a label which is not laid out, thus we must force the visibility jump for it.
+		     jumpVisibility avoids checking for laid out state and always applies visibility for the scene -->
+		<!--<item name="jumpVisibility">true</item>-->
+		<item name="applyEvenIfGone">true</item>
+
+		<!--<item name="layout_consumeSpace">vertical</item>-->
+		<item name="android:layout_marginLeft">0dp</item><!-- Synchronizes visually to the usual popup buttons -->
+		<item name="android:layout_marginRight">16dp</item>
+		<item name="android:background">#f00</item>
+	</style>
+
+	<style name="SelectionListContext_DynamicPopupButtonLabel2" parent="SelectionListContext_DynamicPopupButtonLabel">
+		<item name="android:visibility">gone</item>
+	</style>
+	<style name="SelectionListContext_DynamicPopupButtonLabel2_scene_menu" parent="SelectionListContext_DynamicPopupButtonLabel_scene_menu">
+		<item name="android:visibility">visible</item>
+	</style>
+
+
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values/styles-settings.xml b/poweramp_skin_sdk/reference_resources/values/styles-settings.xml
index eb57eeac..d4f335e1 100644
--- a/poweramp_skin_sdk/reference_resources/values/styles-settings.xml
+++ b/poweramp_skin_sdk/reference_resources/values/styles-settings.xml
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="colorBgLessAlpha">?android:attr/colorBackground</item>
 		
 		<item name="colorInverse">?android:attr/colorForeground</item>
+		<item name="colorPlaybackRipple">?android:attr/colorForeground</item>
 		
 		<item name="colorBgInverse">?android:attr/colorForeground</item>
 		<item name="colorBgInverseChecked">?android:attr/colorControlActivated</item>
@@ -297,10 +298,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	
 	<style name="SettingsListOptsCheckboxLibrary" parent="android:Widget.Material.CompoundButton.CheckBox">
 		<item name="android:layout_width">match_parent</item>
+		<item name="android:drawablePadding">16dp</item>
 		<item name="android:layout_height">wrap_content</item>
 		<item name="layout_consumeSpace">vertical|reset_horizontal</item>
-		<item name="android:background">@null</item><!-- NOTE: backbround + ripple doesn't work for some reason (at least on 9) -->
-		<item name="android:foreground">?android:attr/selectableItemBackground</item>
+		<item name="android:background">@null</item><!-- NOTE: background + ripple doesn't work for some reason (at least on 9) &ndash;&gt;-->
+		<!--<item name="android:foreground">?android:attr/selectableItemBackground</item>-->
+		<item name="android:foreground">@drawable/ripple_hidden_rounded_large</item>
 	</style>
 	
 
@@ -607,18 +610,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="android:minWidth">48dp</item>
 		<item name="android:gravity">center_horizontal</item>
 		<item name="android:layout_marginTop">0dp</item>
-		<item name="android:layout_marginBottom">4dp</item>
+		<item name="android:layout_marginBottom">6dp</item>
 		<item name="android:layout_marginLeft">0dp</item>
-		<item name="android:layout_marginRight">8dp</item>
+		<item name="android:layout_marginRight">6dp</item>
 		<item name="layout_consumeSpace">stack_horizontal</item>
 
-		<item name="android:paddingLeft">14dp</item>
-		<item name="android:paddingRight">14dp</item>
-		<item name="android:paddingTop">4dp</item>
-		<item name="android:paddingBottom">4dp</item>
+		<item name="android:paddingLeft">16dp</item>
+		<item name="android:paddingRight">16dp</item>
+		<item name="android:paddingTop">5dp</item>
+		<item name="android:paddingBottom">5dp</item>
 		
 		<item name="android:textColor">@color/button_text_color_selector</item>
-		<item name="android:textSize">14sp</item>
+		<item name="android:textSize">15sp</item>
 		<item name="android:textStyle">normal</item>
 		
 		<item name="animOnClick">true</item>
@@ -626,6 +629,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		
 		<item name="android:maxLines">1</item>
 		<item name="android:ellipsize">end</item>
+		<item name="drawableTint">?android:textColorSecondary</item>
+		<item name="drawablePaddingStart">12dp</item>
+		<item name="android:drawablePadding">-10dp</item>
 		
 		<item name="android:background">@drawable/checkable_rounded_large</item><!-- NOTE: use simple background, not ripple to avoid anims / states-->
 	</style>
diff --git a/poweramp_skin_sdk/reference_resources/values/styles-text.xml b/poweramp_skin_sdk/reference_resources/values/styles-text.xml
index 8153818b..74961f64 100644
--- a/poweramp_skin_sdk/reference_resources/values/styles-text.xml
+++ b/poweramp_skin_sdk/reference_resources/values/styles-text.xml
@@ -21,7 +21,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 <resources 
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:w="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools" xmlns:w="http://schemas.android.com/apk/res-auto"
 >
 	<!-- NOTE: @style/TextAppearance.AppCompat is android:TextAppearance.Material -->
 
@@ -62,7 +62,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="android:textSize">@dimen/Hint_size</item>
 		<item name="android:textColor">?android:textColorTertiary</item>
 	</style>
-	
+
+	<style name="SmallerSearchEditText_Text" parent="TextAppearance.AppCompat.Medium.Inverse">
+		<item name="android:textSize">@dimen/SmallerSearchEditText_Text_size</item>
+	</style>
+
+
 	<!-- See also styles-*.xml for specific *Text styles -->
-	
+
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values/styles-top-toast.xml b/poweramp_skin_sdk/reference_resources/values/styles-top-toast.xml
index 64f887ec..a75d9925 100644
--- a/poweramp_skin_sdk/reference_resources/values/styles-top-toast.xml
+++ b/poweramp_skin_sdk/reference_resources/values/styles-top-toast.xml
@@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 >
 	<style name="TopToastContainer">
 		<item name="android:layout_width">match_parent</item>
-		<item name="android:layout_height">@dimen/TopToastContainer_layout_height</item>
+		<item name="android:layout_height">@dimen/TopToastContainer_height</item>
 		<item name="layout_attachBottom">parent</item>
 		<item name="android:translationZ">?modal_translationZ</item><!-- Needed to be ~above vis panel and popup menu placeholder. Currently this is defined by view order -->
 		<item name="android:outlineProvider">none</item>
@@ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	</style>
 	<style name="TopToastContainer_scenes_non_main">
 		<item name="android:layout_width">match_parent</item>
-		<item name="android:layout_height">@dimen/TopToastContainer_layout_height</item>
+		<item name="android:layout_height">@dimen/TopToastContainer_height</item>
 		<item name="layout_attachBottom">parent</item>
 		<item name="android:layout_marginBottom">44dp</item><!-- Extra offset for 2nd navigation line -->
 	</style>
@@ -100,14 +100,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<style name="TopToastTitle">
 		<item name="android:layout_width">wrap_content</item>
 		<item name="android:layout_height">wrap_content</item>
-		<item name="android:maxLines">2</item>
-		<item name="android:gravity">left|top</item>
 		<item name="layout_consumeSpace">vertical</item>
 		<item name="android:layout_marginLeft">@dimen/TopToastTile_marginLeft</item>
 		<item name="android:paddingTop">4dp</item>
 		<item name="android:paddingBottom">4dp</item>
 		<item name="layout_attachLeft">parent</item><!-- This makes it basically match_parent -->
 		<item name="layout_attachRight">parent</item>
+
+		<item name="android:maxLines">2</item>
+		<item name="android:gravity">left|top</item>
 		<item name="android:textAppearance">?TopToastTitle_Text</item>
 		<item name="eatFontPads">true</item>
 		<item name="applyViewParams">true</item>
@@ -134,12 +135,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="layout_attachRight">parent</item>
 		<item name="android:maxLines">2</item>
 		<item name="android:textAppearance">?TopToastLine2_Text</item>
-		<item name="allowZeroHeight">true</item>
 		<item name="android:paddingTop">3dp</item>
-		<item name="android:paddingBottom">5dp</item>
-		<item name="eatFontPads">true</item>
+		<item name="android:paddingBottom">2dp</item>
+		<item name="allowZeroHeight">true</item><!-- Only for FTV, which is not used now for line2 -->
+		<item name="eatFontPads">true</item><!-- Only for FTV, which is not used now for line2 -->
 		<item name="android:gravity">left|top</item>
 		<item name="applyViewParams">true</item>
+
+		<item name="layout_goneWhenEmpty">true</item>
+		<item name="android:includeFontPadding">false</item>
 	</style>
 	<style name="TopToastLine2_Text" parent="TextAppearance.AppCompat">
 		<item name="android:textSize">11sp</item>
diff --git a/poweramp_skin_sdk/reference_resources/values/styles-top-upper-toast.xml b/poweramp_skin_sdk/reference_resources/values/styles-top-upper-toast.xml
index 189ba660..9b144000 100644
--- a/poweramp_skin_sdk/reference_resources/values/styles-top-upper-toast.xml
+++ b/poweramp_skin_sdk/reference_resources/values/styles-top-upper-toast.xml
@@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 >
 	<style name="TopUpperToastContainer">
 		<item name="android:layout_width">match_parent</item>
-		<item name="android:layout_height">@dimen/TopToastContainer_layout_height</item>
+		<item name="android:layout_height">@dimen/TopToastContainer_height</item>
 		<item name="layout_attachTop">parent</item>
 		<item name="android:translationZ">?modal_translationZ</item><!-- Needed to be ~above vis panel and popup menu placeholder. Currently this is defined by view order -->
 		<item name="android:outlineProvider">none</item>
@@ -33,7 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="android:clipToPadding">false</item>
 	</style>
 		
-	<!-- NOTE: for simplicity, fixed height, thus, easier to layout everything inside centered as needed -->
+	<!-- Upper toast is styled for 2 lines. Just 1 line will cause layout issues, extra styling pass is required to support 1 line -->
 	<style name="TopUpperToastFrame">
 		<item name="android:layout_width">match_parent</item>
 		<item name="android:layout_height">wrap_content</item>
@@ -56,8 +56,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<!-- NOTE: top/bottom paddings are large and thus vertically center the title or title + line2. Other elements are aligned to title -->
 		<item name="android:paddingLeft">@dimen/TopToastFrame_paddingLR</item>
 		<item name="android:paddingRight">@dimen/TopToastFrame_paddingLR</item>
-		<!--<item name="android:paddingTop">@dimen/TopToastFrame_paddingTB</item>
-		<item name="android:paddingBottom">@dimen/TopToastFrame_paddingTB</item>-->
+		<item name="android:paddingTop">@dimen/TopToastFrame_paddingTB</item>
+		<item name="android:paddingBottom">@dimen/TopToastFrame_paddingTB</item>
+
 		<item name="android:scaleX">1</item>
 		<item name="android:scaleY">1</item>
 		<item name="android:visibility">invisible</item>
@@ -91,15 +92,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="drawableWidth">32dp</item>
 		<item name="drawableHeight">32dp</item>
 		<item name="drawableOnly">true</item>
-		<!-- NOTE: don't apply tint here, allow icons to have own tints as needed -->
 		<item name="android:visibility">visible</item>
+
+		<!-- We apply tint here as we pass icons we don't have tint -->
+		<item name="drawableTint">?colorIconPrimary</item>
 	</style>
 
-	<!-- NOTE: depending on font size, close button may define the toast height -->	
 	<style name="TopUpperToastCloseButton">
 		<item name="android:layout_width">38dp</item>
-		<item name="android:layout_height">38dp</item>
-		<item name="android:layout_marginRight">-16dp</item>
+		<item name="android:layout_height">0dp</item>
+		<item name="android:layout_marginRight">-8dp</item>
 		<item name="android:layout_marginTop">0dp</item>
 		<item name="android:gravity">center</item>
 		<item name="layout_attachRight">parent</item>
@@ -117,11 +119,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="android:layout_width">match_parent</item>
 		<item name="android:layout_height">wrap_content</item>
 		<item name="android:maxLines">2</item>
+		<item name="android:gravity">left|top</item>
 		<item name="layout_consumeSpace">vertical</item>
 		<item name="android:layout_marginLeft">@dimen/TopToastTile_marginLeft</item>
 		<item name="android:layout_marginRight">32dp</item>
+		<item name="android:paddingTop">4dp</item>
+		<item name="android:paddingBottom">4dp</item>
+
 		<item name="android:textAppearance">?TopToastTitle_Text</item>
-		<item name="android:layout_marginTop">@dimen/TopToastFrame_paddingTB</item>
+		<item name="eatFontPads">true</item>
+		<item name="applyViewParams">true</item>
 	</style>
 	<style name="TopUpperToastTitle_Text" parent="TextAppearance.AppCompat">
 		<item name="android:textSize">14sp</item>
@@ -138,15 +145,20 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<style name="TopUpperToastLine2">
 		<item name="android:layout_width">match_parent</item>
 		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_marginTop">2dp</item>
+		<item name="android:layout_marginTop">1dp</item>
 		<item name="android:layout_marginLeft">@dimen/TopToastTile_marginLeft</item>
-		<item name="android:layout_marginBottom">@dimen/TopToastFrame_paddingTB</item>
 		<item name="android:layout_marginRight">32dp</item>
-		<item name="layout_consumeSpace">reset_vertical</item>
+		<item name="android:paddingTop">3dp</item>
+		<item name="android:paddingBottom">2dp</item>
 		
 		<item name="android:maxLines">4</item>
 		<item name="android:textAppearance">?TopToastLine2_Text</item>
-		<item name="allowZeroHeight">true</item>
+
+		<item name="allowZeroHeight">true</item><!-- REVISIT: FTV only attribute, doesn't do anything for TextView -->
+		<item name="eatFontPads">true</item><!-- Only for FTV, which is not used now for line2 -->
+
+		<item name="layout_goneWhenEmpty">true</item>
+		<item name="android:includeFontPadding">false</item>
 	</style>
 	<style name="TopUpperToastLine2_Text" parent="TextAppearance.AppCompat">
 		<item name="android:textSize">11sp</item>
@@ -156,8 +168,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="android:layout_height">wrap_content</item>
 		<item name="android:layout_gravity">center_horizontal</item>
 		<item name="android:layout_marginTop">2dp</item>
+
+		<item name="layout_goneWhenEmpty">true</item>
+	</style>
+
+	<style name="TopUpperToastSeparator">
+		<item name="layout_consumeSpace">reset_vertical</item>
 	</style>
-	
 		
 	
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values/styles-top.xml b/poweramp_skin_sdk/reference_resources/values/styles-top.xml
index 3f03f3f3..ac8284fe 100644
--- a/poweramp_skin_sdk/reference_resources/values/styles-top.xml
+++ b/poweramp_skin_sdk/reference_resources/values/styles-top.xml
@@ -804,7 +804,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="android:padding">12dp</item>
 		
 		<item name="android:background">@null</item>
-		<!-- NOTE: not supported until 6.0, thus, using separate tinted drawable -->
+		<!-- NOTE: tint here is not supported until 6.0, thus, using separate tinted drawable -->
 		<item name="android:drawableLeft">@drawable/search_tinted</item>
 		<!-- <item name="android:drawableTint">?colorIconPrimary</item> -->
 		<!-- <item name="drawableTint">?colorIconPrimary</item> -->
@@ -825,7 +825,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="android:paddingTop">8dp</item>
 		<item name="android:paddingLeft">8dp</item>
 		<item name="android:paddingRight">12dp</item>
+		<!-- Applying clip here as it's not looking well if we go beyond list dimension for top search -->
 		<item name="android:clipToPadding">true</item>
+		<item name="layout_consumeSpace">vertical|reset_horizontal</item>
+		<item name="catButtonStyle">?TopSearchCatButton</item>
 	</style>
 	<style name="TopSearchCatButton">
 		<item name="android:layout_width">wrap_content</item>
@@ -835,8 +838,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="android:layout_marginLeft">4dp</item>
 		<item name="android:paddingLeft">12dp</item>
 		<item name="android:paddingRight">12dp</item>
-		<item name="android:paddingTop">4dp</item>
-		<item name="android:paddingBottom">4dp</item>
+		<item name="android:paddingTop">5dp</item>
+		<item name="android:paddingBottom">5dp</item>
+		<item name="drawablePaddingStart">10dp</item>
+		<item name="android:drawablePadding">-11dp</item>
+		<item name="drawableTint">@color/button_primary_text_color_selector</item>
+
 		<item name="android:maxLines">1</item>
 		<item name="android:background">@drawable/checkable_non_tr_rounded_large</item>
 		<item name="animOnClick">true</item>
@@ -912,8 +919,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="android:layout_width">match_parent</item>
 		<item name="layout_attachLeft">inset</item>
 		<item name="layout_attachRight">inset</item>
-				
-		<item name="android:layout_height">300dp</item><!-- Height should be enough for 2 row selection menu -->
+
+		<!-- Height should be enough for 2 row selection menu
+		     NOTE: this is not height of the selection menu, but the height of the parent (invisible) container -->
+		<item name="android:layout_height">@dimen/TopSelectionMenuContainer_height</item>
 		<item name="layout_attachBottom">parent</item><!-- Attaching to bottom, not to inset, thus we allow animation behind the navbar -->
 		<item name="android:translationZ">?modal_translationZ</item>
 		<item name="android:outlineProvider">none</item>
@@ -1018,8 +1027,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<!-- Centered -->
 	
 	<style name="TopBaseButtonLayout">
-		<item name="android:layout_width">@dimen/TopBaseButtonLayout_layout_width</item><!-- 68dp -->
-		<item name="android:layout_height">@dimen/TopBaseButtonLayout_layout_height</item><!-- 36dp -->
+		<item name="android:layout_width">@dimen/TopBaseButtonLayout_width</item>
+		<item name="android:layout_height">@dimen/TopBaseButtonLayout_height</item>
 				
 		<item name="menuPlaceholder">@+id/menu_placeholder</item>
 		<item name="android:background">@drawable/alpha_popup_button_layout_bg</item>
@@ -1034,7 +1043,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		<item name="buttonStyle">?PopupButton</item>
 		<item name="menuButtonStyle">?PopupButton_scene_button_menu</item>
 		
-		<item name="popupListStyle">@style/PopupListLayoutList</item><!-- Used for e.g. eq/reverb presets (with the PowerList inside) -->
+		<item name="popupListStyle">@style/PopupListLayoutList</item>
+
+		<item name="separatorSize">32dp</item><!-- Used for list separators, if any -->
 	</style>
 	
 	
@@ -1258,7 +1269,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	</style>
 	<style name="TopMetaInfoLabel_Text" parent="TextAppearance.AppCompat">
 		<item name="android:textSize">@dimen/TopMetaInfoLabel_textSize</item>
-		<item name="android:textAllCaps">true</item>				
+		<item name="android:textAllCaps">true</item>
 	</style>
 	
 	<!-- NOTE: TopHelp* styles are used directly in layouts and not meant for overriding, but still colors, backgrounds, textAppearance are overridable -->
diff --git a/poweramp_skin_sdk/reference_resources/values/styles-vis.xml b/poweramp_skin_sdk/reference_resources/values/styles-vis.xml
index 6ca32f10..2300f3ab 100644
--- a/poweramp_skin_sdk/reference_resources/values/styles-vis.xml
+++ b/poweramp_skin_sdk/reference_resources/values/styles-vis.xml
@@ -60,8 +60,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		
 		<item name="animTime">500</item>
 		
-		<item name="itemSize">48dp</item>
-		<item name="listItemSize">48dp</item>
+		<item name="itemSize">@dimen/VisPanelFrame_height</item>
+		<item name="listItemSize">@dimen/VisPanelFrame_height</item>
 	</style>
 	<style name="VisPanelFrame_scene_vispanel_expanded">
 		<item name="android:layout_width">match_parent</item>
diff --git a/poweramp_skin_sdk/reference_resources/values/values-dimensions.xml b/poweramp_skin_sdk/reference_resources/values/values-dimensions.xml
index 5471bad2..06325e7b 100644
--- a/poweramp_skin_sdk/reference_resources/values/values-dimensions.xml
+++ b/poweramp_skin_sdk/reference_resources/values/values-dimensions.xml
@@ -32,9 +32,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<!-- Calculated as: ?navbar_marginB + @dimen/Navbar_height -->
 	<item type="id" name="navbar_bounds_size"/>
 
-	<!-- Calculated as: ?navbar_marginB * 2 + @dimen/Navbar_height * 2 + @dimen/NavbarList_marginBottom -->
+	<!-- Calculated as: ?navbar_marginB + ?navbar_marginT + @dimen/Navbar_height * 2 + @dimen/NavbarList_marginBottom -->
 	<item type="id" name="navbar_bounds_2lines_size"/>
 
-	<!-- Calculated as: ?navbar_marginB * 2 + @dimen/Navbar_height * 2 + @dimen/NavbarList_marginBottom * 2 + @dimen/NavbarSeekbar_height -->
+	<!-- Calculated as: ?navbar_marginB + ?navbar_marginB + @dimen/Navbar_height * 2 + @dimen/NavbarList_marginBottom * 2 + @dimen/NavbarSeekbar_height -->
 	<item type="id" name="navbar_bounds_3lines_size"/>
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values/values-peq.xml b/poweramp_skin_sdk/reference_resources/values/values-peq.xml
index b114eab8..f9690ba7 100644
--- a/poweramp_skin_sdk/reference_resources/values/values-peq.xml
+++ b/poweramp_skin_sdk/reference_resources/values/values-peq.xml
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<item type="id" name="state_app_is_peq"/><!-- Bus app. boolean -->
 	<item type="id" name="state_app_notification_listener_started"/><!-- Boolean -->
 	<item type="id" name="cmd_app_on_notification_listener_state"/><!-- arg1 = true=> started, false=> stopped -->
+	<item type="id" name="cmd_app_peq_investigate_dump"/><!-- obj = String => cause of investigation -->
 	
 	<!-- PEQ inbound commands - sent to bus_player_cmd -->
 	<item type="id" name="cmd_peq_new_control_session"/>
@@ -42,6 +43,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<item type="id" name="cmd_peq_close"/><!-- arg1 => boolean, true => disable  -->
 	<item type="id" name="cmd_peq_reopen"/><!-- Always re-enables -->
 	<item type="id" name="cmd_peq_vis_latency_changed"/><!-- arg1 => latency ms -->
+
 	
 	<item type="id" name="state_closed"/><!-- bus_player, boolean/int, also a message -->
 	
diff --git a/poweramp_skin_sdk/reference_resources/values/values-player.xml b/poweramp_skin_sdk/reference_resources/values/values-player.xml
index 3e235f25..a28db2d2 100644
--- a/poweramp_skin_sdk/reference_resources/values/values-player.xml
+++ b/poweramp_skin_sdk/reference_resources/values/values-player.xml
@@ -43,7 +43,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<item type="id" name="cmd_app_open_support"/>
 	<item type="id" name="cmd_app_rescan"/><!-- arg1 => boolean, slow scan if true, obj => String cause of rescan -->
 	<item type="id" name="cmd_app_milk_rescan"/><!-- arg1 => boolean, slow scan if true, arg2 => boolean, force resolve playlists, obj => String cause of rescan -->
-	<item type="id" name="cmd_app_storage_perm_dialog"/><!-- obj => PermissionRequest. NOTE: dialogs can intercept result if dialog activity sets itself as registerLastStartedNonDialogActivity() in onStart -->
+	<item type="id" name="cmd_app_storage_perm_dialog"/><!-- obj => PermissionRequest. NOTE: dialogs can intercept result if dialog activity sets itself as registerLastStartedNonDialogActivity() in onStart, arg1 => true to avoid success toast -->
 	<item type="id" name="cmd_app_close_activities"/><!-- Not closing settings activities - see cmd_app_close_settings -->
 	<item type="id" name="msg_app_storage_perm_granted"/>
 	<item type="id" name="msg_app_storage_perm_failed"/>
@@ -134,7 +134,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<item type="id" name="cmd_data_track_rating"/><!-- bus_data_cmd, arg1 => rating, obj => Long fileId -->
 	<item type="id" name="cmd_data_reset_aa_status"/>
 	<item type="id" name="msg_app_data_rating_changed"/><!-- arg1 => rating, arg2 => previous rating, obj => Long fileId -->
-	
+
 	
 	<item type="id" name="cmd_data_delete"/><!-- bus_data_cmd, obj => UriAndIds -->
 	<item type="id" name="cmd_data_reorder"/><!-- bus_data_cmd, obj => UriAndIds -->
@@ -224,6 +224,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<item type="id" name="cmd_data_update_track_info"/>
 	
 	<item type="id" name="cmd_data_update_eq_preset"/>
+
 	<item type="id" name="cmd_data_update_search_history"/><!-- obj => search term -->
 	<item type="id" name="cmd_data_clear_search_history"/><!-- obj => search term to clear term, arg1 => STATE_TRUE to clear whole history -->
 	<item type="id" name="cmd_data_update_lyrics"/><!-- obj -> intent or bundle which follows ACTION_UPDATE_LYRICS API -->
@@ -238,7 +239,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<item type="id" name="cmd_list_bookmark"/>
 
 	<item type="id" name="cmd_list_prefer_aa_state"/><!-- arg1 == list_aa_* -->
-	
+
+	<!-- Implemented by some popup lists, e.g. eq presets -->
+	<item type="id" name="cmd_list_reload"/>
+
+	<!-- Implemented by some popup lists, e.g. eq presets -->
+	<item type="id" name="cmd_list_lock_unlock"/>
+
 	<item type="id" name="state_gui_vis_mode"/><!-- integer VIS_* -->
 	<item type="id" name="state_gui_eq_tab"/><!-- integer EQ_TAB_* -->
 	<item type="id" name="state_gui_nav_allowed"/><!-- boolean -->
@@ -272,7 +279,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 	<item type="id" name="msg_player_service_connected"/>
 	<item type="id" name="msg_player_service_disconnected"/>
-	<item type="id" name="msg_player_service_started"/><!-- obj => MediaSessionCompat. Also called when mediasession is recreated -->
+	<item type="id" name="msg_player_service_started"/><!-- Also called when mediasession is recreated -->
 	<item type="id" name="msg_player_service_stopped"/>
 	<item type="id" name="msg_pipeline_started"/><!-- Internal usage: obj parameter => PipelineSession -->
 	<item type="id" name="msg_pipeline_stopped"/><!-- Internal usage -->
@@ -347,7 +354,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<item type="id" name="state_player_output_latency"/><!-- int -->
 	<item type="id" name="state_player_output_device"/><!-- string, int -->
 	<item type="id" name="state_player_output_device_flags"/><!-- int. Not used ATM -->
-	<item type="id" name="state_player_output_end_device"/><!-- string -->
+	<item type="id" name="state_player_output_end_device"/><!-- string, or boolean - true if we have end device name -->
 	<!--<item type="id" name="state_player_output_end_device_address"/>--><!-- string -->
 	<!-- string, obj => OutputEndDeviceMetaInfo -->
 	<item type="id" name="state_player_output_end_device_meta"/>
@@ -382,13 +389,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<!-- PS inbounds commands -->
 	<item type="id" name="cmd_player_play_uri"/><!-- arg1 => STATE_TRUE=>pause, STATE_FALSE/default=>play, arg2 => optional int PrefsConsts.PLAYLIST_ACTION_*, obj => Uri or Intent with the uri -->
 	<item type="id" name="cmd_player_play_pos"/><!-- arg1 => pos in current list to play -->
-	<item type="id" name="cmd_player_pause_playing"/><!-- arg1 => STATE_TRUE - no fade, arg2 => PowerampAPI.PauseFlags. Public -->
+	<item type="id" name="cmd_player_pause_playing"/><!-- arg1 => STATE_TRUE - no fade, arg2 => PsPauseFlags. Public -->
 	<item type="id" name="cmd_player_resume_playing"/><!-- arg1 => STATE_TRUE - resume even if playing -->
-	<item type="id" name="cmd_player_toggle_playing"/><!-- arg2 => PowerampAPI.PauseFlags -->
+	<item type="id" name="cmd_player_toggle_playing"/><!-- arg2 => PsPauseFlags -->
 	<item type="id" name="cmd_player_play_next_track"/><!-- arg1 => flags, arg2 => trackFlags -->
 	<item type="id" name="cmd_player_play_prev_track"/><!-- arg1 => boolean forceMove, arg2 => flags -->
 	<item type="id" name="cmd_player_on_queue_updated"/><!-- obj = Boolean.TRUE if something is just enqueued -->
-	<item type="id" name="cmd_player_reload_pipeline"/><!-- arg1 => boolean allowResume (PA), arg2 => int delay (Peq), obj = optional OutputDeviceMapping -->
+	<item type="id" name="cmd_player_reload_pipeline"/><!-- arg1 => boolean allowResume (PA), arg2 => int delay (Peq), obj = optional PipelineReloadCondition/OutputDeviceMapping -->
 	<item type="id" name="cmd_player_seek"/>
 	<item type="id" name="cmd_player_seek_step"/><!-- arg1 => STATE_TRUE => forward, STATE_FALSE => rewind; arg2 => step multiplier (if < 50, base=5000ms), seek jump ms, or 0 for 5000ms -->
 	<item type="id" name="cmd_player_seek_jump"/><!-- arg1 => STATE_TRUE => forward, STATE_FALSE => rewind; arg2 => step ms -->
@@ -425,8 +432,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<item type="id" name="cmd_player_resend_external_track"/>
 	<item type="id" name="cmd_player_no_search_results"/><!-- Inform player on no results for cmd_data_search_and_play, obj = incoming obj -->
 	<item type="id" name="cmd_player_output_meta_changed"/><!-- Inform player on output_meta_change. arg1 => routed device_id, obj => OutputEndDeviceMetaInfo|null. Reposted to msg_player_output_meta_changed -->
-	<item type="id" name="cmd_player_remove_notif"/><!-- Ask player to remove notification -->
-	<item type="id" name="cmd_player_dont_resume_after_call"/><!-- arg1=> boolean - true - remove notification -->
+	<item type="id" name="cmd_player_remove_notif"/><!-- Ask player to force remove notification and may be stop (depending on keep_service pref). arg1 => true to deactivate mediasession -->
+	<item type="id" name="cmd_player_dont_resume_after_call"/>
 	<item type="id" name="cmd_player_start_command"/>
 	<item type="id" name="cmd_player_reset_long_volume_keys"/>
 	<item type="id" name="cmd_player_use_wakelock"/><!-- arg => boolean -->
@@ -460,7 +467,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<item type="id" name="cmd_data_set_milk_preset_rating"/><!-- arg1 => rating, obj => Long id -->
 	<item type="id" name="cmd_set_playlist_select_sort"/>
 	<item type="id" name="state_playlist_select_sort"/><!-- int -->
-	<item type="id" name="cmd_set_playlist_insert_pos"/>
+	<item type="id" name="cmd_set_playlist_insert_pos"/><!-- arg1 -> value, arg2 -> true - don't show toast -->
 	<item type="id" name="state_playlist_insert_pos"/><!-- int -->
 	<item type="id" name="cmd_set_queue_insert_pos"/>
 	<item type="id" name="state_queue_insert_pos"/><!-- int -->
@@ -491,13 +498,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<item type="id" name="msg_dsp_eq_band_freq"/><!-- arg1 => band index, arg2 => float. Also an object state for DSPParamDef -->
 	<item type="id" name="msg_dsp_eq_band_q"/><!-- arg1 => band index, arg2 => float. Also an object state for DSPParamDef -->
 	<item type="id" name="msg_dsp_eq_band_color"/><!-- arg1 => band index, arg2 => value -->
+	<item type="id" name="msg_dsp_eq_band_locked"/><!-- arg1 => band index, arg2 => value -->
 	<item type="id" name="msg_dsp_eq_band_type"/><!-- arg1 => band index, arg2 => value -->
 	<item type="id" name="msg_dsp_eq_band_ch"/><!-- arg1 => band index, arg2 => value -->	
 	
 	<item type="id" name="msg_dsp_tempo_state_changed"/><!-- Send on tempo state changes (e.g. enabled/disabled, plus/minus enabled/disabled)-->
 	
-	<!-- <item type="id" name="msg_dsp_eq_preset_changed"/> -->
-	<!-- <item type="id" name="msg_dsp_reverb_preset_changed"/> -->
 	<item type="id" name="msg_dsp_meta_changed"/>
 	
 	<item type="id" name="cmd_dsp_set_param"/><!-- arg1 => param id (dsp_*), arg2 => float -->
@@ -506,24 +512,28 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<item type="id" name="cmd_dsp_set_eq_freq"/><!-- arg1 => band ix, arg2 => float -->
 	<item type="id" name="cmd_dsp_set_eq_q"/><!-- arg1 => band ix, arg2 => float -->
 	<item type="id" name="cmd_dsp_set_eq_color"/><!-- arg1 => band ix, arg2 => int -->
+	<item type="id" name="cmd_dsp_set_eq_locked"/><!-- arg1 => band ix, arg2 => boolean -->
 	<item type="id" name="cmd_dsp_set_eq_type"/><!-- arg1 => band ix, arg2 => int -->
 	<item type="id" name="cmd_dsp_set_eq_ch"/><!-- arg1 => band ix, arg2 => int -->
 	<item type="id" name="cmd_dsp_reorder_eq_bands"/><!-- obj => poses[] -->
 	<item type="id" name="cmd_dsp_add_eq_band"/>
-	<item type="id" name="cmd_dsp_delete_eq_bands"/><!-- obj => serials[] --> 
-	
+	<item type="id" name="cmd_dsp_delete_eq_bands"/><!-- obj => serials[] -->
+	<item type="id" name="cmd_dsp_lock_unlock_eq_bands"/><!-- arg1 => boolean, obj => serials[] -->
+
 	<item type="id" name="cmd_dsp_reset_eq"/>
 	<item type="id" name="cmd_dsp_reset_reverb"/>
 	<item type="id" name="cmd_dsp_reset_other"/><!-- Resets balance, sfx, tempo, mono. arg1 => optional additional argument to reset just one parameter/plugin -->
-	<item type="id" name="cmd_dsp_set_eq_preset"/><!-- obj => PresetData -->
+	<item type="id" name="cmd_dsp_set_eq_preset"/><!-- arg2 -> boolean, assign to the current device, obj => PresetData -->
 	<item type="id" name="cmd_dsp_set_reverb_preset"/><!-- obj => PresetData -->
 	<item type="id" name="cmd_dsp_volume_may_be_changed"/><!-- arg1 => boolean isTransient -->
 	<item type="id" name="cmd_dsp_switch_dsp_meta"/><!-- NOTE: handled in PlayerState -->
 	<item type="id" name="cmd_dsp_open_platform_fx"/>
 	<item type="id" name="cmd_dsp_tempo_plus_minus"/><!-- arg1 >= 0 - plus, arg1 < 0 - minus -->
-	
+
+	<item type="id" name="cmd_dsp_eq_preset_restore"/>
+	<!-- Restores ALL presets -->
 	<item type="id" name="cmd_dsp_restore_eq_presets"/>
-	
+
 	
 	<!-- DSP bus params and states. Short for state_* as dsp_* prefix is enough --> 
 	<item type="id" name="dsp_started"/><!-- boolean -->
@@ -544,14 +554,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<item type="id" name="dsp_platform_fx_enabled"/><!-- boolean -->
 	<item type="id" name="dsp_has_platform_fx"/><!-- boolean -->
 	
-	<item type="id" name="dsp_eq_band_freqs"/><!-- obj -->
-	<item type="id" name="dsp_eq_band_gains"/><!-- obj => float[] in 0..1 UI range -->
-	<item type="id" name="dsp_eq_band_gains_raw"/><!-- obj => float[] in -1..0..1 raw range -->
-	<item type="id" name="dsp_eq_band_names"/><!-- obj -->
-	<!-- Returns bands deep copy snapshot of the bands - effectively the current snapshot which is consinstent and safe to use anywhere. Tone not included.
-		 NOTE: new snapshot is created for each getObjectState call
-		 NOTE: the snapshot bands are never further updated or tracked otherwise by the DSPI -->
-	<item type="id" name="dsp_eq_bands_snapshot"/><!-- obj => Band[] -->
 	<!--  Returns "live" bands shallow copy. Containing array is created for each getObjectState call, band instances are the actual DSPI instances. Tone not included -->
 	<item type="id" name="dsp_eq_live_bands_snapshot"/><!-- obj => Band[] -->
 	<item type="id" name="dsp_tone_live_bands_snapshot"/><!-- obj => Band[] -->
@@ -595,16 +597,23 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<!-- string. Switchable meta string: can be e.g. dsp info, output info -->
 	<item type="id" name="dsp_meta"/><!-- NOTE: updated on: msg_pipeline_started -->
 	<item type="id" name="dsp_autosave_enabled"/><!-- boolean -->
-	<!-- string -->
-	<item type="id" name="dsp_autosave_toast_msg"/>
+	<!-- boolean -->
+	<item type="id" name="dsp_eq_preset_locked"/>
+	<!-- int -->
+	<item type="id" name="dsp_eq_preset_type"/>
+	<!-- boolean -->
+	<item type="id" name="dsp_eq_cascade"/>
 
 
 	<item type="id" name="bus_export_import"/>
 	<item type="id" name="msg_export_stats"/><!-- obj => string -->
 
-	<!--
-	<item type="id" name=""/>
-	<item type="id" name=""/>
-	<item type="id" name=""/>
-	-->
+
+	<!-- This shares current preset -->
+	<item type="id" name="cmd_data_eq_preset_share"/>
+	<item type="id" name="cmd_data_eq_preset_rename"/>
+	<item type="id" name="cmd_data_eq_preset_export"/>
+	<item type="id" name="cmd_data_eq_preset_import"/>
+	<item type="id" name="cmd_data_eq_preset_for_device"/><!-- arg1 -> routed device, obj -> device name. If 0/null, we'll query for that -->
+	<item type="id" name="cmd_data_eq_preset_toast_link"/>
 </resources>
\ No newline at end of file
diff --git a/poweramp_skin_sdk/reference_resources/values/values-powerui.xml b/poweramp_skin_sdk/reference_resources/values/values-powerui.xml
index e6d05583..3cecbd41 100644
--- a/poweramp_skin_sdk/reference_resources/values/values-powerui.xml
+++ b/poweramp_skin_sdk/reference_resources/values/values-powerui.xml
@@ -197,6 +197,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	<item type="id" name="cmd_list_selection_mode"/><!-- arg1=0 disable, arg1=1 enable -->
 	<item type="id" name="cmd_list_up_nav"/>
 	<item type="id" name="cmd_list_search_text"/>
+	<item type="id" name="cmd_list_search_clear"/>
+	<item type="id" name="cmd_list_search_device"/>
 	<item type="id" name="cmd_list_delete"/>
 	<item type="id" name="cmd_list_select_range"/>
 	
diff --git a/poweramp_skin_sdk/reference_resources/xml/poweramp_builtin_skins.xml b/poweramp_skin_sdk/reference_resources/xml/poweramp_builtin_skins.xml
index 9b843bb9..dfb63dbc 100644
--- a/poweramp_skin_sdk/reference_resources/xml/poweramp_builtin_skins.xml
+++ b/poweramp_skin_sdk/reference_resources/xml/poweramp_builtin_skins.xml
@@ -2,7 +2,9 @@
 
 <skins xmlns:android="http://schemas.android.com/apk/res/android">
 	<!-- IMPORTANT: all these styles should be skipped from obfuscation, otherwise they may be removed from R or otherwise disabled.
-		 See procfg.pro around -keep,allowshrinking class **.R$style -->
+		 See procfg.pro around -keep,allowshrinking class **.R$style
+
+		 IMPORTANT: all the styles/attributes used as values here should be stable -->
 	
 	<!-- NOTE: forceGlobalOptions=true means global options (by default in styles-options.xml) will force-override
 	     base skin attributes. By default, global options do not override base skin theme, just add to it, but 
@@ -126,9 +128,9 @@
 			defaultValue="@style/ActivityTheme_BoldFont"
 		>
 			<option
-				name="@string/classic"
-				overlapStyle=""
-			/>
+				name="@string/_default"
+				overlapStyle="@style/ActivityTheme_SystemFont"
+				/>
 			<option
 				name="@string/skin_alt_font"
 				overlapStyle="@style/ActivityTheme_Whitepro_AltFont"
@@ -211,8 +213,23 @@
 				name="@string/colorful"
 				overlapAttr="@attr/overlap_knobs_hilite_color"
 			/>
-		</multiSwitch>		
-		
+		</multiSwitch>
+
+		<multiSwitch
+			key="graphic_frs_color"
+			name="@string/skin_graphic_mode_frequency_curve"
+			defaultValue="@attr/overlap_graphic_frs_color"
+			>
+			<option
+				name="@string/monochromatic"
+				overlapAttr=""
+				/>
+			<option
+				name="@string/colorful"
+				overlapAttr="@attr/overlap_graphic_frs_color"
+				/>
+		</multiSwitch>
+
 		<option
 			key="force_light_navbar"
 			name="@string/skin_force_light_navbar"
@@ -241,7 +258,6 @@
 				/>
 		</multiSwitch>
 
-				
 		<option
 			key="navbar_offset"
 			name="@string/skin_navbar_offset"
@@ -249,7 +265,22 @@
 			overlapAttr="@attr/overlap_navbar_offset"
 			checkedByDefault="false"
 		/>
-				
+
+		<multiSwitch
+			key="android_navbar_bg"
+			name="@string/android_navbar"
+			defaultValue=""
+			>
+			<option
+				name="@string/default_string"
+				overlapStyle=""
+				/>
+			<option
+				name="@string/no_background"
+				overlapStyle="@style/ActivityTheme_NoAndroidNavbarBg"
+				/>
+		</multiSwitch>
+
 	</skin>
 		
 	<skin
@@ -367,9 +398,9 @@
 			defaultValue="@style/ActivityTheme_BoldFont"
 		>
 			<option
-				name="@string/classic"
-				overlapStyle=""
-			/>
+				name="@string/_default"
+				overlapStyle="@style/ActivityTheme_SystemFont"
+				/>
 			<option
 				name="@string/skin_alt_font"
 				overlapStyle="@style/ActivityTheme_Whitepro_AltFont"
@@ -443,6 +474,21 @@
 			/>
 		</multiSwitch>
 
+		<multiSwitch
+			key="graphic_frs_color"
+			name="@string/skin_graphic_mode_frequency_curve"
+			defaultValue="@attr/overlap_graphic_frs_color"
+			>
+			<option
+				name="@string/monochromatic"
+				overlapAttr=""
+				/>
+			<option
+				name="@string/colorful"
+				overlapAttr="@attr/overlap_graphic_frs_color"
+				/>
+		</multiSwitch>
+
 		<multiSwitch
 			key="navbar_bg"
 			name="@string/skin_transparent_navbar"
@@ -470,5 +516,20 @@
 			overlapAttr="@attr/overlap_navbar_offset"
 			checkedByDefault="false"
 		/>
+
+		<multiSwitch
+			key="android_navbar_bg"
+			name="@string/android_navbar"
+			defaultValue=""
+			>
+			<option
+				name="@string/default_string"
+				overlapStyle=""
+				/>
+			<option
+				name="@string/no_background"
+				overlapStyle="@style/ActivityTheme_NoAndroidNavbarBg"
+				/>
+		</multiSwitch>
 	</skin>
 </skins>
\ No newline at end of file
diff --git a/poweramp_vis_presets_example/build.gradle b/poweramp_vis_presets_example/build.gradle
index e7c119b1..ca271b0e 100644
--- a/poweramp_vis_presets_example/build.gradle
+++ b/poweramp_vis_presets_example/build.gradle
@@ -21,6 +21,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'com.poweramp.v3.vispresets.sample'
 }
 
 dependencies {
diff --git a/poweramp_vis_presets_example/src/main/AndroidManifest.xml b/poweramp_vis_presets_example/src/main/AndroidManifest.xml
index 06841d39..e737c094 100644
--- a/poweramp_vis_presets_example/src/main/AndroidManifest.xml
+++ b/poweramp_vis_presets_example/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	package="com.poweramp.v3.vispresets.sample">
+	xmlns:tools="http://schemas.android.com/tools">
 
 
 	<uses-permission android:name="com.maxmpz.audioplayer.permission.ACCESS_MILK_PRESETS"/>