diff --git a/app/src/main/res/layout/fragment_classic_controls.xml b/app/src/main/res/layout/fragment_classic_controls.xml
index 6a536f00..9b872b8d 100644
--- a/app/src/main/res/layout/fragment_classic_controls.xml
+++ b/app/src/main/res/layout/fragment_classic_controls.xml
@@ -22,6 +22,7 @@
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/songCurrentProgress"
             android:layout_width="0dp"
+            android:minWidth="40dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
             android:gravity="center_vertical|left|end"
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStorePrefKeys.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStorePrefKeys.kt
index 6dee8266..fcec0cb6 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStorePrefKeys.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStorePrefKeys.kt
@@ -8,24 +8,24 @@ internal interface ThemeStorePrefKeys {
 
         const val CONFIG_PREFS_KEY_DEFAULT = "[[kabouzeid_app-theme-helper]]"
         const val IS_CONFIGURED_KEY = "is_configured"
-        const  val IS_CONFIGURED_VERSION_KEY = "is_configured_version"
+        const val IS_CONFIGURED_VERSION_KEY = "is_configured_version"
         const val VALUES_CHANGED = "values_changed"
 
-        const  val KEY_ACTIVITY_THEME = "activity_theme"
+        const val KEY_ACTIVITY_THEME = "activity_theme"
 
-        const   val KEY_PRIMARY_COLOR = "primary_color"
-        const   val KEY_PRIMARY_COLOR_DARK = "primary_color_dark"
-        const   val KEY_ACCENT_COLOR = "accent_color"
-        const   val KEY_STATUS_BAR_COLOR = "status_bar_color"
-        const   val KEY_NAVIGATION_BAR_COLOR = "navigation_bar_color"
+        const val KEY_PRIMARY_COLOR = "primary_color"
+        const val KEY_PRIMARY_COLOR_DARK = "primary_color_dark"
+        const val KEY_ACCENT_COLOR = "accent_color"
+        const val KEY_STATUS_BAR_COLOR = "status_bar_color"
+        const val KEY_NAVIGATION_BAR_COLOR = "navigation_bar_color"
 
-        const   val KEY_TEXT_COLOR_PRIMARY = "text_color_primary"
-        const   val KEY_TEXT_COLOR_PRIMARY_INVERSE = "text_color_primary_inverse"
-        const   val KEY_TEXT_COLOR_SECONDARY = "text_color_secondary"
-        const   val KEY_TEXT_COLOR_SECONDARY_INVERSE = "text_color_secondary_inverse"
+        const val KEY_TEXT_COLOR_PRIMARY = "text_color_primary"
+        const val KEY_TEXT_COLOR_PRIMARY_INVERSE = "text_color_primary_inverse"
+        const val KEY_TEXT_COLOR_SECONDARY = "text_color_secondary"
+        const val KEY_TEXT_COLOR_SECONDARY_INVERSE = "text_color_secondary_inverse"
 
-        const   val KEY_APPLY_PRIMARYDARK_STATUSBAR = "apply_primarydark_statusbar"
-        const   val KEY_APPLY_PRIMARY_NAVBAR = "apply_primary_navbar"
-        const   val KEY_AUTO_GENERATE_PRIMARYDARK = "auto_generate_primarydark"
+        const val KEY_APPLY_PRIMARYDARK_STATUSBAR = "apply_primarydark_statusbar"
+        const val KEY_APPLY_PRIMARY_NAVBAR = "apply_primary_navbar"
+        const val KEY_AUTO_GENERATE_PRIMARYDARK = "auto_generate_primarydark"
     }
 }
\ No newline at end of file