diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 24252bf2..1ba453fc 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -2,10 +2,8 @@
 <resources>
     <string name="about_album_label">About %s</string>
     <string name="about_settings_summary">टीम, सामाजिक लिंक</string>
-
     <string name="accent_color">एक्सेंट रंग</string>
     <string name="accent_color_desc">एक्सेंट विषयवस्तु रंग, डिफ़ॉल्ट हरा है।</string>
-
     <string name="action_about">इसके बारे में</string>
     <string name="action_add_to_favorites">पसंदीदा में जोड़े</string>
     <string name="action_add_to_playing_queue">कतार में जोड़ें</string>
@@ -48,32 +46,23 @@
     <string name="action_tag_editor">टैग एडिटर</string>
     <string name="action_toggle_favorite">पसंदीदा टॉगल करें</string>
     <string name="action_toggle_shuffle">शफल मोड को टॉगल करें</string>
-
     <string name="adaptive">अनुकूली</string>
-
     <string name="add_action">जोड़ें</string>
     <string name="add_playlist_title">"प्लेलिस्ट में जोड़ें"</string>
-
     <string name="added_title_to_playing_queue">"कतार मे 1 शीर्षक जोड़ा गया है।"</string>
     <string name="added_x_titles_to_playing_queue">कतार मे %1$d शीर्षक जोड़ा गया है।</string>
-
     <string name="album">एल्बम</string>
-
     <plurals name="albumSongs">
         <item quantity="one">Song</item>
         <item quantity="other">Songs</item>
     </plurals>
-
     <string name="album_artist">एल्बम कलाकार</string>
-
     <string name="albums">एल्बम</string>
     <plurals name="albums">
         <item quantity="one">Album</item>
         <item quantity="other">Albums</item>
     </plurals>
-
     <string name="always">हमेशा</string>
-
     <string name="app_share">इस बढ़िया म्यूजिक प्लेयर को यहां देखें:https://play.google.com/store/apps/details?id=%s</string>
     <string name="app_shortcut_shuffle_all_short">शफ़ल</string>
     <string name="app_shortcut_top_tracks_short">टॉप गीत</string>
@@ -82,25 +71,16 @@
     <string name="app_widget_classic_name">रेट्रो म्यूजिक - क्लासिक</string>
     <string name="app_widget_small_name">Small</string>
     <string name="app_widget_text_name">Text</string>
-
     <string name="artist">कलाकार</string>
-
     <string name="artists">कलाकार</string>
-
     <string name="audio_focus_denied">ऑडियो फोकस से इनकार किया।</string>
     <string name="audio_settings_summary">ध्वनि सेटिंग्स बदलें और तुल्यकारक नियंत्रण समायोजित करें</string>
-
     <string name="auto">ऑटो</string>
-
     <string name="biography">जीवनी</string>
-
     <string name="black_theme_name">सिर्फ काला</string>
-
     <string name="blacklist">ब्लैकलिस्ट</string>
-
     <string name="blur">कलंक</string>
     <string name="blur_card">ब्लर कार्ड</string>
-
     <string name="bug_report_failed">रिपोर्ट भेजने में असमर्थ</string>
     <string name="bug_report_failed_invalid_token">अमान्य प्रवेश टोकन। कृपया ऐप डेवलपर से संपर्क करें।</string>
     <string name="bug_report_failed_issues_not_available">चयनित रिपॉजिटरी के लिए समस्याएँ सक्षम नहीं हैं। कृपया ऐप डेवलपर से संपर्क करें।</string>
@@ -114,55 +94,35 @@
     <string name="bug_report_no_username">कृपया अपना वैध GitHub उपयोगकर्ता नाम दर्ज करें</string>
     <string name="bug_report_summary">एक अप्रत्याशित त्रुटि हुई। क्षमा करें, आपको यह बग मिल गया है, अगर यह \"क्लियर ऐप डेटा\" को क्रैश करता है या ईमेल भेजता है </string>
     <string name="bug_report_use_account">GitHub खाते का उपयोग करके भेजें</string>
-
     <string name="buy_now">अभी खरीदें</string>
-
     <string name="cancel_current_timer">वर्तमान टाइमर को रद्द करें</string>
-
     <string name="card">कार्ड</string>
     <string name="card_color_style">Colored Card</string>
+    <string name="card_square">Square Card</string>
     <string name="card_style">Card</string>
-
     <string name="carousal_effect_on_now_playing_screen">Carousel effect on the now playing screen</string>
-
     <string name="cascading">Cascading</string>
-
     <string name="changelog">चेंजलाग</string>
     <string name="changelog_summary">साफ़</string>
-
     <string name="circle">Circle</string>
-
     <string name="circular">Circular</string>
-
     <string name="classic">Classic</string>
-
     <string name="clear_action">साफ़</string>
     <string name="clear_blacklist">Clear blacklist</string>
     <string name="clear_playing_queue">Clear queue</string>
-
     <string name="color">Color</string>
-
     <string name="colors">Colors</string>
-
     <string name="composer">Composer</string>
-
     <string name="copied_device_info_to_clipboard">Copied device info to clipboard.</string>
-
     <string name="could_not_create_playlist">Couldn\u2019t create playlist.</string>
     <string name="could_not_download_album_cover">"Couldn\u2019t download a matching album cover."</string>
     <string name="could_not_restore_purchase">Could not restore purchase.</string>
     <string name="could_not_scan_files">Could not scan %d files.</string>
-
     <string name="create_action">Create</string>
-
     <string name="created_playlist_x">Created playlist %1$s.</string>
-
     <string name="credit_title">Members and contributors </string>
-
     <string name="currently_listening_to_x_by_x">Currently listening to %1$s by %2$s.</string>
-
     <string name="dark_theme_name">Kinda Dark</string>
-
     <string name="delete_playlist_title">Delete playlist</string>
     <string name="delete_playlist_x"><![CDATA[Delete the playlist <b>%1$s</b>?]]></string>
     <string name="delete_playlists_title">Delete playlists</string>
@@ -171,62 +131,38 @@
     <string name="delete_songs_title">Delete songs</string>
     <string name="delete_x_playlists"><![CDATA[Delete <b>%1$d</b> playlists?]]></string>
     <string name="delete_x_songs"><![CDATA[Delete <b>%1$d</b> songs?]]></string>
-
     <string name="deleted_x_songs">Deleted %1$d songs.</string>
-
     <string name="depth">Depth</string>
-
     <string name="description">Description</string>
-
     <string name="device_info">Device info</string>
-
     <string name="dialog_message_set_ringtone">Allow Retro Music to modify audio settings</string>
     <string name="dialog_title_set_ringtone">Set ringtone</string>
-
     <string name="do_you_want_to_clear_the_blacklist">Do you want to clear the blacklist?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Do you want to remove <b>%1$s</b> from the blacklist?]]></string>
-
     <string name="donate">Donate</string>
     <string name="donate_summary">If you think I deserve to get paid for my work, you can leave some money here</string>
-
     <string name="donation_header">Buy me a:</string>
-
+    <string name="done">Done</string>
     <string name="drive_mode">Drive mode</string>
-
     <string name="empty">Empty</string>
-
     <string name="equalizer">Equalizer</string>
-
     <string name="faq">FAQ</string>
-
     <string name="favorites">Favorites</string>
-
     <string name="finish_last_song">Finish last song</string>
-
     <string name="fit">Fit</string>
-
     <string name="flat">Flat</string>
-
     <string name="folders">Folders</string>
-
     <string name="follow_system">Follow system</string>
-
     <string name="for_you">For you</string>
-
     <string name="free">Free</string>
-
     <string name="full">Full</string>
     <string name="full_card">Full card</string>
-
     <string name="general_settings_summary">Change the theme and colors of the app</string>
     <string name="general_settings_title">Look and feel</string>
-
     <string name="genre">Genre</string>
-
     <string name="genres">Genres</string>
-
     <string name="git_hub_summary">Fork the project on GitHub</string>
-
+    <string name="gradient">Gradient</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -236,25 +172,20 @@
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
     <string name="grid_style_label">Grid style</string>
-
+    <string name="help_summary">Need more help?</string>
     <string name="hinge">Hinge</string>
-
     <string name="history">History</string>
-
     <string name="home">Ghar</string>
-
     <string name="horizontal_flip">Horizontal flip</string>
-
     <string name="image">Image</string>
     <string name="image_gradient">Gradient image</string>
     <string name="image_settings_summary">Change artist image download settings</string>
-
+    <string name="import_label">Import</string>
+    <string name="import_playlist">Import playlist</string>
+    <string name="import_playlist_message">It imports all playlists listed in the Android Media Store with songs, if the playlists already exists, the songs will get merged.</string>
     <string name="inserted_x_songs_into_playlist_x">Inserted %1$d songs into the playlist %2$s.</string>
-
     <string name="instagram_page_summary">Share your Retro Music setup to showcase on Instagram</string>
-
     <string name="keyboard">Keyboard</string>
-
     <string name="label_bit_rate">Bitrate</string>
     <string name="label_file_format">Format</string>
     <string name="label_file_name">File name</string>
@@ -263,45 +194,27 @@
     <string name="label_more_from">More from %s</string>
     <string name="label_sampling_rate">Sampling rate</string>
     <string name="label_track_length">Length</string>
-
     <string name="labeled">Labeled</string>
-
     <string name="last_added">Last added</string>
     <string name="last_song">Last song</string>
-
     <string name="library_categories">Library categories</string>
-
     <string name="licenses">Licenses</string>
-
     <string name="light_theme_name">Clearly White</string>
-
     <string name="listeners_label">Listeners</string>
-
     <string name="listing_files">Listing files</string>
-
     <string name="loading_products">Loading products…</string>
-
     <string name="login">Login</string>
-
     <string name="lyrics">Lyrics</string>
-
     <string name="made_with_love">Made with ❤️ in India</string>
-
     <string name="material">Material</string>
-
     <string name="md_error_label">Error</string>
     <string name="md_storage_perm_error">Permission error</string>
-
     <string name="my_name">Name</string>
     <string name="my_top_tracks">Most played</string>
-
     <string name="never">Never</string>
-
     <string name="new_playlist_title">New playlist</string>
     <string name="new_start_directory">%s is the new start directory.</string>
-
     <string name="next_song">Next Song</string>
-
     <string name="no_albums">You have no albums</string>
     <string name="no_artists">You have no artists</string>
     <string name="no_audio_ID">"Play a song first, then try again."</string>
@@ -313,57 +226,39 @@
     <string name="no_purchase_found">No purchase found.</string>
     <string name="no_results">No results</string>
     <string name="no_songs">You have no songs</string>
-
     <string name="normal">Normal</string>
     <string name="normal_lyrics">Normal lyrics</string>
-
     <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> is not listed in the media store.]]></string>
-
+    <string name="not_recently_played">Not recently played</string>
     <string name="nothing_to_scan">Nothing to scan.</string>
     <string name="nothing_to_see">Nothing to see</string>
-
     <string name="notification">Notification</string>
     <string name="notification_settings_summary">Customize the notification style</string>
-
     <string name="now_playing">Now playing</string>
     <string name="now_playing_queue">Now playing queue</string>
     <string name="now_playing_summary">Customize the now playing screen</string>
     <string name="now_playing_themes">9+ now playing themes</string>
-
     <string name="only_on_wifi">Only on Wi-Fi</string>
-
     <string name="other_settings_summary">Advanced testing features</string>
-
     <string name="others">Other</string>
-
     <string name="password">Password</string>
-
     <string name="past_three_months">Past 3 months</string>
-
     <string name="peak">Peak</string>
-
     <string name="permission_external_storage_denied">Permission to access external storage denied.</string>
-
+    <string name="permission_summary">The app needs permission to access your device storage for playing music</string>
+    <string name="permission_title">Storage Access</string>
     <string name="permissions_denied">Permissions denied.</string>
-
     <string name="personalize">Personalize</string>
     <string name="personalize_settings_summary">Customize your now playing and UI controls</string>
-
     <string name="pick_from_local_storage">Pick from local storage</string>
-
     <string name="pinterest_page">Pinterest</string>
     <string name="pinterest_page_summary">Follow Pinterest page for Retro Music design inspiration</string>
-
     <string name="plain">Plain</string>
-
     <string name="playing_notification_description">The playing notification provides actions for play/pause etc.</string>
     <string name="playing_notification_name">Playing notification</string>
-
     <string name="playlist_is_empty">Playlist is empty</string>
     <string name="playlist_name_empty">Playlist name</string>
-
     <string name="playlists">Playlists</string>
-
     <string name="pref_blur_amount_summary">Amount of blur applied for blur themes, lower is faster</string>
     <string name="pref_blur_amount_title">Blur amount</string>
     <string name="pref_filter_song_summary">Filter songs by length</string>
@@ -384,6 +279,7 @@
     <string name="pref_keep_screen_on_title">Keep the screen on</string>
     <string name="pref_language_name">Select language</string>
     <string name="pref_summary_album_art_on_lockscreen">Use the currently playing song album cover as the lockscreen wallpaper</string>
+    <string name="pref_summary_album_artists_only">Show Album Artists in the Artist category</string>
     <string name="pref_summary_audio_ducking">Lower the volume when a system sound is played or a notification is received</string>
     <string name="pref_summary_blacklist">The content of blacklisted folders is hidden from your library.</string>
     <string name="pref_summary_bluetooth_playback">Start playing as soon as connected to bluetooth device</string>
@@ -408,6 +304,7 @@
     <string name="pref_summary_toggle_shuffle">Shuffle mode will turn off when playing a new list of songs</string>
     <string name="pref_summary_toggle_volume">If enough space is available, show volume controls in the now playing screen</string>
     <string name="pref_title_album_art_on_lockscreen">Show album cover</string>
+    <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
     <string name="pref_title_album_cover_style">Album cover theme</string>
     <string name="pref_title_album_cover_transform">Album cover skip</string>
     <string name="pref_title_app_shortcuts">Colored app shortcuts</string>
@@ -425,6 +322,7 @@
     <string name="pref_title_extra_song_info">Song info</string>
     <string name="pref_title_gapless_playback">Gapless playback</string>
     <string name="pref_title_general_theme">App theme</string>
+    <string name="pref_title_home_album_grid_style">Album grid</string>
     <string name="pref_title_home_artist_grid_style">Artist grid</string>
     <string name="pref_title_home_banner">Banner</string>
     <string name="pref_title_ignore_media_store_artwork">Ignore Media Store covers</string>
@@ -438,22 +336,15 @@
     <string name="pref_title_toggle_toggle_headset">Auto-play</string>
     <string name="pref_title_toggle_toggle_shuffle">Shuffle mode</string>
     <string name="pref_title_toggle_volume">Volume controls</string>
-
     <string name="pro">Pro</string>
     <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
-
     <string name="profile">Profile</string>
-
     <string name="purchase">Purchase</string>
-
     <string name="queue">Playing Queue</string>
-
     <string name="rate_app">Rate the app</string>
     <string name="rate_on_google_play_summary">Love this app? Let us know in the Google Play Store how we can make it even better</string>
-
     <string name="recent_albums">Recent albums</string>
     <string name="recent_artists">Recent artists</string>
-
     <string name="remove_action">Remove</string>
     <string name="remove_cover">Remove cover</string>
     <string name="remove_from_blacklist">Remove from blacklist</string>
@@ -461,25 +352,19 @@
     <string name="remove_song_x_from_playlist"><![CDATA[Remove the song <b>%1$s</b> from the playlist?]]></string>
     <string name="remove_songs_from_playlist_title">Remove songs from playlist</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[Remove <b>%1$d</b> songs from the playlist?]]></string>
-
     <string name="rename_playlist_title">Rename playlist</string>
-
     <string name="report_an_issue">Report an issue</string>
     <string name="report_bug">Report bug</string>
-
     <string name="reset_action">Reset</string>
     <string name="reset_artist_image">Reset artist image</string>
-
     <string name="restore">Restore</string>
-
     <string name="restored_previous_purchase_please_restart">Restored previous purchase. Please restart the app to make use of all features.</string>
     <string name="restored_previous_purchases">Restored previous purchases.</string>
-
     <string name="restoring_purchase">Restoring purchase…</string>
-
     <string name="retro_music_player">Retro Music Player</string>
     <string name="retro_music_pro">Retro Music Pro</string>
-
+    <string name="ringtone_summary">The app needs permission to access your device settings in order to set music as Ringtone</string>
+    <string name="ringtone_title">Ringtone</string>
     <string name="saf_delete_failed">File delete failed: %s</string>
     <!-- SAF -->
     <string name="saf_error_uri">Can\'t get SAF URI</string>
@@ -492,48 +377,32 @@
     <string name="saf_guide_slide3_description">Do not open any sub-folders</string>
     <string name="saf_guide_slide3_title">Tap \'select\' button at the bottom of the screen</string>
     <string name="saf_write_failed">File write failed: %s</string>
-
     <string name="save">Save</string>
     <!-- SAF -->
     <!-- SAF guide -->
     <string name="save_playlist_title">Save as file</string>
     <string name="save_playlists_title">Save as files</string>
-
     <string name="saved_playlist_to">Saved playlist to %s.</string>
-
     <string name="saving_changes">Saving changes</string>
-
     <string name="scan_media">Scan media</string>
-
     <string name="scanned_files">Scanned %1$d of %2$d files.</string>
-
     <string name="scrobbles_label">Scrobbles</string>
-
     <string name="select_all">Select all</string>
-
     <string name="selected">Selected</string>
-
     <string name="set">Set</string>
     <string name="set_artist_image">Set artist image</string>
-
     <string name="share_app">Share app</string>
+    <string name="share_summary">Share the app with your friends and family</string>
     <string name="share_to_stories">Share to Stories</string>
-
     <string name="shuffle">Shuffle</string>
-
     <string name="simple">Simple</string>
-
     <string name="sleep_timer_canceled">Sleep timer canceled.</string>
     <string name="sleep_timer_set">Sleep timer set for %d minutes from now.</string>
-
     <string name="social">Social</string>
     <string name="social_stories">Share story</string>
-
     <string name="song">Song</string>
     <string name="song_duration">Song duration</string>
-
     <string name="songs">Songs</string>
-
     <string name="sort_order">Sort order</string>
     <string name="sort_order_a_z">Ascending</string>
     <string name="sort_order_album">Album</string>
@@ -541,93 +410,59 @@
     <string name="sort_order_composer">Composer</string>
     <string name="sort_order_date">Date added</string>
     <string name="sort_order_date_modified">Date modified</string>
+    <string name="sort_order_num_songs">Song count</string>
+    <string name="sort_order_num_songs_desc">Song count desc</string>
     <string name="sort_order_year">Year</string>
     <string name="sort_order_z_a">Descending</string>
-
     <string name="speech_not_supported">Sorry! Your device doesn\'t support speech input</string>
     <string name="speech_prompt">Search your library</string>
-
     <string name="stack">Stack</string>
-
     <string name="start_play_music">Start playing music.</string>
-
     <string name="suggestion_songs">Suggestions</string>
-
     <string name="support_development">Support development</string>
-
     <string name="swipe_to_unlock">Swipe to unlock</string>
-
     <string name="synced_lyrics">Synced lyrics</string>
-
     <!-- Message displayed when tag editing fails -->
     <string name="telegram_group">Telegram</string>
     <string name="telegram_group_summary">Join the Telegram group to discuss bugs, make suggestions, show off and more</string>
-
     <string name="thank_you">Thank you!</string>
-
     <string name="the_audio_file">The audio file</string>
-
     <string name="this_month">This month</string>
     <string name="this_week">This week</string>
     <string name="this_year">This year</string>
-
     <string name="tiny">Tiny</string>
     <string name="tiny_card_style">Tiny card</string>
-
     <string name="title">Title</string>
-
     <string name="today">Today</string>
-
     <string name="top_albums">Top albums</string>
     <string name="top_artists">Top artists</string>
-
     <string name="track_hint">"Track (2 for track 2 or 3004 for CD3 track 4)"</string>
     <string name="track_list">Track number</string>
-
     <string name="translate">Translate</string>
     <string name="translate_community">Help us translate the app to your language</string>
-
     <string name="try_retro_music_premium">Try Retro Music Premium</string>
-
     <string name="twitter_page">Twitter</string>
     <string name="twitter_page_summary">Share your design with Retro Music</string>
-
     <string name="unlabeled">Unlabeled</string>
-
     <string name="unplayable_file">Couldn\u2019t play this song.</string>
-
     <string name="up_next">Up next</string>
-
     <string name="update_image">Update image</string>
-
     <string name="updating">Updating…</string>
-
+    <string name="user_name">User Name</string>
     <string name="username">Username</string>
-
     <string name="version">Version</string>
-
     <string name="vertical_flip">Vertical flip</string>
-
     <string name="volume">Volume</string>
-
     <string name="web_search">Web search</string>
-
     <string name="welcome">Welcome,</string>
-
     <string name="what_do_you_want_to_share">What do you want to share?</string>
-
     <string name="whats_new">What\'s New</string>
-
     <string name="window">Window</string>
     <string name="window_corner_edges">Rounded corners</string>
-
     <string name="x_has_been_set_as_ringtone">Set %1$s as your ringtone.</string>
     <string name="x_selected">%1$d selected</string>
-
     <string name="year">Year</string>
-
     <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
-
     <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
 </resources>