diff --git a/README.md b/README.md
index 9573e968f..c7825100b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# M
+# Metro
 
 Material Design music player for Android music lovers
 
diff --git a/app/build.gradle b/app/build.gradle
index 73d62e75e..6e013c453 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,7 +14,7 @@ proguardDictionaries {
 
 android {
     compileSdkVersion 29
-    buildToolsVersion = '30.0.0 rc4'
+    buildToolsVersion = '30.0.0'
 
     defaultConfig {
         minSdkVersion 21
@@ -24,8 +24,8 @@ android {
         vectorDrawables.useSupportLibrary = true
 
         applicationId 'io.github.muntashirakon.Music'
-        versionCode 441
-        versionName '3.5.8'
+        versionCode 10442
+        versionName '3.5.9'
 
         multiDexEnabled true
     }
@@ -46,8 +46,6 @@ android {
 
     productFlavors {
         normal {
-            versionCode defaultConfig.versionCode + 10000
-            versionName defaultConfig.versionName + "_" + getDate()
             dimension "default"
         }
     }
@@ -81,23 +79,6 @@ android {
     }
 }
 
-def getProperties(String fileName) {
-    final Properties properties = new Properties()
-    def file = file(fileName)
-    if (file.exists()) {
-        file.withInputStream { stream -> properties.load(stream) }
-    }
-    return properties
-}
-
-static def getProperty(Properties properties, String name) {
-    return properties.getProperty(name) ?: "$name missing"
-}
-
-static def getDate() {
-    new Date().format('MMdd')
-}
-
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 8e2ada3e9..988b4fe8f 100755
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -11,10 +11,9 @@
         <item>code_name_monkey_donate_8</item>
     </string-array>
 
-    <string name="app_name" translatable="false">M</string>
+    <string name="app_name" translatable="false">Metro</string>
     <string name="git_hub" translatable="false">GitHub</string>
 
-
     <string name="app_shortcut_last_added_long" translatable="false">@string/last_added</string>
     <string name="app_shortcut_last_added_short" translatable="false">@string/last_added</string>
     <string name="app_shortcut_shuffle_all_long" translatable="false">@string/action_shuffle_all</string>
diff --git a/fastlane/metadata/android/en-US/changelogs/441.txt b/fastlane/metadata/android/en-US/changelogs/10441.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/441.txt
rename to fastlane/metadata/android/en-US/changelogs/10441.txt
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
index 6bf22a0b2..f6f38ccfa 100644
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -1 +1,15 @@
-M is a fork of Retro Music Player with Google Play API removed and all pro features unlocked.
\ No newline at end of file
+<i>M</i> is a fork of <a href="https://apt.izzysoft.de/fdroid/index/apk/code.name.monkey.retromusic">Retro Music</a> with Google Play API removed and all pro features unlocked.
+
+<b>Features:</b>
+<ul>
+    <li>Local playback only (based on the MediaStore)</li>
+    <li>Sleep timer</li>
+    <li>Folder browser</li>
+    <li>Home screen widgets</li>
+    <li>Themes (Just Black, Kinda Dark, Clearly White)</li>
+    <li>Now playing themes</li>
+    <li>Volume controls</li>
+    <li>Blacklist</li>
+    <li>Album artist support</li>
+    <li>Auto-download artist images from Last.fm</li>
+</ul>
diff --git a/fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt
index 2c26f7eb7..25a159430 100644
--- a/fastlane/metadata/android/en-US/title.txt
+++ b/fastlane/metadata/android/en-US/title.txt
@@ -1 +1 @@
-M - A music player for Android
\ No newline at end of file
+Metro - A music player for Android
\ No newline at end of file