diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index d63f7508..7adb3f07 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -2,10 +2,8 @@
 <resources>
     <string name="about_album_label">About %s</string>
     <string name="about_settings_summary">Team, social links</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,30 +46,21 @@
     <string name="action_tag_editor">編輯音樂資訊</string>
     <string name="action_toggle_favorite">Toggle favorite</string>
     <string name="action_toggle_shuffle">Toggle shuffle mode</string>
-
     <string name="adaptive">Adaptive</string>
-
     <string name="add_action">Add</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="other">Songs</item>
     </plurals>
-
     <string name="album_artist">專輯演出者</string>
-
     <string name="albums">專輯</string>
     <plurals name="albums">
         <item quantity="other">Albums</item>
     </plurals>
-
     <string name="always">永遠</string>
-
     <string name="app_share">Hey check out this cool music player at: 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>
@@ -80,25 +69,16 @@
     <string name="app_widget_classic_name">經典</string>
     <string name="app_widget_small_name">小型</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">Change the sound settings and adjust the equalizer controls</string>
-
     <string name="auto">Auto</string>
-
     <string name="biography">簡介</string>
-
     <string name="black_theme_name">純黑（AMOLED）</string>
-
     <string name="blacklist">Blacklist</string>
-
     <string name="blur">Blur</string>
     <string name="blur_card">Blur Card</string>
-
     <string name="bug_report_failed">Unable to send report</string>
     <string name="bug_report_failed_invalid_token">Invalid access token. Please contact the app developer.</string>
     <string name="bug_report_failed_issues_not_available">Issues are not enabled for the selected repository. Please contact the app developer.</string>
@@ -112,55 +92,35 @@
     <string name="bug_report_no_username">Please enter your valid GitHub username</string>
     <string name="bug_report_summary">An unexpected error occurred. Sorry you found this bug, if it keeps crashing \"Clear app data\" or send an Email </string>
     <string name="bug_report_use_account">Send using GitHub account</string>
-
     <string name="buy_now">Buy now</string>
-
     <string name="cancel_current_timer">取消目前的計時器</string>
-
     <string name="card">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">Changelog maintained on the Telegram channel</string>
-
     <string name="circle">Circle</string>
-
     <string name="circular">Circular</string>
-
-    <string name="classic">Classic</string>
-
+    <string name="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">主題顏色</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">不能掃描 %d。</string>
-
     <string name="create_action">建立</string>
-
     <string name="created_playlist_x">已新增播放清單 %1$s。</string>
-
     <string name="credit_title">Members and contributors </string>
-
     <string name="currently_listening_to_x_by_x">我正在聽 %2$s 的 %1$s</string>
-
     <string name="dark_theme_name">暗沉</string>
-
     <string name="delete_playlist_title">刪除播放清單</string>
     <string name="delete_playlist_x"><![CDATA[確定要刪除播放清單 <b>%1$s</b> 嗎？]]></string>
     <string name="delete_playlists_title">刪除多個播放清單</string>
@@ -169,62 +129,38 @@
     <string name="delete_songs_title">Delete songs</string>
     <string name="delete_x_playlists"><![CDATA[確定要刪除 <b>%1$d</b> 個播放清單？]]></string>
     <string name="delete_x_songs"><![CDATA[確定要刪除 <b>%1$d</b> 首歌嗎？]]></string>
-
     <string name="deleted_x_songs">已刪除 %1$d 首歌。</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">捐助</string>
     <string name="donate_summary">如果你認為我的努力值得回報，你可以在這裡留幾塊錢。</string>
-
     <string name="donation_header">Buy me a:</string>
-
+    <string name="done">Done</string>
     <string name="drive_mode">Drive mode</string>
-
     <string name="empty">空的</string>
-
     <string name="equalizer">等化器</string>
-
     <string name="faq">FAQ</string>
-
     <string name="favorites">最愛</string>
-
     <string name="finish_last_song">Finish last song</string>
-
     <string name="fit">Fit</string>
-
     <string name="flat">方角</string>
-
     <string name="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">類型</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>
@@ -234,25 +170,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">記錄</string>
-
     <string name="home">首頁</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">已將 %1$d 首歌加入播放清單 %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">位元率</string>
     <string name="label_file_format">格式</string>
     <string name="label_file_name">檔案名稱</string>
@@ -261,45 +192,27 @@
     <string name="label_more_from">More from %s</string>
     <string name="label_sampling_rate">取樣率</string>
     <string name="label_track_length">長度</string>
-
     <string name="labeled">Labeled</string>
-
     <string name="last_added">最後新增</string>
     <string name="last_song">Last song</string>
-
     <string name="library_categories">Library categories</string>
-
     <string name="licenses">原始碼授權</string>
-
     <string name="light_theme_name">明亮</string>
-
     <string name="listeners_label">Listeners</string>
-
     <string name="listing_files">清單文件</string>
-
     <string name="loading_products">正在載入</string>
-
     <string name="login">Login</string>
-
     <string name="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">我的最佳單曲</string>
-
     <string name="never">永不</string>
-
     <string name="new_playlist_title">新增播放清單</string>
     <string name="new_start_directory">%s是新的起始目錄</string>
-
     <string name="next_song">Next Song</string>
-
     <string name="no_albums">沒有專輯</string>
     <string name="no_artists">沒有演唱者</string>
     <string name="no_audio_ID">"請先播放一首歌後再重試一遍。"</string>
@@ -311,57 +224,39 @@
     <string name="no_purchase_found">No purchase found.</string>
     <string name="no_results">沒有搜尋結果</string>
     <string name="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> 未在音樂庫裡。]]></string>
-
+    <string name="not_recently_played">Not recently played</string>
     <string name="nothing_to_scan">沒有東西可掃描。</string>
     <string name="nothing_to_see">Nothing to see</string>
-
     <string name="notification">通知</string>
     <string name="notification_settings_summary">Customize the notification style</string>
-
     <string name="now_playing">Now playing</string>
     <string name="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">只在有 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">無法取得存取外部儲存空間的權限。</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">存取被拒</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">從手機裡選擇（SD卡或記憶體）</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">播放清單名稱</string>
-
     <string name="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>
@@ -375,13 +270,14 @@
     <string name="pref_header_images">圖片</string>
     <string name="pref_header_library">Library</string>
     <string name="pref_header_lockscreen">鎖定螢幕</string>
-    <string name="pref_header_playlists">Playlists</string>
+    <string name="pref_header_playlists">播放清單</string>
     <string name="pref_keep_pause_on_zero_volume_summary">Pauses the song when the volume decreases to zero and starts playing back when the volume level rises. Also works outside the app</string>
     <string name="pref_keep_pause_on_zero_volume_title">Pause on zero</string>
     <string name="pref_keep_screen_on_summary">Keep in mind that enabling this feature may affect battery life</string>
     <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">將播放中歌曲的專輯封面設為鎖定螢幕背景。</string>
+    <string name="pref_summary_album_artists_only">Show Album Artists in the Artist category</string>
     <string name="pref_summary_audio_ducking">通知鈴聲、導航語音等。</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>
@@ -406,6 +302,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">顯示專輯封面</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">彩色的應用快捷方式</string>
@@ -423,6 +320,7 @@
     <string name="pref_title_extra_song_info">Song info</string>
     <string name="pref_title_gapless_playback">無縫播放</string>
     <string name="pref_title_general_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">忽略音訊檔內嵌的專輯封面</string>
@@ -436,22 +334,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">播放佇列</string>
-
     <string name="rate_app">評分</string>
     <string name="rate_on_google_play_summary">如果您喜歡 Retro music，在 Play 商店給個好評吧 ！</string>
-
     <string name="recent_albums">Recent albums</string>
     <string name="recent_artists">Recent artists</string>
-
     <string name="remove_action">移除</string>
     <string name="remove_cover">移除封面</string>
     <string name="remove_from_blacklist">Remove from blacklist</string>
@@ -459,25 +350,19 @@
     <string name="remove_song_x_from_playlist"><![CDATA[確定要將歌曲 <b>%1$s</b> 從播放清單中移除嗎？]]></string>
     <string name="remove_songs_from_playlist_title">將多首歌曲從播放清單中移除</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[確定要將 <b>%1$d</b> 首歌從播放清單中移除嗎？]]></string>
-
     <string name="rename_playlist_title">重新命名播放清單</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">回復購買</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>
@@ -490,142 +375,92 @@
     <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">儲存檔案</string>
     <string name="save_playlists_title">Save as files</string>
-
     <string name="saved_playlist_to">已儲存播放清單至 %s</string>
-
     <string name="saving_changes">儲存變更</string>
-
     <string name="scan_media">Scan media</string>
-
     <string name="scanned_files">已掃描 %2$d 個檔案夾中的 %1$d 個。</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">隨機播放</string>
-
     <string name="simple">Simple</string>
-
     <string name="sleep_timer_canceled">已取消睡眠定時器。</string>
     <string name="sleep_timer_set">%d 分鐘後，音樂將會自動停止。</string>
-
     <string name="social">Social</string>
     <string name="social_stories">Share story</string>
-
     <string name="song">歌曲</string>
     <string name="song_duration">Song duration</string>
-
     <string name="songs">歌曲</string>
-
     <string name="sort_order">排序</string>
     <string name="sort_order_a_z">Ascending</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_artist">Artist</string>
+    <string name="sort_order_album">專輯</string>
+    <string name="sort_order_artist">演唱者</string>
     <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">抱歉！你的裝置不支援語音輸入</string>
     <string name="speech_prompt">搜尋音樂庫</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">支援開發</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">感謝你！</string>
-
     <string name="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">"音軌（用2表示第2首歌或用3004表示 CD3 的第4首歌）"</string>
     <string name="track_list">Track number</string>
-
     <string name="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">\u7121\u6cd5\u64ad\u653e\u9019\u9996\u6b4c\u3002</string>
-
     <string name="up_next">即將播放</string>
-
     <string name="update_image">更新圖片</string>
-
     <string name="updating">正在更新…</string>
-
+    <string name="user_name">User Name</string>
     <string name="username">Username</string>
-
     <string name="version">版本</string>
-
     <string name="vertical_flip">Vertical flip</string>
-
     <string name="volume">Volume</string>
-
     <string name="web_search">網路搜尋</string>
-
     <string name="welcome">Welcome,</string>
-
     <string name="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">已將 %1$s 設為鈴聲。</string>
     <string name="x_selected">已選取 %1$d 個</string>
-
     <string name="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>