From a8dfe106bb2c1f9c16e179c80c1226ce7d2840e4 Mon Sep 17 00:00:00 2001
From: h4h13 <hemanths@live.com>
Date: Mon, 10 Sep 2018 01:14:46 +0530
Subject: [PATCH] AndroidX lib refactor

---
 .idea/assetWizardSettings.xml                 |  25 +-
 .idea/gradle.xml                              |   3 -
 ...on_navigation_common_1_0_0_alpha05_aar.xml |  15 -
 ..._navigation_fragment_1_0_0_alpha05_aar.xml |  12 -
 ...n_navigation_runtime_1_0_0_alpha05_aar.xml |  12 -
 ...gation_navigation_ui_1_0_0_alpha05_aar.xml |  12 -
 ...x_gridlayout_gridlayout_1_0_0_rc01_aar.xml |   4 +-
 ...y_legacy_preference_v14_1_0_0_rc01_aar.xml |   4 +-
 ...gacy_legacy_support_v13_1_0_0_rc01_aar.xml |   4 +-
 ...roid_gms_play_services_base_15_0_1_aar.xml |   4 +-
 ..._gms_play_services_basement_15_0_1_aar.xml |   4 +-
 ...oid_gms_play_services_cast_16_0_2_aar.xml} |   6 +-
 ...ay_services_cast_framework_16_0_2_aar.xml} |   6 +-
 ...oid_gms_play_services_flags_15_0_1_aar.xml |   4 +-
 ...oid_gms_play_services_tasks_15_0_1_aar.xml |   4 +-
 ...butterknife_runtime_9_0_0_SNAPSHOT_aar.xml |  12 +
 RetroMusicPlayer.iml                          |   9 +-
 app/app.iml                                   | 120 +--
 app/build.gradle                              |  20 +-
 app/src/main/AndroidManifest.xml              |   3 +-
 app/src/main/assets/contributors.json         |  26 +
 app/src/main/assets/retro-changelog.html      |   2 +-
 .../monkey/retromusic/cast/CastHelper.java    |   5 +-
 .../retromusic/cast/CastOptionsProvider.java  |   4 +-
 ...java => ExpandedCastControlsActivity.java} |   2 +-
 .../dialogs/CreatePlaylistDialog.java         |   4 +-
 .../retromusic/dialogs/HomeOptionDialog.java  | 146 ----
 .../MainOptionsBottomSheetDialogFragment.java | 154 +++-
 .../retromusic/helper/MusicPlayerRemote.java  |  50 +-
 .../misc/AppBarStateChangeListener.java       |   2 +-
 .../misc/NavigationIconClickListener.java     | 104 ---
 .../misc/ScrollAwareFABBehavior.java          |  48 +-
 .../monkey/retromusic/model/Contributor.java  |  34 +
 .../retromusic/rest/LastFMRestClient.java     |   2 +-
 .../ui/activities/AboutActivity.java          |  49 +-
 .../ui/activities/AlbumDetailsActivity.java   |   8 +-
 .../ui/activities/ArtistDetailActivity.java   |   2 +
 .../ui/activities/GenreDetailsActivity.java   |   1 +
 .../ui/activities/LyricsActivity.java         |  10 +-
 .../ui/activities/MainActivity.java           |  79 +-
 .../ui/activities/PlayingQueueActivity.java   |   5 +-
 .../ui/activities/PlaylistDetailActivity.java |   1 +
 .../ui/activities/UserInfoActivity.java       | 270 ++++++-
 .../ui/activities/base/AbsCastActivity.java   |   6 +-
 .../base/AbsSlidingMusicPanelActivity.java    |  99 ++-
 .../tageditor/AbsTagEditorActivity.java       |   9 +-
 .../tageditor/AlbumTagEditorActivity.java     |  71 +-
 .../tageditor/SongTagEditorActivity.java      |   4 +-
 .../ui/adapter/ContributorAdapter.java        |  71 ++
 .../adapter/album/AlbumCoverPagerAdapter.java |  11 +-
 .../ui/adapter/song/PlayingQueueAdapter.java  |   3 -
 .../ui/fragments/AlbumCoverStyle.java         |   8 +-
 .../ui/fragments/MiniPlayerFragment.java      |  21 +-
 .../ui/fragments/PlayingQueueFragment.java    |   2 +-
 .../base/AbsMainActivityFragment.java         |   8 +-
 .../ui/fragments/intro/NameFragment.java      | 275 -------
 .../mainactivity/LibraryFragment.java         | 142 +---
 .../mainactivity/folders/FoldersFragment.java |  79 +-
 .../mainactivity/home/BannerHomeFragment.java | 176 +++--
 .../mainactivity/home/HomeFragment.java       | 621 ++-------------
 .../fragments/player/color/ColorFragment.java |  10 +-
 .../material/MaterialControlsFragment.java    |  20 +-
 .../retromusic/util/NavigationUtil.java       |   9 +-
 .../retromusic/util/PreferenceUtil.java       |   2 +-
 .../retromusic/views/ContributorsView.java    |  61 ++
 .../retromusic/views/NetworkImageView.java    |  17 +-
 .../RoundedBottomSheetDialogFragment.java     |   4 +
 .../retromusic/views/VerticalTextView.java    |  28 +-
 app/src/main/res/anim/bounce.xml              |  10 -
 .../grid_layout_animation_from_bottom.xml     |   9 -
 app/src/main/res/anim/item_animation_fade.xml |   7 -
 .../res/anim/item_animation_from_right.xml    |  17 -
 .../main/res/anim/layout_animation_fade.xml   |   4 -
 .../res/anim/layout_animation_slide_right.xml |   5 -
 .../main/res/animator/appbar_elevation.xml    |  11 -
 .../drawable-v24/ic_launcher_background.xml   |  24 -
 .../album_cover_full_card.webp                | Bin 0 -> 4208 bytes
 .../drawable-xxxhdpi/album_cover_normal.webp  | Bin 0 -> 4194 bytes
 .../res/drawable-xxxhdpi/np_card_blur.webp    | Bin 14152 -> 0 bytes
 .../main/res/drawable-xxxhdpi/np_holiday.webp | Bin 16800 -> 0 bytes
 app/src/main/res/drawable/abs_timer.xml       |   5 -
 app/src/main/res/drawable/color_gradient.xml  |   8 -
 .../drawable/et_bg_circular_top_corners.xml   |   2 +-
 app/src/main/res/drawable/gradient.xml        |   7 -
 app/src/main/res/drawable/gradient_2.xml      |   7 -
 app/src/main/res/drawable/gradient_7.xml      |   7 -
 .../main/res/drawable/holiday_background.xml  |   7 -
 .../res/drawable/ic_app_icon_with_shadow.xml  |   9 -
 .../main/res/drawable/ic_audio_tag_square.xml |  16 -
 app/src/main/res/drawable/ic_facebook.xml     |   8 -
 .../drawable/ic_google_plus_white_24dp.xml    |  10 -
 .../res/drawable/ic_launcher_background.xml   |   8 -
 .../res/drawable/ic_launcher_foreground.xml   |  17 -
 app/src/main/res/drawable/ic_patreon.xml      |   8 -
 .../res/drawable/ic_person_white_24dp.xml     |   9 -
 .../ic_round_add_a_photo_white_24dp.xml       |  15 +
 .../main/res/drawable/ic_vector_square.xml    |   9 -
 .../drawable/ic_water_bottle_white_24dp.xml   |   9 -
 .../main/res/drawable/lockscreen_gradient.xml |   8 -
 app/src/main/res/drawable/material_icons.xml  |  19 -
 .../mini_player_progress_drawable.xml         |  11 -
 app/src/main/res/drawable/shadow.xml          |   8 -
 .../main/res/drawable/shadow_down_edited.xml  |   8 -
 .../res/drawable/shadow_left_to_right.xml     |   6 -
 .../main/res/drawable/shadow_up_details.xml   |   8 -
 .../main/res/drawable/shape_button_edit.xml   |   9 -
 .../main/res/drawable/shape_rounded_edit.xml  |   9 -
 .../res/drawable/shuffle_line_background.xml  |   8 -
 .../main/res/drawable/square_play_button.xml  |  18 -
 .../drawable/square_play_button_design.xml    |  17 -
 .../layout-land/activity_album_tag_editor.xml | 202 +++--
 .../res/layout-land/fragment_banner_home.xml  | 125 ++-
 .../main/res/layout-land/fragment_home.xml    |   2 +-
 .../main/res/layout-land/retro_backdrop.xml   |  63 --
 .../res/layout-sw600dp/retro_backdrop.xml     |  52 --
 .../activity_album_tag_editor.xml             | 164 ----
 .../activity_artist_details_blur.xml          | 213 -----
 .../fragment_banner_home.xml                  | 124 ++-
 .../res/layout-xlarge-land/fragment_home.xml  |  76 +-
 .../activity_album_tag_editor.xml             | 162 ----
 .../main/res/layout-xlarge/fragment_home.xml  |  75 +-
 .../main/res/layout-xlarge/fragment_name.xml  | 120 ---
 .../res/layout/activity_album_tag_editor.xml  | 306 +++++---
 .../layout/activity_artist_details_blur.xml   | 219 ------
 .../main/res/layout/activity_lock_screen.xml  |  67 --
 .../main/res/layout/activity_main_content.xml |  10 -
 .../res/layout/activity_song_tag_editor.xml   |  76 +-
 .../main/res/layout/activity_user_info.xml    | 140 +++-
 app/src/main/res/layout/card_credit.xml       | 139 +---
 .../main/res/layout/content_banner_home.xml   |  28 -
 .../res/layout/dialog_create_playlist.xml     |   2 +-
 app/src/main/res/layout/dialog_delete.xml     |   2 +
 .../res/layout/dialog_playlist_rename.xml     |   2 +-
 .../main/res/layout/dialog_sleep_timer.xml    |   2 +-
 .../layout/fragment_album_carousal_cover.xml  |  29 -
 ...xml => fragment_album_full_card_cover.xml} |  17 +-
 .../main/res/layout/fragment_banner_home.xml  |  77 +-
 .../layout/fragment_cast_mini_controller.xml  |   9 -
 app/src/main/res/layout/fragment_folder.xml   |  78 +-
 app/src/main/res/layout/fragment_home.xml     |  46 +-
 app/src/main/res/layout/fragment_library.xml  |  68 +-
 .../main/res/layout/fragment_main_options.xml | 149 +++-
 .../main/res/layout/fragment_mini_player.xml  |  29 +-
 app/src/main/res/layout/fragment_name.xml     | 122 ---
 app/src/main/res/layout/fragment_playlist.xml |  46 --
 .../main/res/layout/fragment_queue_player.xml |  70 --
 ...ragment_queue_player_playback_controls.xml | 186 -----
 app/src/main/res/layout/home_shortcuts.xml    | 143 ----
 .../main/res/layout/horizontal_progress.xml   |  10 -
 app/src/main/res/layout/item_contributor.xml  |  45 ++
 app/src/main/res/layout/item_contributors.xml |  16 -
 app/src/main/res/layout/item_list.xml         |  14 +-
 app/src/main/res/layout/item_queue.xml        | 100 +++
 .../main/res/layout/pager_recycler_view.xml   |  45 --
 .../preference_dialog_library_categories.xml  |  11 -
 ...nce_dialog_library_categories_listitem.xml |  55 --
 app/src/main/res/layout/recycler_view_sec.xml |  32 -
 app/src/main/res/layout/retro_backdrop.xml    |  47 --
 app/src/main/res/layout/simple_list_item.xml  |  10 -
 .../res/layout/sliding_music_panel_layout.xml |  77 +-
 .../main/res/layout/user_action_details.xml   | 225 ------
 .../main/res/menu/bottom_navigation_main.xml  |  12 +-
 app/src/main/res/menu/menu_home.xml           |  19 -
 app/src/main/res/menu/menu_main_options.xml   |  25 -
 app/src/main/res/menu/menu_search.xml         |  10 -
 app/src/main/res/navigation/nav_graph.xml     |  45 --
 .../res/transition/default_window_fade.xml    |   8 -
 app/src/main/res/values-ar/strings.xml        |  71 --
 app/src/main/res/values-cs/strings.xml        |  33 -
 app/src/main/res/values-de-rDE/strings.xml    | 729 ++++++++----------
 app/src/main/res/values-de/strings.xml        |  53 --
 app/src/main/res/values-el/strings.xml        |  74 --
 app/src/main/res/values-es-rES/strings.xml    | 120 ---
 app/src/main/res/values-es-rUS/strings.xml    | 125 ---
 app/src/main/res/values-es/strings.xml        | 125 ---
 app/src/main/res/values-eu-rES/strings.xml    | 125 ---
 app/src/main/res/values-fr/strings.xml        | 123 ---
 app/src/main/res/values-hdpi/dimens.xml       |   4 -
 app/src/main/res/values-hi-rIN/strings.xml    |  13 -
 app/src/main/res/values-hr/strings.xml        | 124 ---
 app/src/main/res/values-hu/strings.xml        | 125 ---
 app/src/main/res/values-id/strings.xml        | 120 ---
 app/src/main/res/values-in/strings.xml        |  32 -
 app/src/main/res/values-it/strings.xml        | 125 ---
 app/src/main/res/values-ja/strings.xml        | 106 ---
 app/src/main/res/values-ko/strings.xml        | 125 ---
 app/src/main/res/values-ldpi/dimens.xml       |   4 -
 app/src/main/res/values-mdpi/dimens.xml       |   4 -
 app/src/main/res/values-ms/strings.xml        |  97 ---
 app/src/main/res/values-nl/strings.xml        |  66 --
 app/src/main/res/values-pl/strings.xml        | 124 ---
 app/src/main/res/values-pt-rBR/strings.xml    | 125 ---
 app/src/main/res/values-ro/strings.xml        | 125 ---
 app/src/main/res/values-ru/strings.xml        | 125 ---
 app/src/main/res/values-sr/strings.xml        |  71 --
 .../main/res/values-sw600dp-land/dimens.xml   |   1 -
 app/src/main/res/values-sw600dp/dimens.xml    |   5 +-
 app/src/main/res/values-tr/strings.xml        | 121 ---
 app/src/main/res/values-v19/dimens.xml        |   5 -
 app/src/main/res/values-v21/dimens.xml        |   5 -
 app/src/main/res/values-v21/fonts.xml         |   7 -
 app/src/main/res/values-v21/integers.xml      |   4 -
 app/src/main/res/values-v21/styles.xml        |  10 -
 app/src/main/res/values-xhdpi/dimens.xml      |   4 -
 app/src/main/res/values-xxhdpi/dimens.xml     |   4 -
 app/src/main/res/values-xxxhdpi/dimens.xml    |   4 -
 app/src/main/res/values-zh-rCN/strings.xml    | 729 ++++++++----------
 app/src/main/res/values-zh-rHK/strings.xml    | 126 ---
 app/src/main/res/values-zh-rTW/strings.xml    |  33 -
 app/src/main/res/values/arrays.xml            |  25 +-
 app/src/main/res/values/attrs.xml             |  68 +-
 app/src/main/res/values/cast_style.xml        |  20 -
 app/src/main/res/values/colors.xml            |   1 -
 app/src/main/res/values/dimens.xml            |  36 +-
 app/src/main/res/values/donottranslate.xml    |  28 -
 .../res/values/ic_launcher_background.xml     |   4 +-
 app/src/main/res/values/integers.xml          |   2 -
 app/src/main/res/values/md_colors.xml         | 275 -------
 app/src/main/res/values/strings.xml           | 178 +----
 app/src/main/res/values/styles.xml            |  88 ---
 app/src/main/res/values/styles_parents.xml    |  31 +-
 app/src/main/res/values/values.xml            |   2 -
 app/src/main/res/xml/pref_extras.xml          |  15 +
 app/src/main/res/xml/pref_others.xml          |  29 -
 app/src/main/res/xml/pref_ui.xml              |  14 +
 appthemehelper/appthemehelper.iml             |  73 +-
 .../src/main/res/drawable/ate_check.xml       |  12 +-
 .../main/res/drawable/ic_toggle_switch.xml    |  14 +-
 .../res/drawable/ic_toggle_switch_off.xml     |   9 +-
 appthemehelper/src/main/res/values/colors.xml |   5 -
 .../res/values/colors_material_design.xml     | 255 ------
 appthemehelper/src/main/res/values/dimens.xml |   7 -
 build.gradle                                  |  10 +-
 233 files changed, 3254 insertions(+), 9769 deletions(-)
 delete mode 100644 .idea/libraries/Gradle__android_arch_navigation_navigation_common_1_0_0_alpha05_aar.xml
 delete mode 100644 .idea/libraries/Gradle__android_arch_navigation_navigation_fragment_1_0_0_alpha05_aar.xml
 delete mode 100644 .idea/libraries/Gradle__android_arch_navigation_navigation_runtime_1_0_0_alpha05_aar.xml
 delete mode 100644 .idea/libraries/Gradle__android_arch_navigation_navigation_ui_1_0_0_alpha05_aar.xml
 rename .idea/libraries/{Gradle__com_google_android_gms_play_services_cast_16_0_1_aar.xml => Gradle__com_google_android_gms_play_services_cast_16_0_2_aar.xml} (59%)
 rename .idea/libraries/{Gradle__com_google_android_gms_play_services_cast_framework_16_0_1_aar.xml => Gradle__com_google_android_gms_play_services_cast_framework_16_0_2_aar.xml} (56%)
 create mode 100644 .idea/libraries/Gradle__com_jakewharton_butterknife_runtime_9_0_0_SNAPSHOT_aar.xml
 create mode 100644 app/src/main/assets/contributors.json
 rename app/src/main/java/code/name/monkey/retromusic/cast/{ExpandedControlsActivity.java => ExpandedCastControlsActivity.java} (90%)
 delete mode 100644 app/src/main/java/code/name/monkey/retromusic/dialogs/HomeOptionDialog.java
 delete mode 100755 app/src/main/java/code/name/monkey/retromusic/misc/NavigationIconClickListener.java
 create mode 100644 app/src/main/java/code/name/monkey/retromusic/model/Contributor.java
 create mode 100644 app/src/main/java/code/name/monkey/retromusic/ui/adapter/ContributorAdapter.java
 delete mode 100644 app/src/main/java/code/name/monkey/retromusic/ui/fragments/intro/NameFragment.java
 create mode 100644 app/src/main/java/code/name/monkey/retromusic/views/ContributorsView.java
 delete mode 100644 app/src/main/res/anim/bounce.xml
 delete mode 100644 app/src/main/res/anim/grid_layout_animation_from_bottom.xml
 delete mode 100644 app/src/main/res/anim/item_animation_fade.xml
 delete mode 100644 app/src/main/res/anim/item_animation_from_right.xml
 delete mode 100644 app/src/main/res/anim/layout_animation_fade.xml
 delete mode 100644 app/src/main/res/anim/layout_animation_slide_right.xml
 delete mode 100644 app/src/main/res/animator/appbar_elevation.xml
 delete mode 100644 app/src/main/res/drawable-v24/ic_launcher_background.xml
 create mode 100644 app/src/main/res/drawable-xxxhdpi/album_cover_full_card.webp
 create mode 100644 app/src/main/res/drawable-xxxhdpi/album_cover_normal.webp
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/np_card_blur.webp
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/np_holiday.webp
 delete mode 100644 app/src/main/res/drawable/abs_timer.xml
 delete mode 100755 app/src/main/res/drawable/color_gradient.xml
 delete mode 100644 app/src/main/res/drawable/gradient.xml
 delete mode 100644 app/src/main/res/drawable/gradient_2.xml
 delete mode 100644 app/src/main/res/drawable/gradient_7.xml
 delete mode 100644 app/src/main/res/drawable/holiday_background.xml
 delete mode 100644 app/src/main/res/drawable/ic_app_icon_with_shadow.xml
 delete mode 100644 app/src/main/res/drawable/ic_audio_tag_square.xml
 delete mode 100644 app/src/main/res/drawable/ic_facebook.xml
 delete mode 100644 app/src/main/res/drawable/ic_google_plus_white_24dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_launcher_background.xml
 delete mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml
 delete mode 100644 app/src/main/res/drawable/ic_patreon.xml
 delete mode 100644 app/src/main/res/drawable/ic_person_white_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_round_add_a_photo_white_24dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_vector_square.xml
 delete mode 100644 app/src/main/res/drawable/ic_water_bottle_white_24dp.xml
 delete mode 100644 app/src/main/res/drawable/lockscreen_gradient.xml
 delete mode 100644 app/src/main/res/drawable/material_icons.xml
 delete mode 100644 app/src/main/res/drawable/mini_player_progress_drawable.xml
 delete mode 100644 app/src/main/res/drawable/shadow.xml
 delete mode 100644 app/src/main/res/drawable/shadow_down_edited.xml
 delete mode 100644 app/src/main/res/drawable/shadow_left_to_right.xml
 delete mode 100644 app/src/main/res/drawable/shadow_up_details.xml
 delete mode 100644 app/src/main/res/drawable/shape_button_edit.xml
 delete mode 100644 app/src/main/res/drawable/shape_rounded_edit.xml
 delete mode 100644 app/src/main/res/drawable/shuffle_line_background.xml
 delete mode 100644 app/src/main/res/drawable/square_play_button.xml
 delete mode 100644 app/src/main/res/drawable/square_play_button_design.xml
 delete mode 100644 app/src/main/res/layout-land/retro_backdrop.xml
 delete mode 100644 app/src/main/res/layout-sw600dp/retro_backdrop.xml
 delete mode 100644 app/src/main/res/layout-xlarge-land/activity_album_tag_editor.xml
 delete mode 100755 app/src/main/res/layout-xlarge-land/activity_artist_details_blur.xml
 delete mode 100644 app/src/main/res/layout-xlarge/activity_album_tag_editor.xml
 delete mode 100644 app/src/main/res/layout-xlarge/fragment_name.xml
 delete mode 100755 app/src/main/res/layout/activity_artist_details_blur.xml
 delete mode 100644 app/src/main/res/layout/activity_lock_screen.xml
 delete mode 100644 app/src/main/res/layout/content_banner_home.xml
 delete mode 100644 app/src/main/res/layout/fragment_album_carousal_cover.xml
 rename app/src/main/res/layout/{fragment_adaptive_cover.xml => fragment_album_full_card_cover.xml} (59%)
 delete mode 100644 app/src/main/res/layout/fragment_cast_mini_controller.xml
 delete mode 100644 app/src/main/res/layout/fragment_name.xml
 delete mode 100644 app/src/main/res/layout/fragment_playlist.xml
 delete mode 100644 app/src/main/res/layout/fragment_queue_player.xml
 delete mode 100644 app/src/main/res/layout/fragment_queue_player_playback_controls.xml
 delete mode 100644 app/src/main/res/layout/home_shortcuts.xml
 delete mode 100644 app/src/main/res/layout/horizontal_progress.xml
 create mode 100644 app/src/main/res/layout/item_contributor.xml
 delete mode 100644 app/src/main/res/layout/item_contributors.xml
 create mode 100644 app/src/main/res/layout/item_queue.xml
 delete mode 100644 app/src/main/res/layout/pager_recycler_view.xml
 delete mode 100644 app/src/main/res/layout/preference_dialog_library_categories.xml
 delete mode 100644 app/src/main/res/layout/preference_dialog_library_categories_listitem.xml
 delete mode 100644 app/src/main/res/layout/recycler_view_sec.xml
 delete mode 100644 app/src/main/res/layout/retro_backdrop.xml
 delete mode 100644 app/src/main/res/layout/simple_list_item.xml
 delete mode 100644 app/src/main/res/layout/user_action_details.xml
 delete mode 100644 app/src/main/res/menu/menu_home.xml
 delete mode 100644 app/src/main/res/menu/menu_main_options.xml
 delete mode 100644 app/src/main/res/menu/menu_search.xml
 delete mode 100644 app/src/main/res/navigation/nav_graph.xml
 delete mode 100644 app/src/main/res/transition/default_window_fade.xml
 delete mode 100644 app/src/main/res/values-hdpi/dimens.xml
 delete mode 100644 app/src/main/res/values-ldpi/dimens.xml
 delete mode 100644 app/src/main/res/values-mdpi/dimens.xml
 delete mode 100644 app/src/main/res/values-v19/dimens.xml
 delete mode 100644 app/src/main/res/values-v21/dimens.xml
 delete mode 100644 app/src/main/res/values-v21/fonts.xml
 delete mode 100644 app/src/main/res/values-v21/integers.xml
 delete mode 100644 app/src/main/res/values-xhdpi/dimens.xml
 delete mode 100644 app/src/main/res/values-xxhdpi/dimens.xml
 delete mode 100644 app/src/main/res/values-xxxhdpi/dimens.xml
 create mode 100644 app/src/main/res/xml/pref_extras.xml
 delete mode 100644 app/src/main/res/xml/pref_others.xml

diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
index 6b96cf0c1..840634def 100644
--- a/.idea/assetWizardSettings.xml
+++ b/.idea/assetWizardSettings.xml
@@ -3,11 +3,34 @@
   <component name="WizardSettings">
     <option name="children">
       <map>
-        <entry key="vectorWizard">
+        <entry key="imageWizard">
           <value>
             <PersistentState />
           </value>
         </entry>
+        <entry key="vectorWizard">
+          <value>
+            <PersistentState>
+              <option name="children">
+                <map>
+                  <entry key="vectorAssetStep">
+                    <value>
+                      <PersistentState>
+                        <option name="values">
+                          <map>
+                            <entry key="assetSourceType" value="FILE" />
+                            <entry key="outputName" value="ate_check" />
+                            <entry key="sourceFile" value="$USER_HOME$/Downloads/round-check-24px.svg" />
+                          </map>
+                        </option>
+                      </PersistentState>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </PersistentState>
+          </value>
+        </entry>
       </map>
     </option>
   </component>
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index dbb97a736..9f00a5923 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,9 +3,6 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/libraries/Gradle__android_arch_navigation_navigation_common_1_0_0_alpha05_aar.xml b/.idea/libraries/Gradle__android_arch_navigation_navigation_common_1_0_0_alpha05_aar.xml
deleted file mode 100644
index a80f8bc91..000000000
--- a/.idea/libraries/Gradle__android_arch_navigation_navigation_common_1_0_0_alpha05_aar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: android.arch.navigation:navigation-common:1.0.0-alpha05@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-navigation-common-1.0.0-alpha05.aar/5e2a2eea3403bb0077ef13b42aedf099/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-navigation-common-1.0.0-alpha05.aar/5e2a2eea3403bb0077ef13b42aedf099/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-navigation-common-1.0.0-alpha05.aar/5e2a2eea3403bb0077ef13b42aedf099/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.navigation/navigation-common/1.0.0-alpha05/c993c5c6966859560f1e30f1d620af212b751116/navigation-common-1.0.0-alpha05-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__android_arch_navigation_navigation_fragment_1_0_0_alpha05_aar.xml b/.idea/libraries/Gradle__android_arch_navigation_navigation_fragment_1_0_0_alpha05_aar.xml
deleted file mode 100644
index 13c0d716f..000000000
--- a/.idea/libraries/Gradle__android_arch_navigation_navigation_fragment_1_0_0_alpha05_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: android.arch.navigation:navigation-fragment:1.0.0-alpha05@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-navigation-fragment-1.0.0-alpha05.aar/84ef0a3159ce5c7b19e0bd449d3c1aa7/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-navigation-fragment-1.0.0-alpha05.aar/84ef0a3159ce5c7b19e0bd449d3c1aa7/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.navigation/navigation-fragment/1.0.0-alpha05/c2dd45048f539b5b359dbbfee9c80f3d0c646381/navigation-fragment-1.0.0-alpha05-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__android_arch_navigation_navigation_runtime_1_0_0_alpha05_aar.xml b/.idea/libraries/Gradle__android_arch_navigation_navigation_runtime_1_0_0_alpha05_aar.xml
deleted file mode 100644
index f114992aa..000000000
--- a/.idea/libraries/Gradle__android_arch_navigation_navigation_runtime_1_0_0_alpha05_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: android.arch.navigation:navigation-runtime:1.0.0-alpha05@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-navigation-runtime-1.0.0-alpha05.aar/bb310dd858183064328792edb306d025/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-navigation-runtime-1.0.0-alpha05.aar/bb310dd858183064328792edb306d025/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.navigation/navigation-runtime/1.0.0-alpha05/f65f267889cdf7a667b2a205d68d27d0d272bfd1/navigation-runtime-1.0.0-alpha05-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__android_arch_navigation_navigation_ui_1_0_0_alpha05_aar.xml b/.idea/libraries/Gradle__android_arch_navigation_navigation_ui_1_0_0_alpha05_aar.xml
deleted file mode 100644
index 0fac57bea..000000000
--- a/.idea/libraries/Gradle__android_arch_navigation_navigation_ui_1_0_0_alpha05_aar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: android.arch.navigation:navigation-ui:1.0.0-alpha05@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-navigation-ui-1.0.0-alpha05.aar/02ef3e0dd7a8e383526003034c8c6f3d/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-navigation-ui-1.0.0-alpha05.aar/02ef3e0dd7a8e383526003034c8c6f3d/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.navigation/navigation-ui/1.0.0-alpha05/b68f2152e0ef5b04c444a95f52179ea8f63b0fd8/navigation-ui-1.0.0-alpha05-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_gridlayout_gridlayout_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_gridlayout_gridlayout_1_0_0_rc01_aar.xml
index 6b400fe0c..7276539d9 100644
--- a/.idea/libraries/Gradle__androidx_gridlayout_gridlayout_1_0_0_rc01_aar.xml
+++ b/.idea/libraries/Gradle__androidx_gridlayout_gridlayout_1_0_0_rc01_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: androidx.gridlayout:gridlayout:1.0.0-rc01@aar">
     <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/gridlayout-1.0.0-rc01.aar/afe09fea9af66dc762f5f79528db3bcd/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/gridlayout-1.0.0-rc01.aar/afe09fea9af66dc762f5f79528db3bcd/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/gridlayout-1.0.0-rc01.aar/7734364c71450e50aa2231b5ecfbc0c0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/gridlayout-1.0.0-rc01.aar/7734364c71450e50aa2231b5ecfbc0c0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_preference_v14_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_preference_v14_1_0_0_rc01_aar.xml
index c175a9676..bfab8d34e 100644
--- a/.idea/libraries/Gradle__androidx_legacy_legacy_preference_v14_1_0_0_rc01_aar.xml
+++ b/.idea/libraries/Gradle__androidx_legacy_legacy_preference_v14_1_0_0_rc01_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: androidx.legacy:legacy-preference-v14:1.0.0-rc01@aar">
     <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/legacy-preference-v14-1.0.0-rc01.aar/5ca2d090ca7b26d56551559e95b128eb/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/legacy-preference-v14-1.0.0-rc01.aar/5ca2d090ca7b26d56551559e95b128eb/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/legacy-preference-v14-1.0.0-rc01.aar/ca65747cf84e82e771cad06d4e766a35/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/legacy-preference-v14-1.0.0-rc01.aar/ca65747cf84e82e771cad06d4e766a35/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_v13_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_v13_1_0_0_rc01_aar.xml
index 7bbd1b135..5d6bd4c92 100644
--- a/.idea/libraries/Gradle__androidx_legacy_legacy_support_v13_1_0_0_rc01_aar.xml
+++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_v13_1_0_0_rc01_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: androidx.legacy:legacy-support-v13:1.0.0-rc01@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/legacy-support-v13-1.0.0-rc01.aar/cce10cbfe7168fdb432e523ed2884f7c/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/legacy-support-v13-1.0.0-rc01.aar/cce10cbfe7168fdb432e523ed2884f7c/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/legacy-support-v13-1.0.0-rc01.aar/a6641f0e0ae3e492b4aeb9f5603bee3c/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/legacy-support-v13-1.0.0-rc01.aar/a6641f0e0ae3e492b4aeb9f5603bee3c/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1_aar.xml
index 4c611c6a7..33a32450b 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.android.gms:play-services-base:15.0.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-base-15.0.1.aar/c80d87a527483d26639271480c91b1f6/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-base-15.0.1.aar/c80d87a527483d26639271480c91b1f6/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-play-services-base-15.0.1.aar/d5c404a0dc1e524d992006025a016e21/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-play-services-base-15.0.1.aar/d5c404a0dc1e524d992006025a016e21/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1_aar.xml
index 16c420a1c..ba6639cf9 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.android.gms:play-services-basement:15.0.1@aar">
     <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/202604b3858a2553dddafe8102b81286/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/202604b3858a2553dddafe8102b81286/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-play-services-basement-15.0.1.aar/e4b2db320cbe117dbf9883186eda3125/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-play-services-basement-15.0.1.aar/e4b2db320cbe117dbf9883186eda3125/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_cast_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_cast_16_0_2_aar.xml
similarity index 59%
rename from .idea/libraries/Gradle__com_google_android_gms_play_services_cast_16_0_1_aar.xml
rename to .idea/libraries/Gradle__com_google_android_gms_play_services_cast_16_0_2_aar.xml
index 90d114a23..89247fb35 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_cast_16_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_cast_16_0_2_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
-  <library name="Gradle: com.google.android.gms:play-services-cast:16.0.1@aar">
+  <library name="Gradle: com.google.android.gms:play-services-cast:16.0.2@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-cast-16.0.1.aar/55de561aa1b25e2e8650358af1c1c167/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-cast-16.0.1.aar/55de561aa1b25e2e8650358af1c1c167/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-play-services-cast-16.0.2.aar/090e97610f0f4881a3aad1d6df238373/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-play-services-cast-16.0.2.aar/090e97610f0f4881a3aad1d6df238373/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_cast_framework_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_cast_framework_16_0_2_aar.xml
similarity index 56%
rename from .idea/libraries/Gradle__com_google_android_gms_play_services_cast_framework_16_0_1_aar.xml
rename to .idea/libraries/Gradle__com_google_android_gms_play_services_cast_framework_16_0_2_aar.xml
index 4cc980b74..9df65f403 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_cast_framework_16_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_cast_framework_16_0_2_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
-  <library name="Gradle: com.google.android.gms:play-services-cast-framework:16.0.1@aar">
+  <library name="Gradle: com.google.android.gms:play-services-cast-framework:16.0.2@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-cast-framework-16.0.1.aar/d4c792212a5570fb5ee93ba33764075b/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-cast-framework-16.0.1.aar/d4c792212a5570fb5ee93ba33764075b/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-play-services-cast-framework-16.0.2.aar/09ad0e6e9c7d806452d3594e2836eb26/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-play-services-cast-framework-16.0.2.aar/09ad0e6e9c7d806452d3594e2836eb26/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_flags_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_flags_15_0_1_aar.xml
index 9db09e3e5..39a57bc25 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_flags_15_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_flags_15_0_1_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.android.gms:play-services-flags:15.0.1@aar">
     <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-flags-15.0.1.aar/46c195e1b5ceacfcc2e0687cb1e57506/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-flags-15.0.1.aar/46c195e1b5ceacfcc2e0687cb1e57506/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-flags-15.0.1.aar/da0a8a0855401e16d9624ac105093a1b/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-flags-15.0.1.aar/da0a8a0855401e16d9624ac105093a1b/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1_aar.xml
index 0c4faf4e6..45cbb4fa2 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1_aar.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.android.gms:play-services-tasks:15.0.1@aar">
     <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-tasks-15.0.1.aar/f30546a6c866df6aad2d39f35d2a4b95/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-tasks-15.0.1.aar/f30546a6c866df6aad2d39f35d2a4b95/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-play-services-tasks-15.0.1.aar/0acc23d41ae64a617be02b56642bdfee/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-play-services-tasks-15.0.1.aar/0acc23d41ae64a617be02b56642bdfee/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_jakewharton_butterknife_runtime_9_0_0_SNAPSHOT_aar.xml b/.idea/libraries/Gradle__com_jakewharton_butterknife_runtime_9_0_0_SNAPSHOT_aar.xml
new file mode 100644
index 000000000..132c59387
--- /dev/null
+++ b/.idea/libraries/Gradle__com_jakewharton_butterknife_runtime_9_0_0_SNAPSHOT_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: com.jakewharton:butterknife-runtime:9.0.0-SNAPSHOT@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-butterknife-runtime-9.0.0-SNAPSHOT.aar/8a035d5702a50379af5d3f475f946cd7/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/jetified-butterknife-runtime-9.0.0-SNAPSHOT.aar/8a035d5702a50379af5d3f475f946cd7/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife-runtime/9.0.0-SNAPSHOT/e87e900910a7c2fc697ea7e2937563504686b517/butterknife-runtime-9.0.0-SNAPSHOT-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/RetroMusicPlayer.iml b/RetroMusicPlayer.iml
index 909cad65c..c57968224 100644
--- a/RetroMusicPlayer.iml
+++ b/RetroMusicPlayer.iml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="RetroMusicPlayer" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":" />
-      </configuration>
-    </facet>
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
         <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
@@ -16,7 +11,7 @@
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/app/app.iml b/app/app.iml
index 633aa6b87..55e5154f2 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -8,11 +8,11 @@
     </facet>
     <facet type="android" name="Android">
       <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="normalRelease" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleNormalRelease" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileNormalReleaseSources" />
+        <option name="SELECTED_BUILD_VARIANT" value="normalDebug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleNormalDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileNormalDebugSources" />
         <afterSyncTasks>
-          <task>generateNormalReleaseSources</task>
+          <task>generateNormalDebugSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -23,32 +23,46 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/build/intermediates/javac/normalRelease/compileNormalReleaseJavaWithJavac/classes" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/normalReleaseUnitTest/compileNormalReleaseUnitTestJavaWithJavac/classes" />
+    <output url="file://$MODULE_DIR$/build/intermediates/javac/normalDebug/compileNormalDebugJavaWithJavac/classes" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/normalDebugUnitTest/compileNormalDebugUnitTestJavaWithJavac/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/normal/release" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/normalRelease/processNormalReleaseResources/r" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/normalRelease/compileNormalReleaseAidl/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/normal/release" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/normalRelease/compileNormalReleaseRenderscript/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/normal/release" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/normal/release" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/normalRelease/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/normalRelease/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/normalRelease/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/normalRelease/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/normalRelease/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/normalRelease/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/normalRelease/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/normal/release" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testNormalRelease/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testNormalRelease/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testNormalRelease/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testNormalRelease/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testNormalRelease/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testNormalRelease/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testNormalRelease/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/normal/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/normalDebug/processNormalDebugResources/r" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/normalDebug/compileNormalDebugAidl/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/normal/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/normalDebug/compileNormalDebugRenderscript/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/normal/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/normal/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/normalDebug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/normalDebug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/normalDebug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/normalDebug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/normalDebug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/normalDebug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/normalDebug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/normal/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/normalDebugAndroidTest/processNormalDebugAndroidTestResources/r" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/normalDebugAndroidTest/compileNormalDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/normal/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/normalDebugAndroidTest/compileNormalDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/normal/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/normal/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormalDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormalDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormalDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormalDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormalDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormalDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormalDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/normal/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNormalDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNormalDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNormalDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNormalDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNormalDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNormalDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testNormalDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/normal/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/normal/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/normal/assets" type="java-resource" />
@@ -70,20 +84,27 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormal/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormal/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestNormal/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -110,9 +131,9 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkNormalDebugClasspath" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkNormalReleaseClasspath" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
@@ -125,7 +146,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/linked_res_for_bundle" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged-not-compiled-resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
@@ -136,7 +156,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res_stripped" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
@@ -146,7 +165,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
@@ -163,24 +181,24 @@
     <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0-rc02@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0-rc02@jar" level="project" />
     <orderEntry type="library" name="Gradle: uk.co.chrisjenx:calligraphy:2.3.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-cast-framework:16.0.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.palette:palette:1.0.0-rc02@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.material:material:1.0.0-rc01@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v4:1.0.0-rc01@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0-rc02@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0-rc02@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.print:print:1.0.0-rc02@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.navigation:navigation-runtime:1.0.0-alpha05@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-cast:16.0.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.gridlayout:gridlayout:1.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.navigation:navigation-common:1.0.0-alpha05@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.0.0-rc02@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0-rc01@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0-rc02@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0-rc02@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-cast-framework:16.0.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.0.0-rc02@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:logging-interceptor:3.11.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.core:core:1.0.0-rc02@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.jakewharton:butterknife-runtime:9.0.0-SNAPSHOT@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.0.0-rc02@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base:15.0.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0-rc01@aar" level="project" />
@@ -194,7 +212,6 @@
     <orderEntry type="library" name="Gradle: com.afollestad.material-dialogs:core:0.9.6.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.jakewharton:butterknife-annotations:9.0.0-SNAPSHOT@jar" level="project" />
     <orderEntry type="library" name="Gradle: __local_aars__:/Users/hemanths/Desktop/KeepSafe/RetroMusicPlayer/app/libs/juniversalchardet-1.0.3.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.navigation:navigation-ui:1.0.0-alpha05@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.0.0-rc02@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.transition:transition:1.0.0-rc01@aar" level="project" />
     <orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxandroid:2.0.2@aar" level="project" />
@@ -218,7 +235,6 @@
     <orderEntry type="library" name="Gradle: me.zhanghai.android.materialprogressbar:library:1.4.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.jakewharton:butterknife:9.0.0-SNAPSHOT@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0-rc02@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-cast:16.0.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.cardview:cardview:1.0.0-rc01@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.11.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-flags:15.0.1@aar" level="project" />
@@ -229,9 +245,7 @@
     <orderEntry type="library" name="Gradle: androidx.media:media:1.0.0-rc02@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.0.0-rc02@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v13:1.0.0-rc01@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.navigation:navigation-fragment:1.0.0-alpha05@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.afollestad.material-dialogs:commons:0.9.6.0@aar" level="project" />
     <orderEntry type="module" module-name="appthemehelper" />
-    <orderEntry type="module" module-name="appthemehelper" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 69bc0a5b3..89bf1ced9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         vectorDrawables.useSupportLibrary = true
 
         applicationId "code.name.monkey.retromusic"
-        versionCode 216
-        versionName '1.8.100'
+        versionCode 222
+        versionName '2.0.010'
 
         multiDexEnabled true
 
@@ -102,13 +102,7 @@ static def getDate() {
     new Date().format('MMdd')
 }
 
-ext {
-    supportLibVersion = '1.0.0-rc01'
-    firebase = "11.8.0"
-    retrofit = "2.3.0"
-    butterKnife = "9.0.0-SNAPSHOT"
-    materialDialog = "0.9.6.0"
-}
+
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.multidex:multidex:2.0.0'
@@ -126,7 +120,7 @@ dependencies {
 
     //For casting
     implementation 'androidx.mediarouter:mediarouter:1.0.0-beta01'
-    implementation 'com.google.android.gms:play-services-cast-framework:16.0.1'
+    implementation 'com.google.android.gms:play-services-cast-framework:16.0.2'
 
     implementation "com.squareup.retrofit2:retrofit:2.4.0"
     implementation "com.squareup.retrofit2:converter-gson:2.4.0"
@@ -139,9 +133,9 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
     implementation 'io.reactivex.rxjava2:rxjava:2.1.9'
     implementation 'com.github.bumptech.glide:glide:3.8.0'
+    implementation 'com.github.bumptech.glide:okhttp3-integration:1.5.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:3.11.0'
     implementation 'com.squareup.okhttp3:okhttp:3.11.0'
-    implementation 'com.github.bumptech.glide:okhttp3-integration:1.5.0'
     implementation('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.11.0@aar') {
         transitive = true
     }
@@ -159,8 +153,4 @@ dependencies {
     implementation 'com.github.AdrienPoupa:jaudiotagger:2.2.3'
     implementation 'org.nanohttpd:nanohttpd:2.3.1'
 
-    def nav_version = "1.0.0-alpha05"
-
-    implementation "android.arch.navigation:navigation-fragment:$nav_version"
-    implementation "android.arch.navigation:navigation-ui:$nav_version"
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bd399e132..bd883a0fd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
+        android:usesCleartextTraffic="true"
         android:name=".RetroApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
@@ -125,7 +126,7 @@
         <activity android:name=".ui.activities.EqualizerActivity" />
         <activity android:name=".ui.activities.ErrorHandlerActivity" />
         <activity
-            android:name=".cast.ExpandedControlsActivity"
+            android:name=".cast.ExpandedCastControlsActivity"
             android:label="@string/app_name"
             android:launchMode="singleInstance"
             android:screenOrientation="portrait"
diff --git a/app/src/main/assets/contributors.json b/app/src/main/assets/contributors.json
new file mode 100644
index 000000000..e39cc677c
--- /dev/null
+++ b/app/src/main/assets/contributors.json
@@ -0,0 +1,26 @@
+[
+  {
+    "name": "Lennart Glamann",
+    "summary": "Moderator",
+    "link": "https://t.me/FlixbusLennart",
+    "profile_image": "https://i.imgur.com/Q5Nsx1R.jpg"
+  },
+  {
+    "name": "Gaming Inc.",
+    "summary": "Discord server maintainer",
+    "link": "https://t.me/Gaming_Inc",
+    "profile_image": "https://cdn.discordapp.com/attachments/469540889883181077/471361944385880065/91_98910_29110_20180616_17122501.jpg"
+  },
+  {
+    "name": "Marko Ivanović",
+    "summary": "Github contributor",
+    "link": "https://t.me/markoivanovic",
+    "profile_image": "https://avatars2.githubusercontent.com/u/35743654?s=400&amp;u=f8b4a90a352a661625ae71d455a82aaa9bc3316b&amp;v=4"
+  },
+  {
+    "name": "Gaurav Singh",
+    "summary": "Moderator",
+    "link": "https://t.me/Allstargaurav",
+    "profile_image": "https://cdn5.telesco.pe/file/Gnko_d39iKSqzKhsVK53sjUFz_sfLKe_OpxFE9kR-VUEjDbm6SOr8CT09tyI3zhDSuTowqOhNY4nogFx1Z8QbixyZLAWccl94JdX4dqkPrZyHMS9K7xUzq-wgZCoNIbO8_eAnGOy8Gmu3-uzLuQf2u3G7BRIxm5mzqwqGoeX7_V-fcs3Lr6Br7hPFeCHSm1U39I69E3R9ovs-kPfxCpze-riCjD-QhwwOEOfiudx9OmkmLJGvYugX2EpHSBFfNh6WFQEvBAvR6xPrXul3LxZEebH0xwz5HX-bmyuoxdGaW0J4ywDgiiu4I7cfUJe8lKqWwkPQRg8zTtYNiG3MZio7w.jpg"
+  }
+]
\ No newline at end of file
diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html
index 955f7848a..3352f7ec0 100644
--- a/app/src/main/assets/retro-changelog.html
+++ b/app/src/main/assets/retro-changelog.html
@@ -1 +1 @@
-<html>
<head>
    <style type="text/css">
        * {
        word-wrap: break-word;
        }
        {style-placeholder}
        a {
        color: #{link-color};
        }
        a:active {
        color: #{link-color-active};
        }
        ol {
        list-style-position: inside;
        padding-left: 0;
        padding-right: 0;
        }
        li {
        padding-top: 8px;
        }




    </style>
</head>
<body>

<p>You can view the changelog dialog again at any time from the <i>about</i> section.</p>


<h3>Version 1.8.200</h3>
<ol>
    <li><b>Fix:</b> same theme follows entire app</li>
    <li><b>Fix:</b> playlist rename</li>
    <li><b>Fix:</b> toggle tab titles</li>
    <li><b>Fix:</b> adaptive controls for material theme </li>
    <li><b>Added:</b> cast play only one song per time(WIP)</li>
    <li><b>Added:</b> extra controls toggle for mini player</li>
    <li><b>Added:</b> album & grid style(play image)</li>
    <li><b>Added:</b> new navigation(WIP)</li>
    <li><b>Added:</b> faq links about</li>
    <li><b>Added:</b> genre tab to library</li>
    <li><b>Added:</b> volume toggle for lock screen to support small screen</li>
    <li><b>Added:</b> on-click artist icon to artist details in album details screen</li>
    <li><b>Added:</b> circle style for album and artist lists</li>
    <li><b>Added:</b> now playing album cover style chooser</li>
    <li><b>Improved:</b> sleep timer</li>
    <li><b>Improved:</b> home page UI</li>
    <li><b>Improved:</b> most of the dialog UI to follow theme(WIP)</li>
    <li><b>Removed:</b> toggle home banner(WIP)</li>
    <li><b>Removed:</b> home page genre</li>
    <li><b>Updated:</b> internal libs</li>
</ol>

<p><a href="https://github.com/h4h13/RetroMusicPlayer/wiki/FAQ">FAQ's</a></p>
<p>*If you face any UI related issues you clear app data and cache, if its not working try to
    uninstall and install again. </p>
</body>
\ No newline at end of file
+<html>
<head>
    <style type="text/css">
        * {
        word-wrap: break-word;
        }
        {style-placeholder}
        a {
        color: #{link-color};
        }
        a:active {
        color: #{link-color-active};
        }
        ol {
        list-style-position: inside;
        padding-left: 0;
        padding-right: 0;
        }
        li {
        padding-top: 8px;
        }




    </style>
</head>
<body>

<p>You can view the changelog dialog again at any time from the <i>about</i> section.</p>


<h3>Version 2.0.00</h3>
<ol>
    <li><b>Fix:</b> dialog cancel text</li>
    <li><b>Fix:</b> album cover edit with last.fm</li>
    <li><b>Fix:</b> same theme follows entire app</li>
    <li><b>Fix:</b> playlist rename</li>
    <li><b>Fix:</b> toggle tab titles</li>
    <li><b>Fix:</b> adaptive controls for material theme </li>
    <li><b>Added:</b> full card album style</li>
    <li><b>Added:</b> extra controls toggle for mini player</li>
    <li><b>Added:</b> album & grid style(play image)</li>
    <li><b>Added:</b> new navigation(WIP)</li>
    <li><b>Added:</b> faq links about</li>
    <li><b>Added:</b> genre tab to library</li>
    <li><b>Added:</b> volume toggle for lock screen to support small screen</li>
    <li><b>Added:</b> on-click artist icon to artist details in album details screen</li>
    <li><b>Added:</b> circle style for album and artist lists</li>
    <li><b>Added:</b> now playing album cover style chooser</li>
    <li><b>Improved:</b> sleep timer</li>
    <li><b>Improved:</b> home page UI</li>
    <li><b>Improved:</b> most of the dialog UI to follow theme(WIP)</li>
    <li><b>Removed:</b> toggle home banner(WIP)</li>
    <li><b>Removed:</b> home page genre</li>
    <li><b>Updated:</b> internal libs</li>
</ol>

<p><a href="https://github.com/h4h13/RetroMusicPlayer/wiki/FAQ">FAQ's</a></p>
<p>*If you face any UI related issues you clear app data and cache, if its not working try to
    uninstall and install again. </p>
</body>
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/cast/CastHelper.java b/app/src/main/java/code/name/monkey/retromusic/cast/CastHelper.java
index 7607a410b..15993da6e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/cast/CastHelper.java
+++ b/app/src/main/java/code/name/monkey/retromusic/cast/CastHelper.java
@@ -15,10 +15,6 @@ import code.name.monkey.retromusic.Constants;
 import code.name.monkey.retromusic.model.Song;
 import code.name.monkey.retromusic.util.RetroUtil;
 
-/**
- * Created by naman on 2/12/17.
- */
-
 public class CastHelper {
 
     public static void startCasting(CastSession castSession, Song song) {
@@ -35,6 +31,7 @@ public class CastHelper {
         String songUrl = baseUrl.toString() + "/song?id=" + song.id;
         String albumArtUrl = baseUrl.toString() + "/albumart?id=" + song.albumId;
 
+
         MediaMetadata musicMetadata = new MediaMetadata(MediaMetadata.MEDIA_TYPE_MUSIC_TRACK);
 
         musicMetadata.putString(MediaMetadata.KEY_TITLE, song.title);
diff --git a/app/src/main/java/code/name/monkey/retromusic/cast/CastOptionsProvider.java b/app/src/main/java/code/name/monkey/retromusic/cast/CastOptionsProvider.java
index f84940fe0..9002bcf31 100644
--- a/app/src/main/java/code/name/monkey/retromusic/cast/CastOptionsProvider.java
+++ b/app/src/main/java/code/name/monkey/retromusic/cast/CastOptionsProvider.java
@@ -24,12 +24,12 @@ public class CastOptionsProvider implements OptionsProvider {
 
         NotificationOptions notificationOptions = new NotificationOptions.Builder()
                 .setActions(buttonActions, compatButtonActionsIndicies)
-                .setTargetActivityClassName(ExpandedControlsActivity.class.getName())
+                .setTargetActivityClassName(ExpandedCastControlsActivity.class.getName())
                 .build();
 
         CastMediaOptions mediaOptions = new CastMediaOptions.Builder()
                 .setNotificationOptions(notificationOptions)
-                .setExpandedControllerActivityClassName(ExpandedControlsActivity.class.getName())
+                .setExpandedControllerActivityClassName(ExpandedCastControlsActivity.class.getName())
                 .build();
 
         return new CastOptions.Builder()
diff --git a/app/src/main/java/code/name/monkey/retromusic/cast/ExpandedControlsActivity.java b/app/src/main/java/code/name/monkey/retromusic/cast/ExpandedCastControlsActivity.java
similarity index 90%
rename from app/src/main/java/code/name/monkey/retromusic/cast/ExpandedControlsActivity.java
rename to app/src/main/java/code/name/monkey/retromusic/cast/ExpandedCastControlsActivity.java
index 3c9b39389..b003314f7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/cast/ExpandedControlsActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/cast/ExpandedCastControlsActivity.java
@@ -10,7 +10,7 @@ import com.google.android.gms.cast.framework.media.widget.ExpandedControllerActi
 import code.name.monkey.retromusic.R;
 
 
-public class ExpandedControlsActivity extends ExpandedControllerActivity {
+public class ExpandedCastControlsActivity extends ExpandedControllerActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.java b/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.java
index 3087159b1..9d6ffe0f6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.java
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.java
@@ -83,12 +83,12 @@ public class CreatePlaylistDialog extends RoundedBottomSheetDialogFragment {
         actionCreate.setBackgroundTintList(ColorStateList.valueOf(accentColor));
         actionCancel.setStrokeColor(ColorStateList.valueOf(accentColor));
         actionCancel.setTextColor(accentColor);
-        playlistName.setHintTextColor(ColorStateList.valueOf(accentColor));
+
 
         textInputLayout.setBoxStrokeColor(accentColor);
         textInputLayout.setDefaultHintTextColor(ColorStateList.valueOf(accentColor));
 
-        playlistName.setHintTextColor(accentColor);
+        playlistName.setHintTextColor(ColorStateList.valueOf(accentColor));
         playlistName.setTextColor(ThemeStore.textColorPrimary(getContext()));
         title.setTextColor(ThemeStore.textColorPrimary(getContext()));
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/HomeOptionDialog.java b/app/src/main/java/code/name/monkey/retromusic/dialogs/HomeOptionDialog.java
deleted file mode 100644
index 5d59174f8..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/HomeOptionDialog.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package code.name.monkey.retromusic.dialogs;
-
-import android.graphics.Bitmap;
-import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-import androidx.appcompat.widget.AppCompatTextView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import java.io.File;
-import java.util.Calendar;
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.BindViews;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-import butterknife.Unbinder;
-import code.name.monkey.appthemehelper.ThemeStore;
-import code.name.monkey.retromusic.R;
-import code.name.monkey.retromusic.RetroApplication;
-import code.name.monkey.retromusic.util.Compressor;
-import code.name.monkey.retromusic.util.NavigationUtil;
-import code.name.monkey.retromusic.util.PreferenceUtil;
-import code.name.monkey.retromusic.views.CircularImageView;
-import code.name.monkey.retromusic.views.RoundedBottomSheetDialogFragment;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.schedulers.Schedulers;
-
-import static code.name.monkey.retromusic.Constants.USER_PROFILE;
-
-/**
- * @author Hemanth S (h4h13).
- */
-public class HomeOptionDialog extends RoundedBottomSheetDialogFragment {
-
-    private static final String TAG = "HomeOptionDialog";
-    private static ButterKnife.Setter<TextView, Integer> textColor = (view, value, index) -> view.setTextColor(value.intValue());
-    Unbinder mUnbinder;
-
-    @BindView(R.id.user_image_bottom)
-    CircularImageView userImageBottom;
-
-    @BindView(R.id.title_welcome)
-    AppCompatTextView titleWelcome;
-    @BindViews({R.id.tv_about, R.id.title_welcome, R.id.text, R.id.tv_buy_pro, R.id.tv_rate_app,
-            R.id.tv_settings, R.id.tv_sleep_timer})
-    List<TextView> textViews;
-    private CompositeDisposable disposable = new CompositeDisposable();
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-        View layout = inflater.inflate(R.layout.user_action_details, container, false);
-        mUnbinder = ButterKnife.bind(this, layout);
-        layout.findViewById(R.id.action_buy_pro).setVisibility(RetroApplication.isProVersion() ? View.GONE : View.VISIBLE);
-        ButterKnife.apply(textViews, textColor, ThemeStore.textColorPrimary(getContext()));
-        return layout;
-    }
-
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        loadImageFromStorage();
-        //noinspection ConstantConditions
-        titleWelcome.setText(String.format("%s, %s!", getTimeOfTheDay(), PreferenceUtil.getInstance(getContext()).getUserName()));
-    }
-
-    private String getTimeOfTheDay() {
-        String message = getString(R.string.title_good_day);
-        Calendar c = Calendar.getInstance();
-        int timeOfDay = c.get(Calendar.HOUR_OF_DAY);
-
-        if (timeOfDay >= 0 && timeOfDay < 6) {
-            message = getString(R.string.title_good_night);
-        } else if (timeOfDay >= 6 && timeOfDay < 12) {
-            message = getString(R.string.title_good_morning);
-        } else if (timeOfDay >= 12 && timeOfDay < 16) {
-            message = getString(R.string.title_good_afternoon);
-        } else if (timeOfDay >= 16 && timeOfDay < 20) {
-            message = getString(R.string.title_good_evening);
-        } else if (timeOfDay >= 20 && timeOfDay < 24) {
-            message = getString(R.string.title_good_night);
-        }
-        return message;
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        disposable.clear();
-        mUnbinder.unbind();
-    }
-
-    @SuppressWarnings("ConstantConditions")
-    @OnClick({R.id.action_about, R.id.user_info_container, R.id.action_buy_pro,
-            R.id.action_settings, R.id.action_sleep_timer, R.id.action_rate})
-    public void onViewClicked(View view) {
-        switch (view.getId()) {
-            case R.id.user_info_container:
-                NavigationUtil.goToUserInfo(getActivity());
-                break;
-            case R.id.action_rate:
-                NavigationUtil.goToPlayStore(getActivity());
-                break;
-            case R.id.action_settings:
-                NavigationUtil.goToSettings(getActivity());
-                break;
-            case R.id.action_about:
-                NavigationUtil.goToAbout(getActivity());
-                break;
-            case R.id.action_buy_pro:
-                NavigationUtil.goToProVersion(getActivity());
-                break;
-            case R.id.action_sleep_timer:
-                if (getFragmentManager() != null) {
-                    new SleepTimerDialog().show(getFragmentManager(), TAG);
-                }
-                break;
-        }
-        dismiss();
-    }
-
-    private void loadImageFromStorage() {
-        //noinspection ConstantConditions
-        disposable.add(new Compressor(getContext())
-                .setMaxHeight(300)
-                .setMaxWidth(300)
-                .setQuality(75)
-                .setCompressFormat(Bitmap.CompressFormat.WEBP)
-                .compressToBitmapAsFlowable(
-                        new File(PreferenceUtil.getInstance(getContext()).getProfileImage(), USER_PROFILE))
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(userImageBottom::setImageBitmap,
-                        throwable -> userImageBottom.setImageDrawable(ContextCompat
-                                .getDrawable(getContext(), R.drawable.ic_person_flat))));
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/MainOptionsBottomSheetDialogFragment.java b/app/src/main/java/code/name/monkey/retromusic/dialogs/MainOptionsBottomSheetDialogFragment.java
index 19347449e..befe3bc9f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/MainOptionsBottomSheetDialogFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/MainOptionsBottomSheetDialogFragment.java
@@ -1,64 +1,166 @@
 package code.name.monkey.retromusic.dialogs;
 
+import android.content.res.ColorStateList;
+import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Toast;
+import android.widget.TextView;
 
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
-import com.google.android.material.navigation.NavigationView;
+import com.google.android.material.button.MaterialButton;
+
+import java.io.File;
+import java.util.Calendar;
+import java.util.List;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.core.content.ContextCompat;
 import butterknife.BindView;
+import butterknife.BindViews;
 import butterknife.ButterKnife;
+import butterknife.OnClick;
+import code.name.monkey.appthemehelper.ThemeStore;
 import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.RetroApplication;
 import code.name.monkey.retromusic.ui.activities.MainActivity;
+import code.name.monkey.retromusic.ui.fragments.mainactivity.folders.FoldersFragment;
+import code.name.monkey.retromusic.util.Compressor;
+import code.name.monkey.retromusic.util.NavigationUtil;
+import code.name.monkey.retromusic.util.PreferenceUtil;
+import code.name.monkey.retromusic.views.CircularImageView;
+import code.name.monkey.retromusic.views.RoundedBottomSheetDialogFragment;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.schedulers.Schedulers;
 
-public class MainOptionsBottomSheetDialogFragment extends BottomSheetDialogFragment implements NavigationView.OnNavigationItemSelectedListener {
+import static code.name.monkey.retromusic.Constants.USER_PROFILE;
 
-    @BindView(R.id.navigation_view)
-    NavigationView navigationView;
+public class MainOptionsBottomSheetDialogFragment extends RoundedBottomSheetDialogFragment {
 
-    public static MainOptionsBottomSheetDialogFragment newInstance(int home) {
+    private static final String TAG = "MainOptionsBottomSheetD";
+    private static ButterKnife.Setter<TextView, Integer> textColor = (view, value, index) -> view.setTextColor(ColorStateList.valueOf(value));
 
-        Bundle args = new Bundle();
-        args.putInt("selected", home);
+    @BindView(R.id.user_image_bottom)
+    CircularImageView userImageBottom;
+
+    @BindView(R.id.title_welcome)
+    AppCompatTextView titleWelcome;
+
+    @BindView(R.id.text)
+    AppCompatTextView text;
+
+    @BindViews({R.id.action_folders, R.id.action_about, R.id.action_buy_pro, R.id.action_rate, R.id.action_sleep_timer})
+    List<MaterialButton> materialButtons;
+
+    private CompositeDisposable disposable = new CompositeDisposable();
+
+    public static MainOptionsBottomSheetDialogFragment newInstance(int selected_id) {
+        Bundle bundle = new Bundle();
+        bundle.putInt("selected_id", selected_id);
         MainOptionsBottomSheetDialogFragment fragment = new MainOptionsBottomSheetDialogFragment();
-        fragment.setArguments(args);
+        fragment.setArguments(bundle);
         return fragment;
     }
 
+    public static MainOptionsBottomSheetDialogFragment newInstance() {
+        return new MainOptionsBottomSheetDialogFragment();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        disposable.clear();
+    }
+
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View layout = inflater.inflate(R.layout.fragment_main_options, container, false);
         ButterKnife.bind(this, layout);
+        layout.findViewById(R.id.action_buy_pro).setVisibility(RetroApplication.isProVersion() ? View.GONE : View.VISIBLE);
+        ButterKnife.apply(materialButtons, textColor, ThemeStore.textColorPrimary(getContext()));
         return layout;
     }
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        navigationView.setNavigationItemSelectedListener(this);
-        switch (getArguments().getInt("selected")) {
-            default:
-            case MainActivity.HOME:
-                navigationView.setCheckedItem(R.id.action_home);
-                break;
-        }
+        text.setTextColor(ThemeStore.textColorSecondary(getContext()));
+        titleWelcome.setTextColor(ThemeStore.textColorPrimary(getContext()));
+        titleWelcome.setText(String.format("%s %s!", getTimeOfTheDay(), PreferenceUtil.getInstance(getContext()).getUserName()));
+        loadImageFromStorage();
     }
 
-    @Override
-    public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
-        switch (menuItem.getItemId()) {
-            case R.id.action_home:
-                Toast.makeText(getContext(), menuItem.getTitle(), Toast.LENGTH_SHORT).show();
-                return true;
-            default:
-                return false;
+    @OnClick({R.id.action_folders, R.id.action_settings, R.id.action_sleep_timer, R.id.action_rate,
+            R.id.user_info_container, R.id.action_buy_pro, R.id.action_about})
+    void onClick(View view) {
+        MainActivity mainActivity = (MainActivity) getActivity();
+        if (mainActivity == null) {
+            return;
         }
+        switch (view.getId()) {
+            case R.id.action_folders:
+                mainActivity.setCurrentFragment(FoldersFragment.newInstance(getContext()), true, FoldersFragment.TAG);
+                break;
+            case R.id.action_settings:
+                NavigationUtil.goToSettings(mainActivity);
+                break;
+            case R.id.action_about:
+                NavigationUtil.goToAbout(getActivity());
+                break;
+            case R.id.action_buy_pro:
+                NavigationUtil.goToProVersion(getActivity());
+                break;
+            case R.id.action_sleep_timer:
+                if (getFragmentManager() != null) {
+                    new SleepTimerDialog().show(getFragmentManager(), TAG);
+                }
+                break;
+            case R.id.user_info_container:
+                NavigationUtil.goToUserInfo(getActivity());
+                break;
+            case R.id.action_rate:
+                NavigationUtil.goToPlayStore(getActivity());
+                break;
+        }
+        dismiss();
+    }
+
+    private String getTimeOfTheDay() {
+        String message = getString(R.string.title_good_day);
+        Calendar c = Calendar.getInstance();
+        int timeOfDay = c.get(Calendar.HOUR_OF_DAY);
+
+        if (timeOfDay >= 0 && timeOfDay < 6) {
+            message = getString(R.string.title_good_night);
+        } else if (timeOfDay >= 6 && timeOfDay < 12) {
+            message = getString(R.string.title_good_morning);
+        } else if (timeOfDay >= 12 && timeOfDay < 16) {
+            message = getString(R.string.title_good_afternoon);
+        } else if (timeOfDay >= 16 && timeOfDay < 20) {
+            message = getString(R.string.title_good_evening);
+        } else if (timeOfDay >= 20 && timeOfDay < 24) {
+            message = getString(R.string.title_good_night);
+        }
+        return message;
+    }
+
+    private void loadImageFromStorage() {
+        //noinspection ConstantConditions
+        disposable.add(new Compressor(getContext())
+                .setMaxHeight(300)
+                .setMaxWidth(300)
+                .setQuality(75)
+                .setCompressFormat(Bitmap.CompressFormat.WEBP)
+                .compressToBitmapAsFlowable(
+                        new File(PreferenceUtil.getInstance(getContext()).getProfileImage(), USER_PROFILE))
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(userImageBottom::setImageBitmap,
+                        throwable -> userImageBottom.setImageDrawable(ContextCompat
+                                .getDrawable(getContext(), R.drawable.ic_person_flat))));
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.java b/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.java
index 8e8d66c0c..99aec0032 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.java
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.java
@@ -15,17 +15,21 @@ import android.os.Environment;
 import android.os.IBinder;
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.util.Log;
 import android.widget.Toast;
 
+import com.google.android.gms.cast.framework.CastContext;
+import com.google.android.gms.cast.framework.CastSession;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Random;
 import java.util.WeakHashMap;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.RetroApplication;
 import code.name.monkey.retromusic.loaders.SongLoader;
 import code.name.monkey.retromusic.model.Song;
 import code.name.monkey.retromusic.service.MusicService;
@@ -38,9 +42,22 @@ public class MusicPlayerRemote {
     private static final WeakHashMap<Context, ServiceBinder> mConnectionMap = new WeakHashMap<>();
     @Nullable
     public static MusicService musicService;
-    
+    private static int playbackLocation = PlaybackLocation.LOCAL;
+
+
+    private static CastSession getCastSession() {
+        CastSession castSession = CastContext.getSharedInstance(RetroApplication.getInstance()).getSessionManager().getCurrentCastSession();
+        if (castSession != null) {
+            playbackLocation = PlaybackLocation.REMOTE;
+        } else {
+            playbackLocation = PlaybackLocation.LOCAL;
+        }
+        return castSession;
+    }
+
     public static ServiceToken bindToService(@NonNull final Context context,
                                              final ServiceConnection callback) {
+
         Activity realActivity = ((Activity) context).getParent();
         if (realActivity == null) {
             realActivity = (Activity) context;
@@ -75,24 +92,19 @@ public class MusicPlayerRemote {
 
     @Nullable
     private static String getFilePathFromUri(Context context, Uri uri) {
-        Cursor cursor = null;
+
         final String column = "_data";
         final String[] projection = {
                 column
         };
-
-        try {
-            cursor = context.getContentResolver().query(uri, projection, null, null,
-                    null);
+        try (Cursor cursor = context.getContentResolver().query(uri, projection, null, null,
+                null)) {
             if (cursor != null && cursor.moveToFirst()) {
                 final int column_index = cursor.getColumnIndexOrThrow(column);
                 return cursor.getString(column_index);
             }
         } catch (Exception e) {
             Log.e(TAG, e.getMessage());
-        } finally {
-            if (cursor != null)
-                cursor.close();
         }
         return null;
     }
@@ -239,8 +251,17 @@ public class MusicPlayerRemote {
     }
 
     public static int seekTo(int millis) {
+        getCastSession();
         if (musicService != null) {
-            return musicService.seek(millis);
+            switch (playbackLocation) {
+                case PlaybackLocation.LOCAL:
+                    return musicService.seek(millis);
+                case PlaybackLocation.REMOTE:
+                    if (getCastSession() != null) {
+                        getCastSession().getRemoteMediaClient().seek(millis);
+                    }
+                    break;
+            }
         }
         return -1;
     }
@@ -443,6 +464,10 @@ public class MusicPlayerRemote {
         return musicService != null;
     }
 
+    public static void setZeroVolume() {
+
+    }
+
     @interface PlaybackLocation {
         int REMOTE = 0;
         int LOCAL = 1;
@@ -480,4 +505,5 @@ public class MusicPlayerRemote {
             mWrappedContext = context;
         }
     }
+
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/AppBarStateChangeListener.java b/app/src/main/java/code/name/monkey/retromusic/misc/AppBarStateChangeListener.java
index d8ad24632..a55676a3f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/misc/AppBarStateChangeListener.java
+++ b/app/src/main/java/code/name/monkey/retromusic/misc/AppBarStateChangeListener.java
@@ -4,7 +4,7 @@ import com.google.android.material.appbar.AppBarLayout;
 
 /**
  * @author Hemanth S (h4h13).
- *         https://stackoverflow.com/a/33891727
+ * https://stackoverflow.com/a/33891727
  */
 
 public abstract class AppBarStateChangeListener implements AppBarLayout.OnOffsetChangedListener {
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/NavigationIconClickListener.java b/app/src/main/java/code/name/monkey/retromusic/misc/NavigationIconClickListener.java
deleted file mode 100755
index 0a0287246..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/misc/NavigationIconClickListener.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package code.name.monkey.retromusic.misc;
-
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
-import android.app.Activity;
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
-import android.util.DisplayMetrics;
-import android.view.View;
-import android.view.animation.Interpolator;
-import android.widget.ImageView;
-
-import androidx.annotation.Nullable;
-import butterknife.BindInt;
-import code.name.monkey.appthemehelper.util.ATHUtil;
-import code.name.monkey.retromusic.R;
-import code.name.monkey.retromusic.util.RetroUtil;
-
-/**
- * {@link View.OnClickListener} used to translate the product grid sheet downward on
- * the Y-axis when the navigation icon in the toolbar is pressed.
- */
-public class NavigationIconClickListener implements View.OnClickListener {
-
-    private final AnimatorSet animatorSet = new AnimatorSet();
-    @BindInt(R.integer.options_height)
-    int options;
-    private Context context;
-    private View sheet, menu;
-    private Interpolator interpolator;
-    private int height;
-    private boolean backdropShown = false;
-    private Drawable openIcon;
-    private Drawable closeIcon;
-
-    public NavigationIconClickListener(Context context, View sheet, View menu, @Nullable Interpolator interpolator) {
-        this(context, sheet, menu, interpolator, null, null);
-    }
-
-    public NavigationIconClickListener(Context context, View sheet, View menu, @Nullable Interpolator interpolator,
-                                       @Nullable Drawable openIcon, @Nullable Drawable closeIcon) {
-        this.context = context;
-        this.sheet = sheet;
-        this.menu = menu;
-        this.interpolator = interpolator;
-        this.openIcon = openIcon;
-        this.closeIcon = closeIcon;
-
-        DisplayMetrics displayMetrics = new DisplayMetrics();
-        ((Activity) context).getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
-        height = displayMetrics.heightPixels;
-    }
-
-    @Override
-    public void onClick(View view) {
-        backdropShown = !backdropShown;
-
-        // Cancel the existing animations
-        animatorSet.removeAllListeners();
-        animatorSet.end();
-        animatorSet.cancel();
-
-        if (!(view instanceof ImageView)) {
-            throw new IllegalArgumentException("updateIcon() must be called on an ImageView");
-        }
-        updateIcon((ImageView) view);
-        final int translateY = (int) RetroUtil.convertDpToPixel(getHeight(view.getContext()), view.getContext());
-
-        ObjectAnimator animator = ObjectAnimator.ofFloat(sheet, "translationY", backdropShown ? translateY : 0);
-        animator.setDuration(500);
-        if (interpolator != null) {
-            animator.setInterpolator(interpolator);
-        }
-        animatorSet.play(animator);
-        animator.start();
-    }
-
-    private int getHeight(Context context) {
-        Resources resources = context.getResources();
-        if (RetroUtil.isLandscape(resources)) {
-            return 3 * 48;
-        } else if (RetroUtil.isTablet(resources)) {
-            if (RetroUtil.isLandscape(resources)) {
-                return 48;
-            } else {
-                return 2 * 48;
-            }
-        } else
-            return 5 * 48;
-    }
-
-    private void updateIcon(ImageView view) {
-        if (openIcon != null && closeIcon != null) {
-            view.setImageTintList(ColorStateList.valueOf(ATHUtil.resolveColor(context, R.attr.iconColor)));
-            if (backdropShown) {
-                view.setImageDrawable(closeIcon);
-            } else {
-                view.setImageDrawable(openIcon);
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/ScrollAwareFABBehavior.java b/app/src/main/java/code/name/monkey/retromusic/misc/ScrollAwareFABBehavior.java
index 8f7bfd5a1..b90771397 100644
--- a/app/src/main/java/code/name/monkey/retromusic/misc/ScrollAwareFABBehavior.java
+++ b/app/src/main/java/code/name/monkey/retromusic/misc/ScrollAwareFABBehavior.java
@@ -2,15 +2,17 @@ package code.name.monkey.retromusic.misc;
 
 import android.content.Context;
 import android.os.Handler;
-import androidx.annotation.NonNull;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
 import android.view.animation.LinearInterpolator;
 
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import androidx.annotation.NonNull;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.view.ViewCompat;
+
 /*Don't delete even if its not showing not using*/
 public class ScrollAwareFABBehavior extends CoordinatorLayout.Behavior<FloatingActionButton> {
     private static final String TAG = "ScrollingFABBehavior";
@@ -71,40 +73,4 @@ public class ScrollAwareFABBehavior extends CoordinatorLayout.Behavior<FloatingA
         }
         return nestedScrollAxes == ViewCompat.SCROLL_AXIS_VERTICAL;
     }
-}
-/*extends FloatingActionButton.Behavior {
-
-    public ScrollAwareFABBehavior(Context context, AttributeSet attrs) {
-        super();
-    }
-
-
-    @Override
-    public boolean onStartNestedScroll(@NonNull final CoordinatorLayout coordinatorLayout,
-                                       @NonNull final FloatingActionButton child,
-                                       @NonNull final View directTargetChild,
-                                       @NonNull final View target,
-                                       final int nestedScrollAxes) {
-        // Ensure we react to vertical scrolling
-        return nestedScrollAxes == ViewCompat.SCROLL_AXIS_VERTICAL
-                || super.onStartNestedScroll(coordinatorLayout, child, directTargetChild, target, nestedScrollAxes);
-    }
-
-    @Override
-    public void onNestedScroll(@NonNull CoordinatorLayout coordinatorLayout,
-                               @NonNull FloatingActionButton child,
-                               @NonNull View target,
-                               int dxConsumed,
-                               int dyConsumed,
-                               int dxUnconsumed,
-                               int dyUnconsumed) {
-        super.onNestedScroll(coordinatorLayout, child, target, dxConsumed, dyConsumed, dxUnconsumed,
-                dyUnconsumed);
-
-        if (dyConsumed > 0 && child.getVisibility() == View.VISIBLE) {
-            child.hide();
-        } else if (dyConsumed < 0 && child.getVisibility() != View.VISIBLE) {
-            child.show();
-        }
-    }
-}*/
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/Contributor.java b/app/src/main/java/code/name/monkey/retromusic/model/Contributor.java
new file mode 100644
index 000000000..0488f1cad
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/model/Contributor.java
@@ -0,0 +1,34 @@
+package code.name.monkey.retromusic.model;
+
+public class Contributor {
+    private String name;
+    private String summary;
+    private String link;
+    private String profile_image;
+
+    public Contributor() {
+    }
+
+    public Contributor(String name, String summary, String link, String profile_image) {
+        this.name = name;
+        this.summary = summary;
+        this.link = link;
+        this.profile_image = profile_image;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getSummary() {
+        return summary;
+    }
+
+    public String getLink() {
+        return link;
+    }
+
+    public String getProfileImage() {
+        return profile_image;
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/rest/LastFMRestClient.java b/app/src/main/java/code/name/monkey/retromusic/rest/LastFMRestClient.java
index 4818ff6f5..58d84834f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/rest/LastFMRestClient.java
+++ b/app/src/main/java/code/name/monkey/retromusic/rest/LastFMRestClient.java
@@ -17,7 +17,7 @@ import retrofit2.converter.gson.GsonConverterFactory;
 
 public class LastFMRestClient {
 
-  private static final String BASE_URL = "http://ws.audioscrobbler.com/2.0/";
+  private static final String BASE_URL = "https://ws.audioscrobbler.com/2.0/";
 
   private LastFMService apiService;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.java
index 41a79c9e7..c5ae8eb58 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.java
@@ -5,14 +5,25 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
-import androidx.core.app.ShareCompat;
-import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
 
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ShareCompat;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -20,7 +31,9 @@ import code.name.monkey.appthemehelper.ThemeStore;
 import code.name.monkey.retromusic.Constants;
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.dialogs.ChangelogDialog;
+import code.name.monkey.retromusic.model.Contributor;
 import code.name.monkey.retromusic.ui.activities.base.AbsBaseActivity;
+import code.name.monkey.retromusic.ui.adapter.ContributorAdapter;
 import code.name.monkey.retromusic.util.NavigationUtil;
 
 import static code.name.monkey.retromusic.Constants.APP_INSTAGRAM_LINK;
@@ -49,6 +62,9 @@ public class AboutActivity extends AbsBaseActivity {
     @BindView(R.id.title)
     TextView title;
 
+    @BindView(R.id.recycler_view)
+    RecyclerView recyclerView;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -60,6 +76,7 @@ public class AboutActivity extends AbsBaseActivity {
         setTaskDescriptionColorAuto();
         setLightNavigationBar(true);
 
+        loadContributors();
         setUpToolbar();
 
         appVersion.setText(getAppVersion());
@@ -177,4 +194,32 @@ public class AboutActivity extends AbsBaseActivity {
                     Intent.createChooser(shareIntent, getResources().getText(R.string.action_share)));
         }
     }
+
+    public void loadContributors() {
+        String data = getAssetJsonData();
+        Type type = new TypeToken<List<Contributor>>() {
+        }.getType();
+        List<Contributor> contributors = new Gson().fromJson(data, type);
+
+        ContributorAdapter contributorAdapter = new ContributorAdapter(contributors);
+        recyclerView.setLayoutManager(new LinearLayoutManager(this));
+        recyclerView.setItemAnimator(new DefaultItemAnimator());
+        recyclerView.setAdapter(contributorAdapter);
+    }
+
+    public String getAssetJsonData() {
+        String json = null;
+        try {
+            InputStream is = getAssets().open("contributors.json");
+            int size = is.available();
+            byte[] buffer = new byte[size];
+            is.read(buffer);
+            is.close();
+            json = new String(buffer, StandardCharsets.UTF_8);
+        } catch (IOException ex) {
+            ex.printStackTrace();
+            return null;
+        }
+        return json;
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.java
index 887f39650..bf7ac0408 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.java
@@ -20,6 +20,7 @@ import android.view.MenuItem;
 import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewStub;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -124,12 +125,15 @@ public class AlbumDetailsActivity extends AbsSlidingMusicPanelActivity implement
         super.onCreate(savedInstanceState);
         ButterKnife.bind(this);
 
-        supportPostponeEnterTransition();
-        setupToolbarMarginHeight();
+        setBottomBarVisibility(View.GONE);
 
         setLightNavigationBar(true);
         setNavigationbarColorAuto();
 
+        supportPostponeEnterTransition();
+        setupToolbarMarginHeight();
+
+
         int albumId = getIntent().getIntExtra(EXTRA_ALBUM_ID, -1);
         albumDetailsPresenter = new AlbumDetailsPresenter(this, albumId);
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.java
index c2cbd774b..12e74ccf0 100755
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.java
@@ -141,6 +141,8 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
         super.onCreate(bundle);
         ButterKnife.bind(this);
 
+        setBottomBarVisibility(View.GONE);
+
         setNavigationbarColorAuto();
         setLightNavigationBar(true);
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.java
index ceac8cb15..024ff1016 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.java
@@ -87,6 +87,7 @@ public class GenreDetailsActivity extends AbsSlidingMusicPanelActivity implement
         super.onCreate(savedInstanceState);
         ButterKnife.bind(this);
 
+        setBottomBarVisibility(View.GONE);
         setStatusbarColorAuto();
         setNavigationbarColorAuto();
         setTaskDescriptionColorAuto();
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/LyricsActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/LyricsActivity.java
index c33fbd167..334b61a70 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/LyricsActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/LyricsActivity.java
@@ -5,8 +5,6 @@ import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
 import android.text.InputType;
 import android.text.TextUtils;
 import android.view.MenuItem;
@@ -27,6 +25,8 @@ import java.util.ArrayList;
 import java.util.EnumMap;
 import java.util.Map;
 
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -98,8 +98,10 @@ public class LyricsActivity extends AbsMusicServiceActivity implements
     private void selectLyricsTye(int group) {
         PreferenceUtil.getInstance(this).setLastLyricsType(group);
         RadioButton radioButton = actionsLayout.findViewById(group);
-        radioButton.setBackgroundTintList(ColorStateList.valueOf(ThemeStore.accentColor(this)));
-        radioButton.setTextColor(ThemeStore.textColorPrimary(this));
+        if (radioButton != null) {
+            radioButton.setBackgroundTintList(ColorStateList.valueOf(ThemeStore.accentColor(this)));
+            radioButton.setTextColor(ThemeStore.textColorPrimary(this));
+        }
 
         offlineLyrics.setVisibility(View.GONE);
         lyricView.setVisibility(View.GONE);
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.java
index 4a29eff38..a945de607 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.java
@@ -19,6 +19,7 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
 
 import java.util.ArrayList;
 
@@ -48,8 +49,7 @@ import code.name.monkey.retromusic.ui.fragments.mainactivity.home.HomeFragment;
 import code.name.monkey.retromusic.util.PreferenceUtil;
 import io.reactivex.disposables.CompositeDisposable;
 
-public class MainActivity extends AbsSlidingMusicPanelActivity implements
-        SharedPreferences.OnSharedPreferenceChangeListener {
+public class MainActivity extends AbsSlidingMusicPanelActivity implements SharedPreferences.OnSharedPreferenceChangeListener, BottomNavigationView.OnNavigationItemSelectedListener {
 
     public static final int APP_INTRO_REQUEST = 2323;
     public static final int LIBRARY = 1;
@@ -58,6 +58,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity implements
     private static final String TAG = "MainActivity";
     private static final int APP_USER_INFO_REQUEST = 9003;
     private static final int REQUEST_CODE_THEME = 9002;
+
     @Nullable
     MainActivityFragmentCallbacks currentFragment;
 
@@ -81,6 +82,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity implements
             }
         }
     };
+    private int insideFragment = R.id.action_song;
 
     @Override
     protected View createContentView() {
@@ -95,11 +97,12 @@ public class MainActivity extends AbsSlidingMusicPanelActivity implements
     protected void onCreate(Bundle savedInstanceState) {
         setDrawUnderStatusBar(true);
         super.onCreate(savedInstanceState);
-
         ButterKnife.bind(this);
 
-        drawerLayout.setOnApplyWindowInsetsListener((view, windowInsets) ->
-                windowInsets.replaceSystemWindowInsets(0, 0, 0, 0));
+        setBottomBarVisibility(View.VISIBLE);
+        getBottomNavigationView().setOnNavigationItemSelectedListener(this);
+
+        drawerLayout.setOnApplyWindowInsetsListener((view, windowInsets) -> windowInsets.replaceSystemWindowInsets(0, 0, 0, 0));
 
         if (savedInstanceState == null) {
             setCurrentFragment(PreferenceUtil.getInstance(this).getLastMusicChooser());
@@ -109,7 +112,6 @@ public class MainActivity extends AbsSlidingMusicPanelActivity implements
         checkShowChangelog();
     }
 
-
     private void checkShowChangelog() {
         try {
             PackageInfo pInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
@@ -165,23 +167,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity implements
     }
 
     private void restoreCurrentFragment() {
-        currentFragment = (MainActivityFragmentCallbacks) getSupportFragmentManager()
-                .findFragmentById(R.id.fragment_container);
-    }
-
-    public void setCurrentFragment(int key) {
-        PreferenceUtil.getInstance(this).setLastMusicChooser(key);
-        switch (key) {
-            case LIBRARY:
-                setCurrentFragment(LibraryFragment.newInstance(), false, LibraryFragment.TAG);
-                break;
-            case FOLDERS:
-                setCurrentFragment(FoldersFragment.newInstance(this), false, FoldersFragment.TAG);
-                break;
-            case HOME:
-                setCurrentFragment(BannerHomeFragment.newInstance(), false, HomeFragment.TAG);
-                break;
-        }
+        currentFragment = (MainActivityFragmentCallbacks) getSupportFragmentManager().findFragmentById(R.id.fragment_container);
     }
 
     private void handlePlaybackIntent(@Nullable Intent intent) {
@@ -337,4 +323,51 @@ public class MainActivity extends AbsSlidingMusicPanelActivity implements
                 })
                 .show();
     }
+
+    @Override
+    public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
+        PreferenceUtil.getInstance(this).setLastPage(menuItem.getItemId());
+        selectedFragment(menuItem.getItemId());
+        return true;
+    }
+
+    private void selectedFragment(int itemId) {
+        insideFragment = itemId;
+        switch (itemId) {
+            case R.id.action_album:
+                setCurrentFragment(LIBRARY);
+                break;
+            case R.id.action_artist:
+                setCurrentFragment(LIBRARY);
+                break;
+            case R.id.action_playlist:
+                setCurrentFragment(LIBRARY);
+                break;
+            case R.id.action_song:
+                setCurrentFragment(LIBRARY);
+                break;
+            default:
+            case R.id.action_home:
+                setCurrentFragment(HOME);
+                break;
+
+        }
+    }
+
+
+    public void setCurrentFragment(int key) {
+        PreferenceUtil.getInstance(this).setLastMusicChooser(key);
+        switch (key) {
+            case LIBRARY:
+                setCurrentFragment(LibraryFragment.newInstance(insideFragment), false, LibraryFragment.TAG);
+                break;
+            case FOLDERS:
+                setCurrentFragment(FoldersFragment.newInstance(this), false, FoldersFragment.TAG);
+                break;
+            case HOME:
+                setCurrentFragment(PreferenceUtil.getInstance(this).toggleHomeBanner() ? HomeFragment.newInstance() :
+                        BannerHomeFragment.newInstance(), false, HomeFragment.TAG);
+                break;
+        }
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlayingQueueActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlayingQueueActivity.java
index 24c1ef7b3..22560a6ce 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlayingQueueActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlayingQueueActivity.java
@@ -2,10 +2,11 @@ package code.name.monkey.retromusic.ui.activities;
 
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import com.google.android.material.appbar.AppBarLayout;
-import androidx.appcompat.widget.Toolbar;
 import android.widget.TextView;
 
+import com.google.android.material.appbar.AppBarLayout;
+
+import androidx.appcompat.widget.Toolbar;
 import butterknife.BindDrawable;
 import butterknife.BindString;
 import butterknife.BindView;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.java
index 532b89e31..f557748e1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.java
@@ -84,6 +84,7 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme
         super.onCreate(savedInstanceState);
         ButterKnife.bind(this);
 
+        setBottomBarVisibility(View.GONE);
         setStatusbarColorAuto();
         setNavigationbarColorAuto();
         setTaskDescriptionColorAuto();
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/UserInfoActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/UserInfoActivity.java
index bb4d480fa..c41b27db6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/UserInfoActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/UserInfoActivity.java
@@ -1,18 +1,88 @@
 package code.name.monkey.retromusic.ui.activities;
 
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.content.Intent;
+import android.content.res.ColorStateList;
+import android.graphics.Bitmap;
+import android.net.Uri;
 import android.os.Bundle;
+import android.provider.MediaStore;
+import android.provider.MediaStore.Images.Media;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
 
+import com.afollestad.materialdialogs.MaterialDialog;
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textfield.TextInputLayout;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+
+import androidx.appcompat.widget.Toolbar;
+import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.OnClick;
+import code.name.monkey.appthemehelper.ThemeStore;
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.ui.activities.base.AbsBaseActivity;
-import code.name.monkey.retromusic.ui.fragments.intro.NameFragment;
+import code.name.monkey.retromusic.util.Compressor;
+import code.name.monkey.retromusic.util.ImageUtil;
+import code.name.monkey.retromusic.util.PreferenceUtil;
+import code.name.monkey.retromusic.views.CircularImageView;
+import code.name.monkey.retromusic.views.IconImageView;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.schedulers.Schedulers;
+
+import static code.name.monkey.retromusic.Constants.USER_BANNER;
+import static code.name.monkey.retromusic.Constants.USER_PROFILE;
 
 public class UserInfoActivity extends AbsBaseActivity {
     private static final String TAG = "UserInfoActivity";
 
+    private static final int PICK_IMAGE_REQUEST = 9002;
+    private static final int PICK_BANNER_REQUEST = 9003;
+    private static final int PROFILE_ICON_SIZE = 400;
+    @BindView(R.id.title)
+    TextView title;
+
+    @BindView(R.id.name_container)
+    TextInputLayout nameLayout;
+
+    @BindView(R.id.name)
+    TextInputEditText name;
+
+    @BindView(R.id.user_image)
+    CircularImageView userImage;
+
+    @BindView(R.id.image)
+    ImageView image;
+
+    @BindView(R.id.banner_select)
+    IconImageView imageView;
+
+    @BindView(R.id.next)
+    FloatingActionButton nextButton;
+
+    @BindView(R.id.toolbar)
+    Toolbar toolbar;
+
+    @BindView(R.id.app_bar)
+    AppBarLayout appBarLayout;
+
+    private CompositeDisposable disposable;
+
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        setDrawUnderStatusBar(true);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_user_info);
 
@@ -23,11 +93,199 @@ public class UserInfoActivity extends AbsBaseActivity {
         setTaskDescriptionColorAuto();
         setLightNavigationBar(true);
 
-        if (savedInstanceState == null) {
-            getSupportFragmentManager().beginTransaction()
-                    .replace(R.id.fragment_container, new NameFragment(), TAG)
-                    .commit();
+        setupToolbar();
+
+        disposable = new CompositeDisposable();
+
+        title.setTextColor(ThemeStore.textColorPrimary(this));
+        nameLayout.setBoxStrokeColor(ThemeStore.accentColor(this));
+        name.setText(PreferenceUtil.getInstance(this).getUserName());
+
+        if (!PreferenceUtil.getInstance(this).getProfileImage().isEmpty()) {
+            loadImageFromStorage(PreferenceUtil.getInstance(this).getProfileImage());
+        }
+        if (!PreferenceUtil.getInstance(this).getBannerImage().isEmpty()) {
+            loadBannerFromStorage(PreferenceUtil.getInstance(this).getBannerImage());
         }
     }
 
+    private void setupToolbar() {
+        toolbar.setBackgroundColor(ThemeStore.primaryColor(this));
+        appBarLayout.setBackgroundColor(ThemeStore.primaryColor(this));
+        nextButton.setBackgroundTintList(ColorStateList.valueOf(ThemeStore.accentColor(this)));
+    }
+
+    @OnClick({R.id.next, R.id.banner_select})
+    void next(View view) {
+        switch (view.getId()) {
+            case R.id.banner_select:
+                showBannerOptions();
+                break;
+            case R.id.next:
+                String nameString = name.getText().toString().trim();
+                if (TextUtils.isEmpty(nameString)) {
+                    Toast.makeText(this, "Umm name is empty", Toast.LENGTH_SHORT).show();
+                    return;
+                }
+                //noinspection ConstantConditions
+                PreferenceUtil.getInstance(this).setUserName(nameString);
+                setResult(RESULT_OK);
+                //((UserInfoActivity) getActivity()).setFragment(new ChooseThemeFragment(), true);
+                finish();
+                break;
+        }
+    }
+
+    private void showBannerOptions() {
+        //noinspection ConstantConditions
+        new MaterialDialog.Builder(this)
+                .title(R.string.select_banner_photo)
+                .items(Arrays.asList(getString(R.string.new_banner_photo),
+                        getString(R.string.remove_banner_photo)))
+                .itemsCallback((dialog, itemView, position, text) -> {
+                    switch (position) {
+                        case 0:
+                            selectBannerImage();
+                            break;
+                        case 1:
+                            PreferenceUtil.getInstance(this).setBannerImagePath("");
+                            break;
+                    }
+                }).show();
+    }
+
+    private void selectBannerImage() {
+        //noinspection ConstantConditions
+        if (PreferenceUtil.getInstance(this).getBannerImage().isEmpty()) {
+            Intent pickImageIntent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
+            pickImageIntent.setType("image/*");
+            pickImageIntent.putExtra("crop", "true");
+            pickImageIntent.putExtra("outputX", 1290);
+            pickImageIntent.putExtra("outputY", 720);
+            pickImageIntent.putExtra("aspectX", 16);
+            pickImageIntent.putExtra("aspectY", 9);
+            pickImageIntent.putExtra("scale", true);
+            //intent.setAction(Intent.ACTION_GET_CONTENT);
+            startActivityForResult(Intent.createChooser(pickImageIntent,
+                    "Select Picture"), PICK_BANNER_REQUEST);
+        } else {
+            PreferenceUtil.getInstance(this).setBannerImagePath("");
+            image.setImageResource(android.R.color.transparent);
+            imageView.setImageResource(R.drawable.ic_edit_white_24dp);
+        }
+    }
+
+    @OnClick(R.id.image)
+    public void onViewClicked() {
+        //noinspection ConstantConditions
+        new MaterialDialog.Builder(this)
+                .title("Set a profile photo")
+                .items(Arrays.asList(getString(R.string.new_profile_photo),
+                        getString(R.string.remove_profile_photo)))
+                .itemsCallback((dialog, itemView, position, text) -> {
+                    switch (position) {
+                        case 0:
+                            pickNewPhoto();
+                            break;
+                        case 1:
+                            PreferenceUtil.getInstance(this).saveProfileImage("");
+                            break;
+                    }
+                }).show();
+    }
+
+    private void pickNewPhoto() {
+        Intent pickImageIntent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
+        pickImageIntent.setType("image/*");
+        pickImageIntent.putExtra("crop", "true");
+        pickImageIntent.putExtra("outputX", 512);
+        pickImageIntent.putExtra("outputY", 512);
+        pickImageIntent.putExtra("aspectX", 1);
+        pickImageIntent.putExtra("aspectY", 1);
+        pickImageIntent.putExtra("scale", true);
+        startActivityForResult(Intent.createChooser(pickImageIntent, "Select Picture"),
+                PICK_IMAGE_REQUEST);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == PICK_IMAGE_REQUEST && resultCode == RESULT_OK && data != null &&
+                data.getData() != null) {
+            Uri uri = data.getData();
+            try {
+                Bitmap bitmap = ImageUtil.getResizedBitmap(Media.getBitmap(getContentResolver(), uri), PROFILE_ICON_SIZE);
+                String profileImagePath = saveToInternalStorage(bitmap, USER_PROFILE);
+                PreferenceUtil.getInstance(this).saveProfileImage(profileImagePath);
+                loadImageFromStorage(profileImagePath);
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        if (requestCode == PICK_BANNER_REQUEST && resultCode == RESULT_OK && data != null &&
+                data.getData() != null) {
+            Uri uri = data.getData();
+            try {
+                Bitmap bitmap = Media.getBitmap(getContentResolver(), uri);
+                String profileImagePath = saveToInternalStorage(bitmap, USER_BANNER);
+                PreferenceUtil.getInstance(this).setBannerImagePath(profileImagePath);
+                loadBannerFromStorage(profileImagePath);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private void loadBannerFromStorage(String profileImagePath) {
+        disposable.add(new Compressor(this)
+                .setQuality(100)
+                .setCompressFormat(Bitmap.CompressFormat.WEBP)
+                .compressToBitmapAsFlowable(new File(profileImagePath, USER_BANNER))
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(bitmap -> {
+                    image.setImageBitmap(bitmap);
+                }));
+    }
+
+    private void loadImageFromStorage(String path) {
+        disposable.add(new Compressor(this)
+                .setMaxHeight(300)
+                .setMaxWidth(300)
+                .setQuality(75)
+                .setCompressFormat(Bitmap.CompressFormat.WEBP)
+                .compressToBitmapAsFlowable(new File(path, USER_PROFILE))
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(bitmap -> {
+                    userImage.setImageBitmap(bitmap);
+                }));
+    }
+
+    private String saveToInternalStorage(Bitmap bitmapImage, String userBanner) {
+        ContextWrapper cw = new ContextWrapper(this);
+        // path to /data/data/yourapp/app_data/imageDir
+        File directory = cw.getDir("imageDir", Context.MODE_PRIVATE);
+        // Create imageDir
+        File mypath = new File(directory, userBanner);
+
+        FileOutputStream fos = null;
+        try {
+            fos = new FileOutputStream(mypath);
+            // Use the compress method on the BitMap object to write image to the OutputStream
+            bitmapImage.compress(Bitmap.CompressFormat.WEBP, 100, fos);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                if (fos != null) {
+                    fos.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return directory.getAbsolutePath();
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsCastActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsCastActivity.java
index db8248415..bd279a0c0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsCastActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsCastActivity.java
@@ -101,8 +101,7 @@ public abstract class AbsCastActivity extends AbsBaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         try {
-            playServicesAvailable = GoogleApiAvailability
-                    .getInstance().isGooglePlayServicesAvailable(this) == ConnectionResult.SUCCESS;
+            playServicesAvailable = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(this) == ConnectionResult.SUCCESS;
         } catch (Exception ignored) {
 
         }
@@ -125,8 +124,7 @@ public abstract class AbsCastActivity extends AbsBaseActivity {
     protected void onPause() {
         super.onPause();
         if (playServicesAvailable) {
-            castContext.getSessionManager().removeSessionManagerListener(
-                    sessionManagerListener, CastSession.class);
+            castContext.getSessionManager().removeSessionManagerListener(sessionManagerListener, CastSession.class);
         }
     }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.java
index c96e9cb96..6c860d81d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.java
@@ -2,7 +2,6 @@ package code.name.monkey.retromusic.ui.activities.base;
 
 import android.animation.ValueAnimator;
 import android.annotation.SuppressLint;
-import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,7 +9,8 @@ import android.view.ViewTreeObserver;
 import android.view.animation.PathInterpolator;
 
 import com.google.android.gms.cast.framework.CastSession;
-import com.google.android.gms.cast.framework.media.widget.ExpandedControllerActivity;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
+import com.google.android.material.bottomnavigation.LabelVisibilityMode;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout.PanelState;
 
@@ -21,7 +21,9 @@ import androidx.fragment.app.Fragment;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import code.name.monkey.appthemehelper.ThemeStore;
+import code.name.monkey.appthemehelper.util.ATHUtil;
 import code.name.monkey.appthemehelper.util.ColorUtil;
+import code.name.monkey.appthemehelper.util.NavigationViewUtil;
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.cast.CastHelper;
 import code.name.monkey.retromusic.helper.MusicPlayerRemote;
@@ -40,6 +42,7 @@ import code.name.monkey.retromusic.ui.fragments.player.material.MaterialFragment
 import code.name.monkey.retromusic.ui.fragments.player.normal.PlayerFragment;
 import code.name.monkey.retromusic.ui.fragments.player.plain.PlainPlayerFragment;
 import code.name.monkey.retromusic.ui.fragments.player.simple.SimplePlayerFragment;
+import code.name.monkey.retromusic.util.NavigationUtil;
 import code.name.monkey.retromusic.util.PreferenceUtil;
 import code.name.monkey.retromusic.util.ViewUtil;
 
@@ -50,6 +53,9 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
     @BindView(R.id.sliding_layout)
     SlidingUpPanelLayout slidingUpPanelLayout;
 
+    @BindView(R.id.bottom_navigation)
+    BottomNavigationView bottomNavigationView;
+
     private int navigationbarColor;
     private int taskColor;
     private boolean lightStatusBar;
@@ -59,32 +65,25 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
     private MiniPlayerFragment miniPlayerFragment;
     private ValueAnimator navigationBarColorAnimator;
 
-    @Override
-    public void onPlayingMetaChanged() {
-        super.onPlayingMetaChanged();
-        CastSession castSession = getCastSession();
-        if (castSession == null) {
-            return;
-        }
-        //MusicPlayerRemote.pauseSong();
-        CastHelper.startCasting(castSession, MusicPlayerRemote.getCurrentSong());
-    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(createContentView());
         ButterKnife.bind(this);
+
         choosFragmentForTheme();
 
-        findViewById(R.id.castMiniController).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startActivity(new Intent(AbsSlidingMusicPanelActivity.this, ExpandedControllerActivity.class));
-            }
-        });
         //noinspection ConstantConditions
-        miniPlayerFragment.getView().setOnClickListener(v -> expandPanel());
+        miniPlayerFragment.getView().setOnClickListener(v -> {
+                    CastSession castSession = getCastSession();
+                    if (castSession != null) {
+                        NavigationUtil.gotoExpandedController(AbsSlidingMusicPanelActivity.this);
+                    } else {
+                        expandPanel();
+                    }
+                }
+        );
 
         slidingUpPanelLayout.getViewTreeObserver()
                 .addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
@@ -104,7 +103,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
                 });
 
         slidingUpPanelLayout.addPanelSlideListener(this);
-
+        setupBottomView();
     }
 
     private void choosFragmentForTheme() {
@@ -203,6 +202,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
 
     @Override
     public void onPanelSlide(View panel, @FloatRange(from = 0, to = 1) float slideOffset) {
+        bottomNavigationView.setTranslationY(slideOffset * 400);
         setMiniPlayerAlphaProgress(slideOffset);
     }
 
@@ -322,15 +322,24 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
     }
 
     public void hideBottomBar(final boolean hide) {
+
+        int heightOfBar =
+                getResources().getDimensionPixelSize(R.dimen.mini_player_height);
+        int heightOfBarWithTabs =
+                getResources().getDimensionPixelSize(R.dimen.mini_player_height_expanded);
+
         if (hide) {
             slidingUpPanelLayout.setPanelHeight(0);
             collapsePanel();
         } else {
-            //slidingUpPanelLayout.setPanelHeight(getCastSession() != null ? getResources().getDimensionPixelSize(R.dimen.mini_player_height_expanded) : getResources().getDimensionPixelSize(R.dimen.mini_player_height));
-            slidingUpPanelLayout.setPanelHeight(getResources().getDimensionPixelSize(R.dimen.mini_player_height));
+            if (!MusicPlayerRemote.getPlayingQueue().isEmpty()) {
+                slidingUpPanelLayout.setPanelHeight(bottomNavigationView.getVisibility() == View.VISIBLE ?
+                        heightOfBarWithTabs : heightOfBar);
+            }
         }
     }
 
+
     protected View wrapSlidingMusicPanel(@LayoutRes int resId) {
         @SuppressLint("InflateParams")
         View slidingMusicPanelLayout = getLayoutInflater().inflate(R.layout.sliding_music_panel_layout, null);
@@ -377,8 +386,8 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
             if (view.findViewById(R.id.toolbar) != null) {
                 view.findViewById(R.id.toolbar).setBackgroundColor(playerFragmentColorDark);
             }
-            if (view.findViewById(R.id.appbar) != null) {
-                view.findViewById(R.id.appbar).setBackgroundColor(playerFragmentColorDark);
+            if (view.findViewById(R.id.app_bar) != null) {
+                view.findViewById(R.id.app_bar).setBackgroundColor(playerFragmentColorDark);
             }
             if (view.findViewById(R.id.status_bar) != null) {
                 view.findViewById(R.id.status_bar)
@@ -421,15 +430,47 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
     @Override
     public void hideCastMiniController() {
         super.hideCastMiniController();
-        hideBottomBar(false);
-        findViewById(R.id.castMiniController).setVisibility(View.GONE);
     }
 
     @Override
     public void showCastMiniController() {
         super.showCastMiniController();
-        hideBottomBar(true);
-        findViewById(R.id.castMiniController).setVisibility(View.VISIBLE);
-        MusicPlayerRemote.pauseSong();
+        MusicPlayerRemote.setZeroVolume();
+    }
+
+    private void setupBottomView() {
+        bottomNavigationView.setBackgroundColor(ThemeStore.primaryColor(this));
+        bottomNavigationView.setSelectedItemId(PreferenceUtil.getInstance(this).getLastPage());
+        int iconColor = ATHUtil.resolveColor(this, R.attr.iconColor);
+        int accentColor = ThemeStore.accentColor(this);
+        NavigationViewUtil.setItemIconColors(bottomNavigationView, ColorUtil.withAlpha(iconColor, 0.5f), accentColor);
+        NavigationViewUtil.setItemTextColors(bottomNavigationView, ColorUtil.withAlpha(iconColor, 0.5f), accentColor);
+
+        if (!PreferenceUtil.getInstance(this).tabTitles()) {
+            bottomNavigationView.setLabelVisibilityMode(LabelVisibilityMode.LABEL_VISIBILITY_UNLABELED);
+        }
+    }
+
+    @Override
+    public void onPlayingMetaChanged() {
+        super.onPlayingMetaChanged();
+        CastSession castSession = getCastSession();
+        if (castSession == null) {
+            return;
+        }
+        //MusicPlayerRemote.pauseSong();
+        CastHelper.startCasting(castSession, MusicPlayerRemote.getCurrentSong());
+    }
+
+    public void setBottomBarVisibility(int gone) {
+        if (bottomNavigationView != null) {
+            //TransitionManager.beginDelayedTransition(bottomNavigationView);
+            bottomNavigationView.setVisibility(gone);
+            hideBottomBar(false);
+        }
+    }
+
+    public BottomNavigationView getBottomNavigationView() {
+        return bottomNavigationView;
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AbsTagEditorActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AbsTagEditorActivity.java
index ba2afae11..da8e746d0 100755
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AbsTagEditorActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AbsTagEditorActivity.java
@@ -6,9 +6,6 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
@@ -17,6 +14,7 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import org.jaudiotagger.audio.AudioFile;
 import org.jaudiotagger.audio.AudioFileIO;
@@ -27,6 +25,8 @@ import java.io.File;
 import java.util.List;
 import java.util.Map;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import code.name.monkey.appthemehelper.ThemeStore;
@@ -71,6 +71,9 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
         }
 
         setUpViews();
+
+
+        setNavigationbarColorAuto();
         setTaskDescriptionColorAuto();
     }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AlbumTagEditorActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AlbumTagEditorActivity.java
index d13b6c453..00839dee1 100755
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AlbumTagEditorActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AlbumTagEditorActivity.java
@@ -1,26 +1,26 @@
 package code.name.monkey.retromusic.ui.activities.tageditor;
 
+import android.content.res.ColorStateList;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import com.google.android.material.appbar.AppBarLayout;
-import androidx.core.content.ContextCompat;
-import androidx.appcompat.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.View;
-import android.widget.EditText;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.animation.GlideAnimation;
 import com.bumptech.glide.request.target.SimpleTarget;
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textfield.TextInputLayout;
 
 import org.jaudiotagger.tag.FieldKey;
 
@@ -29,11 +29,16 @@ import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import butterknife.BindView;
+import butterknife.BindViews;
 import butterknife.ButterKnife;
-import butterknife.OnClick;
+import code.name.monkey.appthemehelper.ThemeStore;
 import code.name.monkey.appthemehelper.util.ATHUtil;
-import code.name.monkey.appthemehelper.util.ColorUtil;
+import code.name.monkey.appthemehelper.util.TintHelper;
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteTranscoder;
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper;
@@ -53,43 +58,61 @@ public class AlbumTagEditorActivity extends AbsTagEditorActivity implements Text
     public static final String TAG = AlbumTagEditorActivity.class.getSimpleName();
     @BindView(R.id.toolbar)
     Toolbar toolbar;
-    @BindView(R.id.app_bar)
-    AppBarLayout appBarLayout;
+
     @BindView(R.id.title)
-    EditText albumTitle;
+    TextView title;
+
+    @BindView(R.id.app_bar)
+    @Nullable
+    AppBarLayout appBarLayout;
+    @BindViews({R.id.album_title_container, R.id.album_artist_container, R.id.genre_container, R.id.year_container})
+    List<TextInputLayout> textInputLayouts;
+
+    @BindView(R.id.album_title)
+    TextInputEditText albumTitle;
+
     @BindView(R.id.album_artist)
-    EditText albumArtist;
+    TextInputEditText albumArtist;
+
     @BindView(R.id.genre)
-    EditText genre;
+    TextInputEditText genre;
+
     @BindView(R.id.year)
-    EditText year;
+    TextInputEditText year;
+
     @BindView(R.id.gradient_background)
     View background;
+
+    @BindView(R.id.content)
+    View content;
+
+    ButterKnife.Setter<TextInputLayout, Integer> textColor = (view, value, index) -> {
+        view.setBoxStrokeColor(value);
+    };
     private Bitmap albumArtBitmap;
     private boolean deleteAlbumArt;
     private LastFMRestClient lastFMRestClient;
 
     private void setupToolbar() {
-        //toolbar.setBackgroundColor(ThemeStore.primaryColor(this));
+        title.setTextColor(ThemeStore.textColorPrimary(this));
+        // toolbar.setBackgroundColor(ThemeStore.primaryColor(this));
         toolbar.setNavigationOnClickListener(v -> onBackPressed());
-        setTitle(R.string.action_tag_editor);
+        setTitle(null);
         setSupportActionBar(toolbar);
-    }
-
-    @OnClick(R.id.edit)
-    void edit() {
-        getShow();
+        TintHelper.setTintAuto(content, ThemeStore.primaryColor(this), true);
     }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        setDrawUnderStatusBar(true);
         super.onCreate(savedInstanceState);
         ButterKnife.bind(this);
-
+        ButterKnife.apply(textInputLayouts, textColor, ThemeStore.accentColor((this)));
         lastFMRestClient = new LastFMRestClient(this);
 
         setUpViews();
         setupToolbar();
+
     }
 
     @Override
@@ -271,10 +294,6 @@ public class AlbumTagEditorActivity extends AbsTagEditorActivity implements Text
     @Override
     protected void setColors(int color) {
         super.setColors(color);
-        background.setBackgroundColor(color);
-        toolbar.setBackgroundColor(color);
-        setStatusbarColor(ColorUtil.darkenColor(color));
-        setNavigationbarColor(ColorUtil.darkenColor(color));
-        setSupportActionBar(toolbar);
+        save.setBackgroundTintList(ColorStateList.valueOf(color));
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/SongTagEditorActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/SongTagEditorActivity.java
index 5eaa010a0..95c96c5dc 100755
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/SongTagEditorActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/SongTagEditorActivity.java
@@ -74,12 +74,10 @@ public class SongTagEditorActivity extends AbsTagEditorActivity implements TextW
         super.onCreate(savedInstanceState);
         ButterKnife.bind(this);
 
-        setStatusbarColorAuto();
-        setNavigationbarColorAuto();
-
         setNoImageMode();
         setUpViews();
         setupToolbar();
+        setStatusbarColorAuto();
     }
 
     private void setUpViews() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/ContributorAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/ContributorAdapter.java
new file mode 100644
index 000000000..6190c77e2
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/ContributorAdapter.java
@@ -0,0 +1,71 @@
+package code.name.monkey.retromusic.ui.adapter;
+
+import android.app.Activity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.model.Contributor;
+import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder;
+import code.name.monkey.retromusic.views.NetworkImageView;
+
+import static code.name.monkey.retromusic.util.RetroUtil.openUrl;
+
+public class ContributorAdapter extends RecyclerView.Adapter<ContributorAdapter.ViewHolder> {
+    private List<Contributor> contributors = new ArrayList<>();
+
+    public ContributorAdapter(List<Contributor> contributors) {
+        this.contributors = contributors;
+    }
+
+    public ContributorAdapter() {
+    }
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return new ViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_contributor, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+        Contributor contributor = contributors.get(position);
+        holder.bindData(contributor);
+    }
+
+    @Override
+    public int getItemCount() {
+        return contributors.size();
+    }
+
+    public class ViewHolder extends MediaEntryViewHolder {
+
+        public ViewHolder(View itemView) {
+            super(itemView);
+        }
+
+        void bindData(Contributor contributor) {
+            if (title != null) {
+                title.setText(contributor.getName());
+            }
+            if (text != null) {
+                text.setText(contributor.getSummary());
+            }
+            if (image instanceof NetworkImageView) {
+                ((NetworkImageView) image).setImageUrl(contributor.getProfileImage());
+            }
+        }
+
+        @Override
+        public void onClick(View v) {
+            super.onClick(v);
+            openUrl((Activity) v.getContext(), contributors.get(getAdapterPosition()).getLink());
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumCoverPagerAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumCoverPagerAdapter.java
index b6340c7a0..8dc429df3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumCoverPagerAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumCoverPagerAdapter.java
@@ -24,7 +24,6 @@ import code.name.monkey.retromusic.glide.SongGlideRequest;
 import code.name.monkey.retromusic.misc.CustomFragmentStatePagerAdapter;
 import code.name.monkey.retromusic.model.Song;
 import code.name.monkey.retromusic.ui.activities.LyricsActivity;
-import code.name.monkey.retromusic.ui.fragments.NowPlayingScreen;
 import code.name.monkey.retromusic.util.PreferenceUtil;
 
 
@@ -134,12 +133,12 @@ public class AlbumCoverPagerAdapter extends CustomFragmentStatePagerAdapter {
                 case MATERIAL:
                     layout = R.layout.fragment_album_material_cover;
                     break;
-                case CAROUSAL:
-                    layout = R.layout.fragment_album_carousal_cover;
-                    break;
                 case FULL:
                     layout = R.layout.fragment_album_full_cover;
                     break;
+                case FULL_CARD:
+                    layout = R.layout.fragment_album_full_card_cover;
+                    break;
             }
             return layout;
         }
@@ -163,7 +162,7 @@ public class AlbumCoverPagerAdapter extends CustomFragmentStatePagerAdapter {
         }
 
         private void loadAlbumCover() {
-            SongGlideRequest.Builder.from(Glide.with(this), song)
+            SongGlideRequest.Builder.from(Glide.with(getContext()), song)
                     .checkIgnoreMediaStore(getActivity())
                     .generatePalette(getActivity()).build()
                     .into(new RetroMusicColoredTarget(albumCover) {
@@ -183,7 +182,7 @@ public class AlbumCoverPagerAdapter extends CustomFragmentStatePagerAdapter {
             }
         }
 
-        public void receiveColor(ColorReceiver colorReceiver, int request) {
+        void receiveColor(ColorReceiver colorReceiver, int request) {
             if (isColorReady) {
                 colorReceiver.onColorReady(color, request);
             } else {
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlayingQueueAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlayingQueueAdapter.java
index b69e124b2..ffdf3b86b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlayingQueueAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlayingQueueAdapter.java
@@ -171,9 +171,6 @@ public class PlayingQueueAdapter extends SongAdapter implements DraggableItemAda
             if (imageText != null) {
                 imageText.setVisibility(View.VISIBLE);
             }
-            if (image != null) {
-                image.setVisibility(View.GONE);
-            }
             if (dragView != null) {
                 dragView.setVisibility(View.VISIBLE);
             }
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/AlbumCoverStyle.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/AlbumCoverStyle.java
index b22e5672b..1c63ac8fa 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/AlbumCoverStyle.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/AlbumCoverStyle.java
@@ -6,13 +6,13 @@ import code.name.monkey.retromusic.R;
 
 
 public enum AlbumCoverStyle {
-    NORMAL(R.string.normal, R.drawable.album_cover_card, 0),
+    NORMAL(R.string.normal, R.drawable.album_cover_normal, 0),
     FLAT(R.string.flat, R.drawable.album_cover_square, 1),
     CIRCLE(R.string.circular, R.drawable.album_cover_circle, 2),
-    MATERIAL(R.string.material, R.drawable.album_cover_card, 3),
+    MATERIAL(R.string.material, R.drawable.album_cover_normal, 3),
     CARD(R.string.card, R.drawable.album_cover_card, 4),
-    CAROUSAL(R.string.carousal, R.drawable.album_cover_carousal, 5),
-    FULL(R.string.full, R.drawable.album_cover_full, 6);
+    FULL(R.string.full, R.drawable.album_cover_full, 5),
+    FULL_CARD(R.string.full_card, R.drawable.album_cover_full_card, 6);
 
     @StringRes
     public final int titleRes;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/MiniPlayerFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/MiniPlayerFragment.java
index 04603a822..4d12d65b7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/MiniPlayerFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/MiniPlayerFragment.java
@@ -4,7 +4,6 @@ import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.ColorStateList;
-import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.view.GestureDetector;
 import android.view.LayoutInflater;
@@ -22,7 +21,6 @@ import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.Unbinder;
 import code.name.monkey.appthemehelper.ThemeStore;
-import code.name.monkey.appthemehelper.util.ATHUtil;
 import code.name.monkey.retromusic.R;
 import code.name.monkey.retromusic.helper.MusicPlayerRemote;
 import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper;
@@ -30,7 +28,6 @@ import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler;
 import code.name.monkey.retromusic.ui.fragments.base.AbsMusicServiceFragment;
 import code.name.monkey.retromusic.util.PreferenceUtil;
 import code.name.monkey.retromusic.util.RetroUtil;
-import code.name.monkey.retromusic.views.PlayPauseDrawable;
 import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
 
 public class MiniPlayerFragment extends AbsMusicServiceFragment implements MusicProgressViewUpdateHelper.Callback {
@@ -51,7 +48,6 @@ public class MiniPlayerFragment extends AbsMusicServiceFragment implements Music
     MaterialProgressBar progressBar;
 
     private Unbinder unbinder;
-    private PlayPauseDrawable miniPlayerPlayPauseDrawable;
     private MusicProgressViewUpdateHelper progressViewUpdateHelper;
 
     @Override
@@ -72,10 +68,12 @@ public class MiniPlayerFragment extends AbsMusicServiceFragment implements Music
     @Override
     public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+
         //noinspection ConstantConditions
         view.setBackgroundColor(ThemeStore.primaryColor(getContext()));
         view.setOnTouchListener(new FlingPlayBackController(getActivity()));
         setUpMiniPlayer();
+
         if (RetroUtil.isTablet(getResources())) {
             next.setVisibility(View.VISIBLE);
             previous.setVisibility(View.VISIBLE);
@@ -99,11 +97,6 @@ public class MiniPlayerFragment extends AbsMusicServiceFragment implements Music
 
     private void setUpPlayPauseButton() {
         //noinspection ConstantConditions
-        miniPlayerPlayPauseDrawable = new PlayPauseDrawable(getActivity());
-        miniPlayerPlayPauseButton.setImageDrawable(miniPlayerPlayPauseDrawable);
-        miniPlayerPlayPauseButton.setColorFilter(ATHUtil.resolveColor(getActivity(),
-                R.attr.iconColor,
-                ThemeStore.textColorSecondary(getActivity())), PorterDuff.Mode.SRC_IN);
         miniPlayerPlayPauseButton.setOnClickListener(new PlayPauseButtonOnClickHandler());
     }
 
@@ -114,7 +107,7 @@ public class MiniPlayerFragment extends AbsMusicServiceFragment implements Music
     @Override
     public void onServiceConnected() {
         updateSongTitle();
-        updatePlayPauseDrawableState(false);
+        updatePlayPauseDrawableState();
     }
 
     @Override
@@ -124,7 +117,7 @@ public class MiniPlayerFragment extends AbsMusicServiceFragment implements Music
 
     @Override
     public void onPlayStateChanged() {
-        updatePlayPauseDrawableState(true);
+        updatePlayPauseDrawableState();
     }
 
     @Override
@@ -148,11 +141,11 @@ public class MiniPlayerFragment extends AbsMusicServiceFragment implements Music
         progressViewUpdateHelper.stop();
     }
 
-    protected void updatePlayPauseDrawableState(boolean animate) {
+    protected void updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying()) {
-            miniPlayerPlayPauseDrawable.setPause(animate);
+            miniPlayerPlayPauseButton.setImageResource(R.drawable.ic_pause_white_24dp);
         } else {
-            miniPlayerPlayPauseDrawable.setPlay(animate);
+            miniPlayerPlayPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp);
         }
     }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/PlayingQueueFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/PlayingQueueFragment.java
index 7724f1bab..ebea9479b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/PlayingQueueFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/PlayingQueueFragment.java
@@ -56,7 +56,7 @@ public class PlayingQueueFragment extends AbsMusicServiceFragment {
                 (AppCompatActivity) getActivity(),
                 MusicPlayerRemote.getPlayingQueue(),
                 MusicPlayerRemote.getPosition(),
-                R.layout.item_list,
+                R.layout.item_queue,
                 false,
                 null);
         mWrappedAdapter = mRecyclerViewDragDropManager.createWrappedAdapter(mPlayingQueueAdapter);
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMainActivityFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMainActivityFragment.java
index 2a2e95dbe..7bf4600fc 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMainActivityFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMainActivityFragment.java
@@ -7,8 +7,8 @@ import android.view.View;
 import code.name.monkey.appthemehelper.ThemeStore;
 import code.name.monkey.appthemehelper.util.ColorUtil;
 import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.dialogs.MainOptionsBottomSheetDialogFragment;
 import code.name.monkey.retromusic.ui.activities.MainActivity;
-import code.name.monkey.retromusic.util.RetroUtil;
 
 
 public abstract class AbsMainActivityFragment extends AbsMusicServiceFragment {
@@ -21,7 +21,7 @@ public abstract class AbsMainActivityFragment extends AbsMusicServiceFragment {
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         setHasOptionsMenu(true);
-        getMainActivity().setStatusbarColorAuto();
+        //getMainActivity().setStatusbarColorAuto();
         getMainActivity().setNavigationbarColorAuto();
         getMainActivity().setLightNavigationBar(true);
         getMainActivity().setTaskDescriptionColorAuto();
@@ -47,4 +47,8 @@ public abstract class AbsMainActivityFragment extends AbsMusicServiceFragment {
         //noinspection ConstantConditions
         setStatusbarColor(view, ColorUtil.darkenColor(ThemeStore.primaryColor(getContext())));
     }
+
+    protected void showMainMenu() {
+        MainOptionsBottomSheetDialogFragment.newInstance().show(getChildFragmentManager(), "Main Menu");
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/intro/NameFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/intro/NameFragment.java
deleted file mode 100644
index d936b041a..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/intro/NameFragment.java
+++ /dev/null
@@ -1,275 +0,0 @@
-package code.name.monkey.retromusic.ui.fragments.intro;
-
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.MediaStore.Images.Media;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.Toast;
-
-import com.afollestad.materialdialogs.MaterialDialog.Builder;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Arrays;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-import butterknife.Unbinder;
-import code.name.monkey.retromusic.R;
-import code.name.monkey.retromusic.util.Compressor;
-import code.name.monkey.retromusic.util.ImageUtil;
-import code.name.monkey.retromusic.util.PreferenceUtil;
-import code.name.monkey.retromusic.views.CircularImageView;
-import code.name.monkey.retromusic.views.IconImageView;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.schedulers.Schedulers;
-
-import static android.app.Activity.RESULT_OK;
-import static code.name.monkey.retromusic.Constants.USER_BANNER;
-import static code.name.monkey.retromusic.Constants.USER_PROFILE;
-
-public class NameFragment extends Fragment {
-
-    private static final int PICK_IMAGE_REQUEST = 9002;
-    private static final int PICK_BANNER_REQUEST = 9003;
-    private static final int PROFILE_ICON_SIZE = 400;
-    @BindView(R.id.name)
-    EditText name;
-    @BindView(R.id.user_image)
-    CircularImageView userImage;
-    @BindView(R.id.image)
-    ImageView image;
-    @BindView(R.id.banner_select)
-    IconImageView imageView;
-    private Unbinder unbinder;
-    private CompositeDisposable disposable;
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = LayoutInflater.from(getActivity())
-                .inflate(R.layout.fragment_name, container, false);
-        unbinder = ButterKnife.bind(this, view);
-        return view;
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        //noinspection ConstantConditions
-        name.setText(PreferenceUtil.getInstance(getActivity()).getUserName());
-        if (!PreferenceUtil.getInstance(getActivity()).getProfileImage().isEmpty()) {
-            loadImageFromStorage(PreferenceUtil.getInstance(getActivity()).getProfileImage());
-        }
-        if (!PreferenceUtil.getInstance(getActivity()).getBannerImage().isEmpty()) {
-            loadBannerFromStorage(PreferenceUtil.getInstance(getActivity()).getBannerImage());
-            imageView.setImageResource(R.drawable.ic_close_white_24dp);
-        }
-    }
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        disposable = new CompositeDisposable();
-    }
-
-    @OnClick({R.id.next, R.id.banner_select})
-    void next(View view) {
-        switch (view.getId()) {
-            case R.id.banner_select:
-                showBannerOptions();
-                break;
-            case R.id.next:
-                String nameString = name.getText().toString().trim();
-                if (TextUtils.isEmpty(nameString)) {
-                    Toast.makeText(getActivity(), "Umm name is empty", Toast.LENGTH_SHORT).show();
-                    return;
-                }
-                //noinspection ConstantConditions
-                PreferenceUtil.getInstance(getActivity()).setUserName(nameString);
-                getActivity().setResult(RESULT_OK);
-                //((UserInfoActivity) getActivity()).setFragment(new ChooseThemeFragment(), true);
-                getActivity().finish();
-                break;
-        }
-    }
-
-    private void showBannerOptions() {
-        //noinspection ConstantConditions
-        new Builder(getContext())
-                .title(R.string.select_banner_photo)
-                .items(Arrays.asList(getString(R.string.new_banner_photo),
-                        getString(R.string.remove_banner_photo)))
-                .itemsCallback((dialog, itemView, position, text) -> {
-                    switch (position) {
-                        case 0:
-                            selectBannerImage();
-                            break;
-                        case 1:
-                            PreferenceUtil.getInstance(getContext()).setBannerImagePath("");
-                            break;
-                    }
-                }).show();
-    }
-
-    private void selectBannerImage() {
-        //noinspection ConstantConditions
-        if (PreferenceUtil.getInstance(getActivity()).getBannerImage().isEmpty()) {
-            Intent pickImageIntent = new Intent(Intent.ACTION_PICK,
-                    Media.EXTERNAL_CONTENT_URI);
-            pickImageIntent.setType("image/*");
-            pickImageIntent.putExtra("crop", "true");
-            pickImageIntent.putExtra("outputX", 1290);
-            pickImageIntent.putExtra("outputY", 720);
-            pickImageIntent.putExtra("aspectX", 16);
-            pickImageIntent.putExtra("aspectY", 9);
-            pickImageIntent.putExtra("scale", true);
-            //intent.setAction(Intent.ACTION_GET_CONTENT);
-            startActivityForResult(Intent.createChooser(pickImageIntent,
-                    "Select Picture"), PICK_BANNER_REQUEST);
-        } else {
-            PreferenceUtil.getInstance(getContext()).setBannerImagePath("");
-            image.setImageResource(android.R.color.transparent);
-            imageView.setImageResource(R.drawable.ic_edit_white_24dp);
-        }
-    }
-
-    @OnClick(R.id.image)
-    public void onViewClicked() {
-        //noinspection ConstantConditions
-        new Builder(getContext())
-                .title("Set a profile photo")
-                .items(Arrays.asList(getString(R.string.new_profile_photo),
-                        getString(R.string.remove_profile_photo)))
-                .itemsCallback((dialog, itemView, position, text) -> {
-                    switch (position) {
-                        case 0:
-                            pickNewPhoto();
-                            break;
-                        case 1:
-                            PreferenceUtil.getInstance(getContext()).saveProfileImage("");
-                            break;
-                    }
-                }).show();
-    }
-
-    private void pickNewPhoto() {
-        Intent pickImageIntent = new Intent(Intent.ACTION_PICK,
-                android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
-        pickImageIntent.setType("image/*");
-        pickImageIntent.putExtra("crop", "true");
-        pickImageIntent.putExtra("outputX", 512);
-        pickImageIntent.putExtra("outputY", 512);
-        pickImageIntent.putExtra("aspectX", 1);
-        pickImageIntent.putExtra("aspectY", 1);
-        pickImageIntent.putExtra("scale", true);
-        startActivityForResult(Intent.createChooser(pickImageIntent, "Select Picture"),
-                PICK_IMAGE_REQUEST);
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == PICK_IMAGE_REQUEST && resultCode == RESULT_OK && data != null &&
-                data.getData() != null) {
-            Uri uri = data.getData();
-            try {
-                Bitmap bitmap = ImageUtil.getResizedBitmap(Media.getBitmap(getActivity()
-                        .getContentResolver(), uri), PROFILE_ICON_SIZE);
-                String profileImagePath = saveToInternalStorage(bitmap, USER_PROFILE);
-                PreferenceUtil.getInstance(getActivity()).saveProfileImage(profileImagePath);
-                loadImageFromStorage(profileImagePath);
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        if (requestCode == PICK_BANNER_REQUEST && resultCode == RESULT_OK && data != null &&
-                data.getData() != null) {
-            Uri uri = data.getData();
-            try {
-                Bitmap bitmap = Media.getBitmap(getActivity().getContentResolver(), uri);
-                String profileImagePath = saveToInternalStorage(bitmap, USER_BANNER);
-                PreferenceUtil.getInstance(getActivity()).setBannerImagePath(profileImagePath);
-                loadBannerFromStorage(profileImagePath);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    private void loadBannerFromStorage(String profileImagePath) {
-        disposable.add(new Compressor(getActivity())
-                .setQuality(100)
-                .setCompressFormat(Bitmap.CompressFormat.WEBP)
-                .compressToBitmapAsFlowable(new File(profileImagePath, USER_BANNER))
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(bitmap -> {
-                    image.setImageBitmap(bitmap);
-                }));
-    }
-
-    private void loadImageFromStorage(String path) {
-        disposable.add(new Compressor(getActivity())
-                .setMaxHeight(300)
-                .setMaxWidth(300)
-                .setQuality(75)
-                .setCompressFormat(Bitmap.CompressFormat.WEBP)
-                .compressToBitmapAsFlowable(new File(path, USER_PROFILE))
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(bitmap -> {
-                    userImage.setImageBitmap(bitmap);
-                }));
-    }
-
-    private String saveToInternalStorage(Bitmap bitmapImage, String userBanner) {
-        ContextWrapper cw = new ContextWrapper(getActivity());
-        // path to /data/data/yourapp/app_data/imageDir
-        File directory = cw.getDir("imageDir", Context.MODE_PRIVATE);
-        // Create imageDir
-        File mypath = new File(directory, userBanner);
-
-        FileOutputStream fos = null;
-        try {
-            fos = new FileOutputStream(mypath);
-            // Use the compress method on the BitMap object to write image to the OutputStream
-            bitmapImage.compress(Bitmap.CompressFormat.WEBP, 100, fos);
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                if (fos != null) {
-                    fos.close();
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return directory.getAbsolutePath();
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/LibraryFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/LibraryFragment.java
index 312dba65f..b98c92e7c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/LibraryFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/LibraryFragment.java
@@ -1,20 +1,8 @@
 package code.name.monkey.retromusic.ui.fragments.mainactivity;
 
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import com.google.android.material.bottomnavigation.LabelVisibilityMode;
-import com.google.android.material.appbar.AppBarLayout;
-import com.google.android.material.bottomnavigation.BottomNavigationView;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -22,22 +10,24 @@ import android.view.MenuItem;
 import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.animation.AccelerateDecelerateInterpolator;
 import android.widget.TextView;
 
 import com.afollestad.materialcab.MaterialCab;
+import com.google.android.material.appbar.AppBarLayout;
 
-import butterknife.BindDrawable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import butterknife.OnClick;
 import butterknife.Unbinder;
 import code.name.monkey.appthemehelper.ThemeStore;
 import code.name.monkey.appthemehelper.common.ATHToolbarActivity;
 import code.name.monkey.appthemehelper.util.ATHUtil;
-import code.name.monkey.appthemehelper.util.ColorUtil;
-import code.name.monkey.appthemehelper.util.MaterialValueHelper;
-import code.name.monkey.appthemehelper.util.NavigationViewUtil;
 import code.name.monkey.appthemehelper.util.TintHelper;
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper;
 import code.name.monkey.retromusic.R;
@@ -48,8 +38,6 @@ import code.name.monkey.retromusic.helper.SortOrder;
 import code.name.monkey.retromusic.interfaces.CabHolder;
 import code.name.monkey.retromusic.interfaces.MainActivityFragmentCallbacks;
 import code.name.monkey.retromusic.loaders.SongLoader;
-import code.name.monkey.retromusic.misc.NavigationIconClickListener;
-import code.name.monkey.retromusic.ui.activities.MainActivity;
 import code.name.monkey.retromusic.ui.activities.SettingsActivity;
 import code.name.monkey.retromusic.ui.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment;
 import code.name.monkey.retromusic.ui.fragments.base.AbsMainActivityFragment;
@@ -58,8 +46,7 @@ import code.name.monkey.retromusic.util.PreferenceUtil;
 import code.name.monkey.retromusic.util.RetroColorUtil;
 import code.name.monkey.retromusic.util.RetroUtil;
 
-public class LibraryFragment extends AbsMainActivityFragment implements CabHolder,
-        MainActivityFragmentCallbacks {
+public class LibraryFragment extends AbsMainActivityFragment implements CabHolder, MainActivityFragmentCallbacks {
 
     public static final String TAG = "LibraryFragment";
     private static final String CURRENT_TAB_ID = "current_tab_id";
@@ -73,23 +60,9 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
     @BindView(R.id.title)
     TextView title;
 
-    @BindView(R.id.action_library)
-    TextView actionLibrary;
-
-    @BindView(R.id.bottom_navigation)
-    BottomNavigationView bottomNavigationView;
-
     @BindView(R.id.fragment_container)
     View contentContainer;
 
-    @BindView(R.id.menu_container)
-    View menuContainer;
-
-    @BindDrawable(R.drawable.ic_menu_white_24dp)
-    Drawable menu;
-
-    @BindDrawable(R.drawable.ic_close_white_24dp)
-    Drawable close;
 
     private Unbinder unBinder;
     private MaterialCab cab;
@@ -107,34 +80,16 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
         return new LibraryFragment();
     }
 
-    private void setupBottomView() {
-        Context context = getContext();
-        if (context != null) {
-            bottomNavigationView.setSelectedItemId(PreferenceUtil.getInstance(context).getLastPage());
-            bottomNavigationView.setBackgroundColor(ThemeStore.primaryColor(context));
-            bottomNavigationView.setOnNavigationItemSelectedListener(this::onOptionsItemSelected);
-            int iconColor = ATHUtil.resolveColor(context, R.attr.iconColor);
-            int accentColor = ThemeStore.accentColor(context);
-            NavigationViewUtil.setItemIconColors(bottomNavigationView, ColorUtil.withAlpha(iconColor, 0.5f), accentColor);
-            NavigationViewUtil.setItemTextColors(bottomNavigationView, ColorUtil.withAlpha(iconColor, 0.5f), accentColor);
-
-            if (!PreferenceUtil.getInstance(getContext()).tabTitles()) {
-                bottomNavigationView.setLabelVisibilityMode(LabelVisibilityMode.LABEL_VISIBILITY_UNLABELED);
-            }
-        }
-    }
 
     public void setTitle(@StringRes int name) {
         title.setText(getString(name));
     }
 
-    public void addOnAppBarOffsetChangedListener(
-            AppBarLayout.OnOffsetChangedListener onOffsetChangedListener) {
+    public void addOnAppBarOffsetChangedListener(AppBarLayout.OnOffsetChangedListener onOffsetChangedListener) {
         appbar.addOnOffsetChangedListener(onOffsetChangedListener);
     }
 
-    public void removeOnAppBarOffsetChangedListener(
-            AppBarLayout.OnOffsetChangedListener onOffsetChangedListener) {
+    public void removeOnAppBarOffsetChangedListener(AppBarLayout.OnOffsetChangedListener onOffsetChangedListener) {
         appbar.removeOnOffsetChangedListener(onOffsetChangedListener);
     }
 
@@ -154,25 +109,38 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        setupBottomView();
+        setStatusbarColorAuto(view);
         setupToolbar();
+        inflateFragment();
+    }
 
-        if (savedInstanceState == null) {
+    private void inflateFragment() {
+        if (getArguments() == null) {
             selectedFragment(SongsFragment.newInstance());
+            return;
+        }
+        switch (getArguments().getInt(CURRENT_TAB_ID)) {
+            default:
+            case R.id.action_song:
+                selectedFragment(SongsFragment.newInstance());
+                break;
+            case R.id.action_album:
+                selectedFragment(AlbumsFragment.newInstance());
+                break;
+            case R.id.action_artist:
+                selectedFragment(ArtistsFragment.newInstance());
+                break;
+            case R.id.action_playlist:
+                selectedFragment(PlaylistsFragment.newInstance());
+                break;
         }
     }
 
     @SuppressWarnings("ConstantConditions")
     private void setupToolbar() {
-        int accentColor = ThemeStore.accentColor(getContext());
         title.setTextColor(ThemeStore.textColorPrimary(getContext()));
-        actionLibrary.setTextColor(MaterialValueHelper.getPrimaryTextColor(getContext(), ColorUtil.isColorLight(accentColor)));
-        actionLibrary.setBackgroundResource(R.drawable.et_bg_circular_top_corners);
-        TintHelper.setTintAuto(actionLibrary, ThemeStore.accentColor(getContext()), true);
 
         int primaryColor = ThemeStore.primaryColor(getContext());
-
-
         TintHelper.setTintAuto(contentContainer, primaryColor, true);
 
         toolbar.setBackgroundColor(primaryColor);
@@ -182,17 +150,10 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
                 getMainActivity().setLightStatusbar(!ATHUtil.isWindowBackgroundDark(getContext())));
         getMainActivity().setTitle(null);
         getMainActivity().setSupportActionBar(toolbar);
-        toolbar.setNavigationOnClickListener(new NavigationIconClickListener(
-                getContext(),
-                contentContainer,
-                menuContainer,
-                new AccelerateDecelerateInterpolator(),
-                menu,
-                close
-        ));
+        toolbar.setNavigationOnClickListener(v -> showMainMenu( ));
     }
 
-    public Fragment getCurrentFragment() {
+    private Fragment getCurrentFragment() {
         if (fragmentManager == null) {
             return SongsFragment.newInstance();
         }
@@ -214,7 +175,7 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
         return false;
     }
 
-    public void selectedFragment(Fragment fragment) {
+    private void selectedFragment(Fragment fragment) {
         fragmentManager = getChildFragmentManager();
         FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
 
@@ -394,21 +355,6 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
         }
         int id = item.getItemId();
         switch (id) {
-            case R.id.action_song:
-                selectedFragment(SongsFragment.newInstance());
-                return true;
-            case R.id.action_album:
-                selectedFragment(AlbumsFragment.newInstance());
-                return true;
-            case R.id.action_artist:
-                selectedFragment(ArtistsFragment.newInstance());
-                return true;
-            case R.id.action_playlist:
-                selectedFragment(PlaylistsFragment.newInstance());
-                return true;
-            case R.id.action_genre:
-                selectedFragment(GenreFragment.newInstance());
-                return true;
             case R.id.action_new_playlist:
                 CreatePlaylistDialog.create().show(getChildFragmentManager(), "CREATE_PLAYLIST");
                 return true;
@@ -524,22 +470,4 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
         }
         return false;
     }
-
-    @OnClick({R.id.action_home, R.id.action_settings, R.id.action_folders})
-    void startUserInfo(View view) {
-        Activity activity = getActivity();
-        if (activity != null) {
-            switch (view.getId()) {
-                case R.id.action_settings:
-                    NavigationUtil.goToSettings(activity);
-                    break;
-                case R.id.action_home:
-                    getMainActivity().setCurrentFragment(MainActivity.HOME);
-                    break;
-                case R.id.action_folders:
-                    getMainActivity().setCurrentFragment(MainActivity.FOLDERS);
-                    break;
-            }
-        }
-    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/folders/FoldersFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/folders/FoldersFragment.java
index aa6e239b5..61cf1d157 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/folders/FoldersFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/folders/FoldersFragment.java
@@ -1,21 +1,10 @@
 package code.name.monkey.retromusic.ui.fragments.mainactivity.folders;
 
-import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
-import android.graphics.drawable.Drawable;
 import android.media.MediaScannerConnection;
 import android.os.Bundle;
 import android.os.Environment;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import com.google.android.material.appbar.AppBarLayout;
-import com.google.android.material.snackbar.Snackbar;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.appcompat.widget.Toolbar;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -23,7 +12,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.animation.AccelerateDecelerateInterpolator;
 import android.webkit.MimeTypeMap;
 import android.widget.PopupMenu;
 import android.widget.TextView;
@@ -31,6 +19,8 @@ import android.widget.Toast;
 
 import com.afollestad.materialcab.MaterialCab;
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.snackbar.Snackbar;
 import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
 
 import java.io.File;
@@ -43,16 +33,20 @@ import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 
-import butterknife.BindDrawable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import butterknife.OnClick;
 import butterknife.Unbinder;
 import code.name.monkey.appthemehelper.ThemeStore;
 import code.name.monkey.appthemehelper.common.ATHToolbarActivity;
 import code.name.monkey.appthemehelper.util.ATHUtil;
 import code.name.monkey.appthemehelper.util.ColorUtil;
-import code.name.monkey.appthemehelper.util.MaterialValueHelper;
 import code.name.monkey.appthemehelper.util.TintHelper;
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper;
 import code.name.monkey.retromusic.R;
@@ -63,15 +57,12 @@ import code.name.monkey.retromusic.interfaces.CabHolder;
 import code.name.monkey.retromusic.interfaces.LoaderIds;
 import code.name.monkey.retromusic.interfaces.MainActivityFragmentCallbacks;
 import code.name.monkey.retromusic.misc.DialogAsyncTask;
-import code.name.monkey.retromusic.misc.NavigationIconClickListener;
 import code.name.monkey.retromusic.misc.UpdateToastMediaScannerCompletionListener;
 import code.name.monkey.retromusic.misc.WrappedAsyncTaskLoader;
 import code.name.monkey.retromusic.model.Song;
-import code.name.monkey.retromusic.ui.activities.MainActivity;
 import code.name.monkey.retromusic.ui.adapter.SongFileAdapter;
 import code.name.monkey.retromusic.ui.fragments.base.AbsMainActivityFragment;
 import code.name.monkey.retromusic.util.FileUtil;
-import code.name.monkey.retromusic.util.NavigationUtil;
 import code.name.monkey.retromusic.util.PreferenceUtil;
 import code.name.monkey.retromusic.util.RetroColorUtil;
 import code.name.monkey.retromusic.util.ViewUtil;
@@ -116,17 +107,6 @@ public class FoldersFragment extends AbsMainActivityFragment implements
     @BindView(R.id.recycler_view)
     FastScrollRecyclerView recyclerView;
 
-    @BindView(R.id.action_folders)
-    TextView actionFolders;
-
-    @BindView(R.id.menu_container)
-    View menuContainer;
-
-    @BindDrawable(R.drawable.ic_menu_white_24dp)
-    Drawable menu;
-
-    @BindDrawable(R.drawable.ic_close_white_24dp)
-    Drawable close;
 
     private Comparator<File> fileComparator = (lhs, rhs) -> {
         if (lhs.isDirectory() && !rhs.isDirectory()) {
@@ -201,25 +181,6 @@ public class FoldersFragment extends AbsMainActivityFragment implements
         }
     }
 
-    @OnClick({R.id.action_library, R.id.action_settings, R.id.action_home})
-    void startUserInfo(View view) {
-        Activity activity = getActivity();
-        if (activity != null) {
-            switch (view.getId()) {
-                case R.id.action_home:
-                    getMainActivity().setCurrentFragment(MainActivity.HOME);
-                    break;
-                case R.id.action_library:
-                    getMainActivity().setCurrentFragment(MainActivity.LIBRARY);
-                    break;
-                case R.id.action_settings:
-                    NavigationUtil.goToSettings(activity);
-                    break;
-
-            }
-        }
-    }
-
     @Nullable
     private BreadCrumbLayout.Crumb getActiveCrumb() {
         return breadCrumbs != null && breadCrumbs.size() > 0 ? breadCrumbs
@@ -229,12 +190,16 @@ public class FoldersFragment extends AbsMainActivityFragment implements
     @Override
     public void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putParcelable(CRUMBS, breadCrumbs.getStateWrapper());
+        if (breadCrumbs != null) {
+            outState.putParcelable(CRUMBS, breadCrumbs.getStateWrapper());
+        }
+
     }
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
+        getMainActivity().setBottomBarVisibility(View.GONE);
         if (savedInstanceState == null) {
             //noinspection ConstantConditions
             setCrumb(new BreadCrumbLayout.Crumb(
@@ -255,7 +220,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-
+        setStatusbarColorAuto(view);
         getMainActivity().getSlidingUpPanelLayout().setShadowHeight(0);
 
         setUpAppbarColor();
@@ -266,12 +231,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements
     }
 
     private void setUpAppbarColor() {
-        int accentColor = ThemeStore.accentColor(getContext());
         title.setTextColor(ThemeStore.textColorPrimary(getContext()));
-        actionFolders.setTextColor(MaterialValueHelper.getPrimaryTextColor(getContext(), ColorUtil.isColorLight(accentColor)));
-        actionFolders.setBackgroundResource(R.drawable.et_bg_circular_top_corners);
-        TintHelper.setTintAuto(actionFolders, ThemeStore.accentColor(getContext()), true);
-
 
         //noinspection ConstantConditions
         int primaryColor = ThemeStore.primaryColor(getContext());
@@ -281,14 +241,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements
         //noinspection ConstantConditions
         getActivity().setTitle(null);
         getMainActivity().setSupportActionBar(toolbar);
-        toolbar.setNavigationOnClickListener(new NavigationIconClickListener(
-                getContext(),
-                container,
-                menuContainer,
-                new AccelerateDecelerateInterpolator(),
-                menu,
-                close
-        ));
+        toolbar.setNavigationOnClickListener(v -> showMainMenu());
         TintHelper.setTintAuto(container, primaryColor, true);
         appbar.setBackgroundColor(primaryColor);
         toolbar.setBackgroundColor(primaryColor);
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.java
index a029828b7..a78dd7f52 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.java
@@ -2,21 +2,25 @@ package code.name.monkey.retromusic.ui.fragments.mainactivity.home;
 
 import android.app.Activity;
 import android.graphics.Bitmap;
-import android.graphics.drawable.Drawable;
+import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.util.DisplayMetrics;
 import android.view.Display;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.animation.AccelerateDecelerateInterpolator;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.appbar.CollapsingToolbarLayout;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Random;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -24,22 +28,18 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import butterknife.BindDrawable;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.Unbinder;
 import code.name.monkey.appthemehelper.ThemeStore;
 import code.name.monkey.appthemehelper.util.ATHUtil;
-import code.name.monkey.appthemehelper.util.ColorUtil;
-import code.name.monkey.appthemehelper.util.MaterialValueHelper;
 import code.name.monkey.appthemehelper.util.TintHelper;
 import code.name.monkey.retromusic.R;
-import code.name.monkey.retromusic.dialogs.HomeOptionDialog;
 import code.name.monkey.retromusic.helper.MusicPlayerRemote;
 import code.name.monkey.retromusic.interfaces.MainActivityFragmentCallbacks;
 import code.name.monkey.retromusic.loaders.SongLoader;
-import code.name.monkey.retromusic.misc.NavigationIconClickListener;
+import code.name.monkey.retromusic.misc.AppBarStateChangeListener;
 import code.name.monkey.retromusic.model.Album;
 import code.name.monkey.retromusic.model.Artist;
 import code.name.monkey.retromusic.model.Genre;
@@ -52,8 +52,6 @@ import code.name.monkey.retromusic.mvp.presenter.HomePresenter;
 import code.name.monkey.retromusic.ui.adapter.album.AlbumFullWithAdapter;
 import code.name.monkey.retromusic.ui.adapter.artist.ArtistAdapter;
 import code.name.monkey.retromusic.ui.fragments.base.AbsMainActivityFragment;
-import code.name.monkey.retromusic.ui.fragments.mainactivity.LibraryFragment;
-import code.name.monkey.retromusic.ui.fragments.mainactivity.folders.FoldersFragment;
 import code.name.monkey.retromusic.util.Compressor;
 import code.name.monkey.retromusic.util.NavigationUtil;
 import code.name.monkey.retromusic.util.PreferenceUtil;
@@ -63,25 +61,29 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 
+import static code.name.monkey.retromusic.Constants.USER_BANNER;
 import static code.name.monkey.retromusic.Constants.USER_PROFILE;
 
 public class BannerHomeFragment extends AbsMainActivityFragment implements MainActivityFragmentCallbacks, HomeContract.HomeView {
 
-    private static final String TAG = "HomeFragment";
+    public static final String TAG = "HomeFragment";
     Unbinder unbinder;
 
-    @BindView(R.id.toolbar)
+    @BindView(R.id.home_toolbar)
     Toolbar toolbar;
 
     @BindView(R.id.app_bar)
     AppBarLayout appbar;
 
-    @BindView(R.id.menu_container)
-    View menuContainer;
+    @BindView(R.id.image)
+    ImageView imageView;
 
     @BindView(R.id.user_image)
     CircularImageView userImage;
 
+    @BindView(R.id.collapsing_toolbar)
+    CollapsingToolbarLayout toolbarLayout;
+
     @BindView(R.id.recycler_view)
     RecyclerView recentArtistRV;
 
@@ -106,31 +108,70 @@ public class BannerHomeFragment extends AbsMainActivityFragment implements MainA
     @BindView(R.id.top_albums_container)
     View topAlbumContainer;
 
-    @BindView(R.id.content_container)
-    View contentContainer;
+    @BindView(R.id.container)
+    View container;
 
     @BindView(R.id.title)
     TextView title;
 
-    @BindView(R.id.action_home)
-    TextView actionHome;
-
-    @BindDrawable(R.drawable.ic_menu_white_24dp)
-    Drawable menu;
-
-    @BindDrawable(R.drawable.ic_close_white_24dp)
-    Drawable close;
 
     private HomePresenter homePresenter;
     private CompositeDisposable disposable;
 
-    public static BannerHomeFragment newInstance() {
+    public static HomeFragment newInstance() {
         Bundle args = new Bundle();
-        BannerHomeFragment fragment = new BannerHomeFragment();
+        HomeFragment fragment = new HomeFragment();
         fragment.setArguments(args);
         return fragment;
     }
 
+    private void getTimeOfTheDay() {
+        Calendar c = Calendar.getInstance();
+        int timeOfDay = c.get(Calendar.HOUR_OF_DAY);
+
+        String[] images = new String[]{};
+        if (timeOfDay >= 0 && timeOfDay < 6) {
+            images = getResources().getStringArray(R.array.night);
+        } else if (timeOfDay >= 6 && timeOfDay < 12) {
+            images = getResources().getStringArray(R.array.morning);
+        } else if (timeOfDay >= 12 && timeOfDay < 16) {
+            images = getResources().getStringArray(R.array.after_noon);
+        } else if (timeOfDay >= 16 && timeOfDay < 20) {
+            images = getResources().getStringArray(R.array.evening);
+        } else if (timeOfDay >= 20 && timeOfDay < 24) {
+            images = getResources().getStringArray(R.array.night);
+        }
+        String day = images[new Random().nextInt(images.length)];
+        loadTimeImage(day);
+    }
+
+    private void loadTimeImage(String day) {
+        //noinspection ConstantConditions
+        if (PreferenceUtil.getInstance(getActivity()).getBannerImage().isEmpty()) {
+            if (imageView != null) {
+                Glide.with(getActivity()).load(day)
+                        .asBitmap()
+                        .placeholder(R.drawable.material_design_default)
+                        .diskCacheStrategy(DiskCacheStrategy.SOURCE)
+                        .into(imageView);
+            }
+        } else {
+            loadBannerFromStorage();
+        }
+    }
+
+    private void loadBannerFromStorage() {
+        //noinspection ConstantConditions
+        disposable.add(new Compressor(getContext())
+                .setQuality(100)
+                .setCompressFormat(Bitmap.CompressFormat.WEBP)
+                .compressToBitmapAsFlowable(
+                        new File(PreferenceUtil.getInstance(getContext()).getBannerImage(), USER_BANNER))
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(imageView::setImageBitmap));
+    }
+
     private void loadImageFromStorage(ImageView imageView) {
         //noinspection ConstantConditions
         disposable.add(new Compressor(getContext())
@@ -140,7 +181,7 @@ public class BannerHomeFragment extends AbsMainActivityFragment implements MainA
                 .setCompressFormat(Bitmap.CompressFormat.WEBP)
                 .compressToBitmapAsFlowable(
                         new File(PreferenceUtil.getInstance(getContext()).getProfileImage(), USER_PROFILE))
-                .subscribeOn(Schedulers.computation())
+                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(imageView::setImageBitmap,
                         throwable -> imageView.setImageDrawable(ContextCompat
@@ -159,7 +200,7 @@ public class BannerHomeFragment extends AbsMainActivityFragment implements MainA
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
                              @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_banner_home, container, false);
+        View view = inflater.inflate(R.layout.fragment_home, container, false);
         unbinder = ButterKnife.bind(this, view);
         return view;
     }
@@ -167,38 +208,47 @@ public class BannerHomeFragment extends AbsMainActivityFragment implements MainA
     @Override
     public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        //setStatusbarColorAuto(view);
+        getMainActivity().getSlidingUpPanelLayout().setShadowHeight(8);
         setupToolbar();
         loadImageFromStorage(userImage);
-
         homePresenter.subscribe();
+        getTimeOfTheDay();
     }
 
     @SuppressWarnings("ConstantConditions")
     private void setupToolbar() {
-        //noinspection ConstantConditions
-        int primaryColor = ThemeStore.primaryColor(getContext());
-        TintHelper.setTintAuto(contentContainer, primaryColor, true);
+        appbar.addOnOffsetChangedListener(new AppBarStateChangeListener() {
+            @Override
+            public void onStateChanged(AppBarLayout appBarLayout, AppBarStateChangeListener.State state) {
+                int color;
+                switch (state) {
+                    case COLLAPSED:
+                        getMainActivity().setLightStatusbar(!ATHUtil.isWindowBackgroundDark(getContext()));
+                        color = ThemeStore.textColorPrimary(getContext());
+                        break;
+                    default:
+                    case EXPANDED:
+                    case IDLE:
+                        getMainActivity().setLightStatusbar(false);
+                        color = ContextCompat.getColor(getContext(), R.color.md_white_1000);
+                        break;
+                }
+                title.setTextColor(color);
+                toolbar.getNavigationIcon().setColorFilter(color, PorterDuff.Mode.SRC_IN);
+            }
+        });
 
-        toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp);
-        toolbar.setBackgroundColor(primaryColor);
-        appbar.setBackgroundColor(primaryColor);
-        appbar.addOnOffsetChangedListener((appBarLayout, verticalOffset) ->
-                getMainActivity().setLightStatusbar(!ATHUtil.isWindowBackgroundDark(getContext())));
+        int primaryColor = ThemeStore.primaryColor(getContext());
+
+        TintHelper.setTintAuto(container, primaryColor, true);
+        toolbarLayout.setStatusBarScrimColor(primaryColor);
+        toolbarLayout.setContentScrimColor(primaryColor);
 
         getActivity().setTitle(null);
         getMainActivity().setSupportActionBar(toolbar);
-        toolbar.setNavigationOnClickListener(new NavigationIconClickListener(
-                getContext(),
-                contentContainer,
-                menuContainer,
-                new AccelerateDecelerateInterpolator(),
-                menu,
-                close
-        ));
-        title.setTextColor(ThemeStore.textColorPrimary(getContext()));
-        actionHome.setTextColor(MaterialValueHelper.getPrimaryTextColor(getContext(), ColorUtil.isColorLight(ThemeStore.accentColor(getContext()))));
-        actionHome.setBackgroundResource(R.drawable.et_bg_circular_top_corners);
-        TintHelper.setTintAuto(actionHome, ThemeStore.accentColor(getContext()), true);
+        toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp);
+        toolbar.setNavigationOnClickListener(v -> showMainMenu());
     }
 
     @Override
@@ -234,13 +284,6 @@ public class BannerHomeFragment extends AbsMainActivityFragment implements MainA
         //homeAdapter.swapDataSet(homes);
     }
 
-    @Override
-    public void onMediaStoreChanged() {
-        super.onMediaStoreChanged();
-        homePresenter.subscribe();
-    }
-
-
     @Override
     public void recentArtist(ArrayList<Artist> artists) {
         recentArtistContainer.setVisibility(View.VISIBLE);
@@ -300,14 +343,13 @@ public class BannerHomeFragment extends AbsMainActivityFragment implements MainA
 
 
     @OnClick({R.id.last_added, R.id.top_played, R.id.action_shuffle, R.id.history,
-            R.id.user_image, R.id.search, R.id.action_library, R.id.action_folders, R.id.action_settings})
+            R.id.user_image, R.id.search})
     void startUserInfo(View view) {
         Activity activity = getActivity();
         if (activity != null) {
             switch (view.getId()) {
                 case R.id.action_shuffle:
-                    MusicPlayerRemote
-                            .openAndShuffleQueue(SongLoader.getAllSongs(activity).blockingFirst(), true);
+                    MusicPlayerRemote.openAndShuffleQueue(SongLoader.getAllSongs(activity).blockingFirst(), true);
                     break;
                 case R.id.last_added:
                     NavigationUtil.goToPlaylistNew(activity, new LastAddedPlaylist(activity));
@@ -319,16 +361,7 @@ public class BannerHomeFragment extends AbsMainActivityFragment implements MainA
                     NavigationUtil.goToPlaylistNew(activity, new HistoryPlaylist(activity));
                     break;
                 case R.id.user_image:
-                    new HomeOptionDialog().show(getFragmentManager(), TAG);
-                    break;
-                case R.id.action_folders:
-                    getMainActivity().setCurrentFragment(FoldersFragment.newInstance(getContext()), false, TAG);
-                    break;
-                case R.id.action_library:
-                    getMainActivity().setCurrentFragment(LibraryFragment.newInstance(), false, TAG);
-                    break;
-                case R.id.action_settings:
-                    NavigationUtil.goToSettings(activity);
+                    NavigationUtil.goToUserInfo(getActivity());
                     break;
                 case R.id.search:
                     NavigationUtil.goToSearch(activity);
@@ -337,10 +370,5 @@ public class BannerHomeFragment extends AbsMainActivityFragment implements MainA
         }
     }
 
-    @Override
-    public void onPlayingMetaChanged() {
-        super.onPlayingMetaChanged();
-        homePresenter.loadRecentArtists();
-        homePresenter.loadRecentAlbums();
-    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/HomeFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/HomeFragment.java
index 1974e7763..351b9d983 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/HomeFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/HomeFragment.java
@@ -1,36 +1,31 @@
 package code.name.monkey.retromusic.ui.fragments.mainactivity.home;
 
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
 import android.app.Activity;
 import android.graphics.Bitmap;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.util.DisplayMetrics;
 import android.view.Display;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.animation.AccelerateDecelerateInterpolator;
+import android.view.animation.AccelerateInterpolator;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.google.android.material.appbar.AppBarLayout;
-import com.google.android.material.appbar.CollapsingToolbarLayout;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Random;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
+import androidx.core.widget.NestedScrollView;
 import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import butterknife.BindDrawable;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -39,12 +34,9 @@ import code.name.monkey.appthemehelper.ThemeStore;
 import code.name.monkey.appthemehelper.util.ATHUtil;
 import code.name.monkey.appthemehelper.util.TintHelper;
 import code.name.monkey.retromusic.R;
-import code.name.monkey.retromusic.dialogs.HomeOptionDialog;
 import code.name.monkey.retromusic.helper.MusicPlayerRemote;
 import code.name.monkey.retromusic.interfaces.MainActivityFragmentCallbacks;
 import code.name.monkey.retromusic.loaders.SongLoader;
-import code.name.monkey.retromusic.misc.AppBarStateChangeListener;
-import code.name.monkey.retromusic.misc.NavigationIconClickListener;
 import code.name.monkey.retromusic.model.Album;
 import code.name.monkey.retromusic.model.Artist;
 import code.name.monkey.retromusic.model.Genre;
@@ -54,7 +46,6 @@ import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist;
 import code.name.monkey.retromusic.model.smartplaylist.MyTopTracksPlaylist;
 import code.name.monkey.retromusic.mvp.contract.HomeContract;
 import code.name.monkey.retromusic.mvp.presenter.HomePresenter;
-import code.name.monkey.retromusic.ui.adapter.GenreAdapter;
 import code.name.monkey.retromusic.ui.adapter.album.AlbumFullWithAdapter;
 import code.name.monkey.retromusic.ui.adapter.artist.ArtistAdapter;
 import code.name.monkey.retromusic.ui.fragments.base.AbsMainActivityFragment;
@@ -67,36 +58,22 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 
-import static code.name.monkey.retromusic.Constants.USER_BANNER;
 import static code.name.monkey.retromusic.Constants.USER_PROFILE;
 
-public class HomeFragment extends AbsMainActivityFragment implements MainActivityFragmentCallbacks,
-        HomeContract.HomeView {
-
+public class HomeFragment extends AbsMainActivityFragment implements MainActivityFragmentCallbacks, HomeContract.HomeView {
     public static final String TAG = "HomeFragment";
+    private final AnimatorSet animatorSet = new AnimatorSet();
+
     Unbinder unbinder;
-
-    @BindView(R.id.home_toolbar)
+    @BindView(R.id.toolbar)
     Toolbar toolbar;
 
-    @BindView(R.id.menu_container)
-    View menuContainer;
-
-    @BindView(R.id.coordinator_layout)
-    View coordinatorLayout;
-
     @BindView(R.id.app_bar)
     AppBarLayout appbar;
 
-    @BindView(R.id.image)
-    ImageView imageView;
-
     @BindView(R.id.user_image)
     CircularImageView userImage;
 
-    @BindView(R.id.collapsing_toolbar)
-    CollapsingToolbarLayout toolbarLayout;
-
     @BindView(R.id.recycler_view)
     RecyclerView recentArtistRV;
 
@@ -122,77 +99,21 @@ public class HomeFragment extends AbsMainActivityFragment implements MainActivit
     View topAlbumContainer;
 
     @BindView(R.id.content_container)
-    View contentContainer;
-
-    @BindView(R.id.container)
-    View container;
+    NestedScrollView contentContainer;
 
     @BindView(R.id.title)
     TextView title;
 
-    @BindDrawable(R.drawable.ic_menu_white_24dp)
-    Drawable menu;
-
-    @BindDrawable(R.drawable.ic_close_white_24dp)
-    Drawable close;
-
     private HomePresenter homePresenter;
     private CompositeDisposable disposable;
 
-    public static HomeFragment newInstance() {
+    public static BannerHomeFragment newInstance() {
         Bundle args = new Bundle();
-        HomeFragment fragment = new HomeFragment();
+        BannerHomeFragment fragment = new BannerHomeFragment();
         fragment.setArguments(args);
         return fragment;
     }
 
-    private void getTimeOfTheDay() {
-        Calendar c = Calendar.getInstance();
-        int timeOfDay = c.get(Calendar.HOUR_OF_DAY);
-
-        String[] images = new String[]{};
-        if (timeOfDay >= 0 && timeOfDay < 6) {
-            images = getResources().getStringArray(R.array.night);
-        } else if (timeOfDay >= 6 && timeOfDay < 12) {
-            images = getResources().getStringArray(R.array.morning);
-        } else if (timeOfDay >= 12 && timeOfDay < 16) {
-            images = getResources().getStringArray(R.array.after_noon);
-        } else if (timeOfDay >= 16 && timeOfDay < 20) {
-            images = getResources().getStringArray(R.array.evening);
-        } else if (timeOfDay >= 20 && timeOfDay < 24) {
-            images = getResources().getStringArray(R.array.night);
-        }
-        String day = images[new Random().nextInt(images.length)];
-        loadTimeImage(day);
-    }
-
-    private void loadTimeImage(String day) {
-        //noinspection ConstantConditions
-        if (PreferenceUtil.getInstance(getActivity()).getBannerImage().isEmpty()) {
-            if (imageView != null) {
-                Glide.with(getActivity()).load(day)
-                        .asBitmap()
-                        .placeholder(R.drawable.material_design_default)
-                        .diskCacheStrategy(DiskCacheStrategy.SOURCE)
-                        .into(imageView);
-            }
-        } else {
-            loadBannerFromStorage();
-        }
-    }
-
-    private void loadBannerFromStorage() {
-        //noinspection ConstantConditions
-        disposable.add(new Compressor(getContext())
-                .setQuality(100)
-                .setCompressFormat(Bitmap.CompressFormat.WEBP)
-                .compressToBitmapAsFlowable(
-                        new File(PreferenceUtil.getInstance(getContext()).getBannerImage(), USER_BANNER))
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(imageView::setImageBitmap));
-    }
-
     private void loadImageFromStorage(ImageView imageView) {
         //noinspection ConstantConditions
         disposable.add(new Compressor(getContext())
@@ -202,7 +123,7 @@ public class HomeFragment extends AbsMainActivityFragment implements MainActivit
                 .setCompressFormat(Bitmap.CompressFormat.WEBP)
                 .compressToBitmapAsFlowable(
                         new File(PreferenceUtil.getInstance(getContext()).getProfileImage(), USER_PROFILE))
-                .subscribeOn(Schedulers.io())
+                .subscribeOn(Schedulers.computation())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(imageView::setImageBitmap,
                         throwable -> imageView.setImageDrawable(ContextCompat
@@ -221,7 +142,7 @@ public class HomeFragment extends AbsMainActivityFragment implements MainActivit
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
                              @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_home, container, false);
+        View view = inflater.inflate(R.layout.fragment_banner_home, container, false);
         unbinder = ButterKnife.bind(this, view);
         return view;
     }
@@ -229,61 +150,44 @@ public class HomeFragment extends AbsMainActivityFragment implements MainActivit
     @Override
     public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-
-        getMainActivity().getSlidingUpPanelLayout().setShadowHeight(8);
-
+        setStatusbarColorAuto(view);
         setupToolbar();
         loadImageFromStorage(userImage);
-
         homePresenter.subscribe();
-        getTimeOfTheDay();
     }
 
     @SuppressWarnings("ConstantConditions")
     private void setupToolbar() {
-        /*if (!PreferenceUtil.getInstance(getContext()).getFullScreenMode()) {
-            ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) toolbar.getLayoutParams();
-            params.topMargin = RetroUtil.getStatusBarHeight(getContext());
-            toolbar.setLayoutParams(params);
-        }*/
-
-        appbar.addOnOffsetChangedListener(new AppBarStateChangeListener() {
-            @Override
-            public void onStateChanged(AppBarLayout appBarLayout, State state) {
-                int color;
-                switch (state) {
-                    case COLLAPSED:
-                        getMainActivity().setLightStatusbar(!ATHUtil.isWindowBackgroundDark(getContext()));
-                        color = ThemeStore.textColorPrimary(getContext());
-                        break;
-                    default:
-                    case EXPANDED:
-                    case IDLE:
-                        getMainActivity().setLightStatusbar(false);
-                        color = ContextCompat.getColor(getContext(), R.color.md_white_1000);
-                        break;
-                }
-                title.setTextColor(color);
-            }
-        });
-
+        //noinspection ConstantConditions
         int primaryColor = ThemeStore.primaryColor(getContext());
+        TintHelper.setTintAuto(contentContainer, primaryColor, true);
 
-        TintHelper.setTintAuto(container, primaryColor, true);
-        toolbarLayout.setStatusBarScrimColor(primaryColor);
-        toolbarLayout.setContentScrimColor(primaryColor);
+        toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp);
+        toolbar.setBackgroundColor(primaryColor);
+        appbar.setBackgroundColor(primaryColor);
+        appbar.addOnOffsetChangedListener((appBarLayout, verticalOffset) ->
+                getMainActivity().setLightStatusbar(!ATHUtil.isWindowBackgroundDark(getContext())));
 
         getActivity().setTitle(null);
         getMainActivity().setSupportActionBar(toolbar);
-        toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp);
-        toolbar.setNavigationOnClickListener(new NavigationIconClickListener(
-                getContext(),
-                contentContainer,
-                menuContainer,
-                new AccelerateDecelerateInterpolator(),
-                menu,
-                close
-        ));
+        toolbar.setNavigationOnClickListener(v -> showMainMenu());
+        title.setTextColor(ThemeStore.textColorPrimary(getContext()));
+    }
+
+    private void toggleMenu(boolean backdropShown) {
+        // Cancel the existing animations
+        animatorSet.removeAllListeners();
+        animatorSet.end();
+        animatorSet.cancel();
+
+
+        final int translateY = 300;
+
+        ObjectAnimator animator = ObjectAnimator.ofFloat(contentContainer, "translationY", backdropShown ? translateY : 0);
+        animator.setDuration(500);
+        animator.setInterpolator(new AccelerateInterpolator());
+        animatorSet.play(animator);
+        animator.start();
     }
 
     @Override
@@ -319,27 +223,18 @@ public class HomeFragment extends AbsMainActivityFragment implements MainActivit
         //homeAdapter.swapDataSet(homes);
     }
 
-    @Override
-    public void onMediaStoreChanged() {
-        super.onMediaStoreChanged();
-        homePresenter.subscribe();
-    }
-
     @Override
     public void recentArtist(ArrayList<Artist> artists) {
         recentArtistContainer.setVisibility(View.VISIBLE);
-        recentArtistRV.setLayoutManager(new GridLayoutManager(getMainActivity(),
-                1, GridLayoutManager.HORIZONTAL, false));
-        ArtistAdapter artistAdapter = new ArtistAdapter(getMainActivity(), artists,
-                R.layout.item_artist, false, null);
+        recentArtistRV.setLayoutManager(new GridLayoutManager(getMainActivity(), 1, GridLayoutManager.HORIZONTAL, false));
+        ArtistAdapter artistAdapter = new ArtistAdapter(getMainActivity(), artists, R.layout.item_artist, false, null);
         recentArtistRV.setAdapter(artistAdapter);
     }
 
     @Override
     public void recentAlbum(ArrayList<Album> albums) {
         recentAlbumsContainer.setVisibility(View.VISIBLE);
-        AlbumFullWithAdapter artistAdapter = new AlbumFullWithAdapter(getMainActivity(),
-                getDisplayMetrics());
+        AlbumFullWithAdapter artistAdapter = new AlbumFullWithAdapter(getMainActivity(), getDisplayMetrics());
         artistAdapter.swapData(albums);
         recentAlbumRV.setAdapter(artistAdapter);
     }
@@ -347,10 +242,8 @@ public class HomeFragment extends AbsMainActivityFragment implements MainActivit
     @Override
     public void topArtists(ArrayList<Artist> artists) {
         topArtistContainer.setVisibility(View.VISIBLE);
-        topArtistRV.setLayoutManager(new GridLayoutManager(getMainActivity(),
-                1, GridLayoutManager.HORIZONTAL, false));
-        ArtistAdapter artistAdapter = new ArtistAdapter(getMainActivity(), artists,
-                R.layout.item_artist, false, null);
+        topArtistRV.setLayoutManager(new GridLayoutManager(getMainActivity(), 1, GridLayoutManager.HORIZONTAL, false));
+        ArtistAdapter artistAdapter = new ArtistAdapter(getMainActivity(), artists, R.layout.item_artist, false, null);
         topArtistRV.setAdapter(artistAdapter);
 
     }
@@ -358,8 +251,7 @@ public class HomeFragment extends AbsMainActivityFragment implements MainActivit
     @Override
     public void topAlbums(ArrayList<Album> albums) {
         topAlbumContainer.setVisibility(View.VISIBLE);
-        AlbumFullWithAdapter artistAdapter = new AlbumFullWithAdapter(getMainActivity(),
-                getDisplayMetrics());
+        AlbumFullWithAdapter artistAdapter = new AlbumFullWithAdapter(getMainActivity(), getDisplayMetrics());
         artistAdapter.swapData(albums);
         topAlbumRV.setAdapter(artistAdapter);
     }
@@ -383,363 +275,7 @@ public class HomeFragment extends AbsMainActivityFragment implements MainActivit
     }
 
 
-    @OnClick({R.id.last_added, R.id.top_played, R.id.action_shuffle, R.id.history,
-            R.id.user_image})
-    void startUserInfo(View view) {
-        Activity activity = getActivity();
-        if (activity != null) {
-            switch (view.getId()) {
-                case R.id.action_shuffle:
-                    MusicPlayerRemote.openAndShuffleQueue(SongLoader.getAllSongs(activity).blockingFirst(), true);
-                    break;
-                case R.id.last_added:
-                    NavigationUtil.goToPlaylistNew(activity, new LastAddedPlaylist(activity));
-                    break;
-                case R.id.top_played:
-                    NavigationUtil.goToPlaylistNew(activity, new MyTopTracksPlaylist(activity));
-                    break;
-                case R.id.history:
-                    NavigationUtil.goToPlaylistNew(activity, new HistoryPlaylist(activity));
-                    break;
-
-                case R.id.user_image:
-                    new HomeOptionDialog().show(getFragmentManager(), TAG);
-                    break;
-            }
-        }
-    }
-
-    @Override
-    public void onPlayingMetaChanged() {
-        super.onPlayingMetaChanged();
-        homePresenter.loadRecentArtists();
-        homePresenter.loadRecentAlbums();
-    }
-}
-/*
-import android.app.Activity;
-import android.graphics.Bitmap;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CollapsingToolbarLayout;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
-import android.util.DisplayMetrics;
-import android.view.Display;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-import java.util.Random;
-
-import butterknife.BindView;
-import butterknife.BindViews;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-import butterknife.Unbinder;
-import code.name.monkey.appthemehelper.ThemeStore;
-import code.name.monkey.appthemehelper.util.ATHUtil;
-import code.name.monkey.appthemehelper.util.TintHelper;
-import code.name.monkey.retromusic.R;
-import code.name.monkey.retromusic.dialogs.HomeOptionDialog;
-import code.name.monkey.retromusic.helper.MusicPlayerRemote;
-import code.name.monkey.retromusic.interfaces.MainActivityFragmentCallbacks;
-import code.name.monkey.retromusic.loaders.SongLoader;
-import code.name.monkey.retromusic.misc.AppBarStateChangeListener;
-import code.name.monkey.retromusic.model.Album;
-import code.name.monkey.retromusic.model.Artist;
-import code.name.monkey.retromusic.model.Genre;
-import code.name.monkey.retromusic.model.Home;
-import code.name.monkey.retromusic.model.Song;
-import code.name.monkey.retromusic.model.smartplaylist.HistoryPlaylist;
-import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist;
-import code.name.monkey.retromusic.model.smartplaylist.MyTopTracksPlaylist;
-import code.name.monkey.retromusic.mvp.contract.HomeContract;
-import code.name.monkey.retromusic.mvp.presenter.HomePresenter;
-import code.name.monkey.retromusic.ui.adapter.CollageSongAdapter;
-import code.name.monkey.retromusic.ui.adapter.GenreAdapter;
-import code.name.monkey.retromusic.ui.adapter.album.AlbumFullWithAdapter;
-import code.name.monkey.retromusic.ui.adapter.artist.ArtistAdapter;
-import code.name.monkey.retromusic.ui.adapter.home.HomeAdapter;
-import code.name.monkey.retromusic.ui.fragments.base.AbsMainActivityFragment;
-import code.name.monkey.retromusic.util.Compressor;
-import code.name.monkey.retromusic.util.NavigationUtil;
-import code.name.monkey.retromusic.util.PreferenceUtil;
-import code.name.monkey.retromusic.util.RetroUtil;
-import code.name.monkey.retromusic.views.CircularImageView;
-import code.name.monkey.retromusic.views.MetalRecyclerViewPager;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.schedulers.Schedulers;
-
-import static code.name.monkey.retromusic.Constants.USER_BANNER;
-import static code.name.monkey.retromusic.Constants.USER_PROFILE;
-
-public class HomeFragment extends AbsMainActivityFragment implements MainActivityFragmentCallbacks,
-        HomeContract.HomeView {
-
-    public static final String TAG = "HomeFragment";
-    Unbinder unbinder;
-
-    @BindView(R.id.home_toolbar)
-    Toolbar toolbar;
-
-    @BindView(R.id.appbar)
-    AppBarLayout appbar;
-
-    @BindView(R.id.image)
-    ImageView imageView;
-
-    @BindView(R.id.user_image)
-    CircularImageView userImage;
-
-    @BindView(R.id.collapsing_toolbar)
-    CollapsingToolbarLayout toolbarLayout;
-
-    @BindView(R.id.container)
-    View container;
-
-    @BindView(R.id.title)
-    TextView title;
-
-    @BindView(R.id.search)
-    ImageView search;
-
-    @BindViews({R.id.recent_artist_container, R.id.recent_albums_container,
-            R.id.top_artist_container, R.id.top_albums_container,
-            R.id.genre_container})
-    List<View> sectionContainers;
-
-    @BindViews({R.id.recent_artist_recycler_view, R.id.top_artist_recycler_view,
-             R.id.genres_recycler_view})
-    List<RecyclerView> sectionRecyclerViews;
-
-    @BindViews({R.id.recent_albums_recycler_view, R.id.top_album_recycler_view})
-    List<MetalRecyclerViewPager> metalRecyclerViewPagers;
-
-    private HomePresenter homePresenter;
-    private CompositeDisposable disposable;
-
-    public static HomeFragment newInstance() {
-        Bundle args = new Bundle();
-        HomeFragment fragment = new HomeFragment();
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    private void getTimeOfTheDay() {
-        Calendar c = Calendar.getInstance();
-        int timeOfDay = c.get(Calendar.HOUR_OF_DAY);
-
-        String[] images = new String[]{};
-        if (timeOfDay >= 0 && timeOfDay < 6) {
-            images = getResources().getStringArray(R.array.night);
-        } else if (timeOfDay >= 6 && timeOfDay < 12) {
-            images = getResources().getStringArray(R.array.morning);
-        } else if (timeOfDay >= 12 && timeOfDay < 16) {
-            images = getResources().getStringArray(R.array.after_noon);
-        } else if (timeOfDay >= 16 && timeOfDay < 20) {
-            images = getResources().getStringArray(R.array.evening);
-        } else if (timeOfDay >= 20 && timeOfDay < 24) {
-            images = getResources().getStringArray(R.array.night);
-        }
-        String day = images[new Random().nextInt(images.length)];
-        loadTimeImage(day);
-    }
-
-    private void loadTimeImage(String day) {
-        //noinspection ConstantConditions
-        if (PreferenceUtil.getInstance(getActivity()).getBannerImage().isEmpty()) {
-            if (imageView != null) {
-                Glide.with(getActivity()).load(day)
-                        .asBitmap()
-                        .placeholder(R.drawable.material_design_default)
-                        .diskCacheStrategy(DiskCacheStrategy.SOURCE)
-                        .into(imageView);
-            }
-        } else {
-            loadBannerFromStorage();
-        }
-    }
-
-    private void loadBannerFromStorage() {
-        //noinspection ConstantConditions
-        disposable.add(new Compressor(getContext())
-                .setQuality(100)
-                .setCompressFormat(Bitmap.CompressFormat.WEBP)
-                .compressToBitmapAsFlowable(
-                        new File(PreferenceUtil.getInstance(getContext()).getBannerImage(), USER_BANNER))
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(imageView::setImageBitmap));
-    }
-
-    private void loadImageFromStorage(ImageView imageView) {
-        //noinspection ConstantConditions
-        disposable.add(new Compressor(getContext())
-                .setMaxHeight(300)
-                .setMaxWidth(300)
-                .setQuality(75)
-                .setCompressFormat(Bitmap.CompressFormat.WEBP)
-                .compressToBitmapAsFlowable(
-                        new File(PreferenceUtil.getInstance(getContext()).getProfileImage(), USER_PROFILE))
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(imageView::setImageBitmap,
-                        throwable -> imageView.setImageDrawable(ContextCompat
-                                .getDrawable(getContext(), R.drawable.ic_person_flat))));
-    }
-
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        disposable = new CompositeDisposable();
-        homePresenter = new HomePresenter(this);
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_home, container, false);
-        unbinder = ButterKnife.bind(this, view);
-        setRetainInstance(true);
-        return view;
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        getMainActivity().getSlidingUpPanelLayout().setShadowHeight(8);
-        getMainActivity().setBottomBarVisibility(View.VISIBLE);
-
-        setupToolbar();
-        loadImageFromStorage(userImage);
-
-        homePresenter.subscribe();
-        checkPadding();
-        getTimeOfTheDay();
-    }
-
-    @SuppressWarnings("ConstantConditions")
-    private void setupToolbar() {
-        if (!PreferenceUtil.getInstance(getContext()).getFullScreenMode()) {
-            ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) toolbar
-                    .getLayoutParams();
-            params.topMargin = RetroUtil.getStatusBarHeight(getContext());
-            toolbar.setLayoutParams(params);
-        }
-
-        appbar.addOnOffsetChangedListener(new AppBarStateChangeListener() {
-            @Override
-            public void onStateChanged(AppBarLayout appBarLayout, State state) {
-                int color;
-                switch (state) {
-                    case COLLAPSED:
-                        getMainActivity().setLightStatusbar(!ATHUtil.isWindowBackgroundDark(getContext()));
-                        color = ThemeStore.textColorPrimary(getContext());
-                        break;
-                    default:
-                    case EXPANDED:
-                    case IDLE:
-                        getMainActivity().setLightStatusbar(false);
-                        color = Color.WHITE;
-                        break;
-                }
-                TintHelper.setTintAuto(search, color, false);
-                title.setTextColor(color);
-            }
-        });
-
-        int primaryColor = ThemeStore.primaryColor(getContext());
-
-        TintHelper.setTintAuto(container, primaryColor, true);
-        toolbarLayout.setStatusBarScrimColor(primaryColor);
-        toolbarLayout.setContentScrimColor(primaryColor);
-
-        toolbar.setTitle(R.string.home);
-        getMainActivity().setSupportActionBar(toolbar);
-
-    }
-
-    @Override
-    public boolean handleBackPress() {
-        return false;
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-        disposable.clear();
-        homePresenter.unsubscribe();
-    }
-
-    @Override
-    public void loading() {
-
-    }
-
-    @Override
-    public void showEmptyView() {
-
-    }
-
-    @Override
-    public void completed() {
-
-    }
-
-    @Override
-    public void showData(ArrayList<Home> homes) {
-        HomeAdapter homeAdapter = new HomeAdapter(getMainActivity());
-        homeAdapter.swapData(homes);
-    }
-
-    @Override
-    public void onServiceConnected() {
-        super.onServiceConnected();
-        checkPadding();
-    }
-
-    @Override
-    public void onQueueChanged() {
-        super.onQueueChanged();
-        checkPadding();
-    }
-
-    private void checkPadding() {
-        int height = getResources().getDimensionPixelSize(R.dimen.mini_player_height);
-        container.setPadding(0, 0, 0, MusicPlayerRemote.getPlayingQueue().isEmpty() ? height * 2 : 0);
-    }
-
-    private DisplayMetrics getDisplayMetrics() {
-        Display display = getMainActivity().getWindowManager().getDefaultDisplay();
-        DisplayMetrics metrics = new DisplayMetrics();
-        display.getMetrics(metrics);
-        return metrics;
-    }
-
-    @OnClick({R.id.last_added, R.id.top_played, R.id.action_shuffle,
-            R.id.history, R.id.user_image, R.id.search})
+    @OnClick({R.id.last_added, R.id.top_played, R.id.action_shuffle, R.id.history, R.id.user_image, R.id.search})
     void startUserInfo(View view) {
         Activity activity = getActivity();
         if (activity != null) {
@@ -757,71 +293,14 @@ public class HomeFragment extends AbsMainActivityFragment implements MainActivit
                 case R.id.history:
                     NavigationUtil.goToPlaylistNew(activity, new HistoryPlaylist(activity));
                     break;
+                case R.id.user_image:
+                    NavigationUtil.goToUserInfo(getActivity());
+                    break;
                 case R.id.search:
                     NavigationUtil.goToSearch(activity);
                     break;
-                case R.id.user_image:
-                    //noinspection ConstantConditions
-                    new HomeOptionDialog().show(getFragmentManager(), TAG);
-                    break;
             }
         }
     }
 
-    @Override
-    public void showRecentAlbums(ArrayList<Album> albums) {
-        sectionContainers.get(1).setVisibility(View.VISIBLE);
-        AlbumFullWithAdapter albumFullWithAdapter = new AlbumFullWithAdapter(getMainActivity(),
-                getDisplayMetrics());
-        albumFullWithAdapter.swapData(albums);
-
-        MetalRecyclerViewPager recyclerView = metalRecyclerViewPagers.get(0);
-        recyclerView.setAdapter(albumFullWithAdapter);
-    }
-
-    @Override
-    public void showTopAlbums(ArrayList<Album> albums) {
-        sectionContainers.get(3).setVisibility(View.VISIBLE);
-        AlbumFullWithAdapter albumFullWithAdapter = new AlbumFullWithAdapter(getMainActivity(),
-                getDisplayMetrics());
-        albumFullWithAdapter.swapData(albums);
-
-        MetalRecyclerViewPager recyclerView = metalRecyclerViewPagers.get(1);
-        recyclerView.setAdapter(albumFullWithAdapter);
-    }
-
-    @Override
-    public void showRecentArtist(ArrayList<Artist> artists) {
-        sectionContainers.get(0).setVisibility(View.VISIBLE);
-        GridLayoutManager layoutManager = new GridLayoutManager(getContext(), 1,
-                GridLayoutManager.HORIZONTAL, false);
-        ArtistAdapter artistAdapter = new ArtistAdapter(getMainActivity(), artists, R.layout.item_artist);
-
-        RecyclerView recyclerView = sectionRecyclerViews.get(0);
-        recyclerView.setLayoutManager(layoutManager);
-        recyclerView.setItemAnimator(new DefaultItemAnimator());
-        recyclerView.setAdapter(artistAdapter);
-    }
-
-    @Override
-    public void showTopArtist(ArrayList<Artist> artists) {
-        sectionContainers.get(2).setVisibility(View.VISIBLE);
-        GridLayoutManager layoutManager = new GridLayoutManager(getContext(), 1,
-                GridLayoutManager.HORIZONTAL, false);
-        ArtistAdapter artistAdapter = new ArtistAdapter(getMainActivity(), artists, R.layout.item_artist);
-
-        RecyclerView recyclerView = sectionRecyclerViews.get(1);
-        recyclerView.setLayoutManager(layoutManager);
-        recyclerView.setItemAnimator(new DefaultItemAnimator());
-        recyclerView.setAdapter(artistAdapter);
-    }
-
-    @Override
-    public void showGenres(ArrayList<Genre> genres) {
-        sectionContainers.get(4).setVisibility(View.VISIBLE);
-        RecyclerView recyclerView = sectionRecyclerViews.get(2);
-        recyclerView.setLayoutManager(new LinearLayoutManager(recyclerView.getContext()));
-        recyclerView.setItemAnimator(new DefaultItemAnimator());
-        recyclerView.setAdapter(new GenreAdapter(getMainActivity(), genres, R.layout.item_list));
-    }
-}*/
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/color/ColorFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/color/ColorFragment.java
index a2b0d7d79..7ba69f05e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/color/ColorFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/color/ColorFragment.java
@@ -9,11 +9,6 @@ import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.palette.graphics.Palette;
-import androidx.appcompat.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -24,6 +19,11 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.animation.GlideAnimation;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
+import androidx.palette.graphics.Palette;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialControlsFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialControlsFragment.java
index 5089c6083..899d50c55 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialControlsFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialControlsFragment.java
@@ -3,10 +3,6 @@ package code.name.monkey.retromusic.ui.fragments.player.material;
 import android.animation.ObjectAnimator;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.AppCompatSeekBar;
-import androidx.appcompat.widget.AppCompatTextView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,6 +11,10 @@ import android.widget.ImageButton;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatSeekBar;
+import androidx.appcompat.widget.AppCompatTextView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
@@ -39,26 +39,37 @@ public class MaterialControlsFragment extends AbsPlayerControlsFragment {
 
     @BindView(R.id.player_play_pause_button)
     ImageButton playPauseFab;
+
     @BindView(R.id.player_prev_button)
     ImageButton prevButton;
+
     @BindView(R.id.player_next_button)
     ImageButton nextButton;
+
     @BindView(R.id.player_repeat_button)
     ImageButton repeatButton;
+
     @BindView(R.id.player_shuffle_button)
     ImageButton shuffleButton;
+
     @BindView(R.id.player_progress_slider)
     AppCompatSeekBar progressSlider;
+
     @BindView(R.id.player_song_total_time)
     TextView songTotalTime;
+
     @BindView(R.id.player_song_current_progress)
     TextView songCurrentProgress;
+
     @BindView(R.id.title)
     AppCompatTextView title;
+
     @BindView(R.id.text)
     TextView text;
+
     @BindView(R.id.volume_fragment_container)
     View mVolumeContainer;
+
     private Unbinder unbinder;
     private int lastPlaybackControlsColor;
     private int lastDisabledPlaybackControlsColor;
@@ -160,6 +171,7 @@ public class MaterialControlsFragment extends AbsPlayerControlsFragment {
 
         if (PreferenceUtil.getInstance(getContext()).getAdaptiveColor()) {
             lastPlaybackControlsColor = dark;
+            text.setTextColor(dark);
         }
 
         updatePlayPauseColor();
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java
index 22e0e4ea1..6ea390597 100755
--- a/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java
@@ -4,14 +4,15 @@ import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.media.audiofx.AudioEffect;
+import android.widget.Toast;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.app.ActivityCompat;
 import androidx.core.app.ActivityOptionsCompat;
 import androidx.core.util.Pair;
-import android.widget.Toast;
-
 import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.cast.ExpandedCastControlsActivity;
 import code.name.monkey.retromusic.helper.MusicPlayerRemote;
 import code.name.monkey.retromusic.model.Genre;
 import code.name.monkey.retromusic.model.Playlist;
@@ -134,4 +135,8 @@ public class NavigationUtil {
     public static void goToPlayStore(Activity activity) {
         openUrl(activity, RATE_ON_GOOGLE_PLAY);
     }
+
+    public static void gotoExpandedController(Activity activity) {
+        ActivityCompat.startActivity(activity, new Intent(activity, ExpandedCastControlsActivity.class), null);
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java
index 34900cbe4..6afcbbcaa 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java
@@ -276,7 +276,7 @@ public final class PreferenceUtil {
 
 
     public final int getLastPage() {
-        return mPreferences.getInt(LAST_PAGE, 0);
+        return mPreferences.getInt(LAST_PAGE, R.id.action_home);
     }
 
     public void setLastPage(final int value) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/ContributorsView.java b/app/src/main/java/code/name/monkey/retromusic/views/ContributorsView.java
new file mode 100644
index 000000000..5c97c73bf
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/views/ContributorsView.java
@@ -0,0 +1,61 @@
+package code.name.monkey.retromusic.views;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import code.name.monkey.retromusic.R;
+
+import static code.name.monkey.retromusic.util.RetroUtil.openUrl;
+
+public class ContributorsView extends FrameLayout {
+    public ContributorsView(@NonNull Context context) {
+        super(context);
+        init(context, null);
+    }
+
+    public ContributorsView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public ContributorsView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs);
+    }
+
+    private void init(Context context, AttributeSet attributeSet) {
+        final TypedArray attributes = context.obtainStyledAttributes(attributeSet, R.styleable.ContributorsView, 0, 0);
+        if (attributes != null) {
+            final View layout = LayoutInflater.from(context).inflate(R.layout.item_contributor, this);
+
+            NetworkImageView networkImageView = layout.findViewById(R.id.image);
+            String url = attributes.getString(R.styleable.ContributorsView_profile_url);
+            networkImageView.setImageUrl(url);
+
+            String name = attributes.getString(R.styleable.ContributorsView_profile_name);
+            TextView title = layout.findViewById(R.id.title);
+            title.setText(name);
+
+            String summary = attributes.getString(R.styleable.ContributorsView_profile_summary);
+            TextView text = layout.findViewById(R.id.text);
+            text.setText(summary);
+
+            String link = attributes.getString(R.styleable.ContributorsView_profile_link);
+            layout.setOnClickListener(v -> {
+                if (link == null) {
+                    return;
+                }
+                openUrl((Activity) getContext(), link);
+            });
+            attributes.recycle();
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/NetworkImageView.java b/app/src/main/java/code/name/monkey/retromusic/views/NetworkImageView.java
index 07a369a01..5a38b8d46 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/NetworkImageView.java
+++ b/app/src/main/java/code/name/monkey/retromusic/views/NetworkImageView.java
@@ -28,14 +28,21 @@ public class NetworkImageView extends CircularImageView {
         init(context, attrs);
     }
 
-    private void init(Context context, AttributeSet attributeSet) {
-        TypedArray attributes = context
-                .obtainStyledAttributes(attributeSet, R.styleable.NetworkImageView, 0, 0);
-        String url = attributes.getString(R.styleable.NetworkImageView_url_link);
-        Glide.with(context).load(url).asBitmap()
+    public void setImageUrl(String imageUrl) {
+        setImageUrl(getContext(), imageUrl);
+    }
+
+    public void setImageUrl(Context context, String imageUrl) {
+        Glide.with(context).load(imageUrl).asBitmap()
                 .error(R.drawable.ic_person_flat)
                 .placeholder(R.drawable.ic_person_flat)
                 .into(this);
+    }
+
+    private void init(Context context, AttributeSet attributeSet) {
+        TypedArray attributes = context.obtainStyledAttributes(attributeSet, R.styleable.NetworkImageView, 0, 0);
+        String url = attributes.getString(R.styleable.NetworkImageView_url_link);
+        setImageUrl(context, url);
         attributes.recycle();
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/RoundedBottomSheetDialogFragment.java b/app/src/main/java/code/name/monkey/retromusic/views/RoundedBottomSheetDialogFragment.java
index ca7df1d0d..aa5ccf3e4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/RoundedBottomSheetDialogFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/views/RoundedBottomSheetDialogFragment.java
@@ -3,11 +3,15 @@ package code.name.monkey.retromusic.views;
 import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.os.Bundle;
+import android.view.ViewGroup;
 
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 
+import java.util.Objects;
+
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import code.name.monkey.appthemehelper.ThemeStore;
 import code.name.monkey.appthemehelper.util.ColorUtil;
 import code.name.monkey.retromusic.R;
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/VerticalTextView.java b/app/src/main/java/code/name/monkey/retromusic/views/VerticalTextView.java
index 36474210e..6a4a026db 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/VerticalTextView.java
+++ b/app/src/main/java/code/name/monkey/retromusic/views/VerticalTextView.java
@@ -2,10 +2,13 @@ package code.name.monkey.retromusic.views;
 
 import android.content.Context;
 import android.graphics.Canvas;
+import android.text.TextPaint;
 import android.util.AttributeSet;
 import android.view.Gravity;
 
-public class VerticalTextView extends androidx.appcompat.widget.AppCompatTextView {
+import androidx.appcompat.widget.AppCompatTextView;
+
+public class VerticalTextView extends AppCompatTextView {
     final boolean topDown;
 
     public VerticalTextView(Context context, AttributeSet attrs) {
@@ -25,20 +28,25 @@ public class VerticalTextView extends androidx.appcompat.widget.AppCompatTextVie
     }
 
     @Override
-    protected boolean setFrame(int l, int t, int r, int b) {
-        return super.setFrame(l, t, l + (b - t), t + (r - l));
-    }
+    protected void onDraw(Canvas canvas) {
+        TextPaint textPaint = getPaint();
+        textPaint.setColor(getCurrentTextColor());
+        textPaint.drawableState = getDrawableState();
+
+        canvas.save();
 
-    @Override
-    public void draw(Canvas canvas) {
         if (topDown) {
-            canvas.translate(getHeight(), 0);
+            canvas.translate(getWidth(), 0);
             canvas.rotate(90);
         } else {
-            canvas.translate(0, getWidth());
+            canvas.translate(0, getHeight());
             canvas.rotate(-90);
         }
-        canvas.clipRect(0, 0, getWidth(), getHeight(), android.graphics.Region.Op.REPLACE);
-        super.draw(canvas);
+
+
+        canvas.translate(getCompoundPaddingLeft(), getExtendedPaddingTop());
+
+        getLayout().draw(canvas);
+        canvas.restore();
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/anim/bounce.xml b/app/src/main/res/anim/bounce.xml
deleted file mode 100644
index 32cafd2f7..000000000
--- a/app/src/main/res/anim/bounce.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-  android:interpolator="@android:anim/bounce_interpolator">
-
-  <!-- Use your working translate animation here-->
-  <translate
-    android:duration="300"
-    android:fromXDelta="100%p"
-    android:toXDelta="0%p" />
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/grid_layout_animation_from_bottom.xml b/app/src/main/res/anim/grid_layout_animation_from_bottom.xml
deleted file mode 100644
index 2ef4ca16b..000000000
--- a/app/src/main/res/anim/grid_layout_animation_from_bottom.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<gridLayoutAnimation
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:animation="@anim/item_animation_slide_from_bottom"
-    android:animationOrder="normal"
-    android:columnDelay="15%"
-    android:rowDelay="15%"
-    android:direction="top_to_bottom|left_to_right"
-    />
\ No newline at end of file
diff --git a/app/src/main/res/anim/item_animation_fade.xml b/app/src/main/res/anim/item_animation_fade.xml
deleted file mode 100644
index 29d4c38a8..000000000
--- a/app/src/main/res/anim/item_animation_fade.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@integer/anim_duration_medium">
-    <alpha
-        android:fromAlpha="0"
-        android:interpolator="@android:anim/decelerate_interpolator"
-        android:toAlpha="1" />
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/item_animation_from_right.xml b/app/src/main/res/anim/item_animation_from_right.xml
deleted file mode 100644
index f59e44d08..000000000
--- a/app/src/main/res/anim/item_animation_from_right.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@integer/anim_duration_long">
-
-    <translate
-        android:interpolator="@android:anim/decelerate_interpolator"
-        android:fromXDelta="100%p"
-        android:toXDelta="0"
-        />
-
-    <alpha
-        android:fromAlpha="0.5"
-        android:toAlpha="1"
-        android:interpolator="@android:anim/accelerate_decelerate_interpolator"
-        />
-
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/layout_animation_fade.xml b/app/src/main/res/anim/layout_animation_fade.xml
deleted file mode 100644
index a81df4bbc..000000000
--- a/app/src/main/res/anim/layout_animation_fade.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layoutAnimation android:delay="15%" android:animation="@anim/item_animation_fade" android:animationOrder="normal"  xmlns:android="http://schemas.android.com/apk/res/android">
-
-</layoutAnimation>
\ No newline at end of file
diff --git a/app/src/main/res/anim/layout_animation_slide_right.xml b/app/src/main/res/anim/layout_animation_slide_right.xml
deleted file mode 100644
index 9ea2fa97d..000000000
--- a/app/src/main/res/anim/layout_animation_slide_right.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layoutAnimation xmlns:android="http://schemas.android.com/apk/res/android"
-    android:animation="@anim/item_animation_from_right"
-    android:animationOrder="normal"
-    android:delay="10%" />
\ No newline at end of file
diff --git a/app/src/main/res/animator/appbar_elevation.xml b/app/src/main/res/animator/appbar_elevation.xml
deleted file mode 100644
index 5a9fd8f03..000000000
--- a/app/src/main/res/animator/appbar_elevation.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:ignore="PrivateResource">
-    <item>
-        <objectAnimator
-            android:propertyName="elevation"
-            android:valueTo="@dimen/design_appbar_elevation"
-            android:valueType="floatType" />
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v24/ic_launcher_background.xml b/app/src/main/res/drawable-v24/ic_launcher_background.xml
deleted file mode 100644
index 077dc79bc..000000000
--- a/app/src/main/res/drawable-v24/ic_launcher_background.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:aapt="http://schemas.android.com/aapt"
-        android:width="108dp"
-        android:height="108dp"
-        android:viewportWidth="85.03937"
-        android:viewportHeight="85.03937">
-    <group android:translateX="-11.480315"
-            android:translateY="-11.480315">
-      <path
-          android:pathData="M0,0h108v108h-108z">
-        <aapt:attr name="android:fillColor">
-          <gradient 
-              android:startY="0"
-              android:endY="108"
-              android:startX="0"
-              android:endX="108"
-              android:type="linear">
-            <item android:offset="0" android:color="#FFA951CD"/>
-            <item android:offset="1" android:color="#FF5757ED"/>
-          </gradient>
-        </aapt:attr>
-      </path>
-    </group>
-</vector>
diff --git a/app/src/main/res/drawable-xxxhdpi/album_cover_full_card.webp b/app/src/main/res/drawable-xxxhdpi/album_cover_full_card.webp
new file mode 100644
index 0000000000000000000000000000000000000000..6d7b0ca4753306a4e69c5aea0737e775d92a16fa
GIT binary patch
literal 4208
zcmWIYbaTrPU|<M$bqWXzuuzBrvM)SmoXe<X!P3BPH_>CE&(bA}l@?ZLFl-Rw%*=aO
zo+$00dvkNz+1X|})Tc~5{r}`LCVpMYt?O2hUAJXn>WXu``PZiCY?VB?_SdD>X^SmP
z_eTY6x{}Ve{k4}^RL_HJe>0s<2hNeYzg8nM%eXljS?l5Qg3f)h)B5&i&JS_%n5g8^
zDWrlyIX&6>YpYw1#?3HXK05C;Nu}a32M+x%9qcEb7<OF886*-9S~wO<eZv)6$ua_s
zBFS+$!!x-_K&dAiXHfSPII#rwR^y6{jeQ&rU54v%Mwj714na55H@J*HW}(QWacnQH
zkhyW3MZr~K)azJ+Z#33N6Ff!;jOO*xVh%F|MoV~Hb?0d1Hd?P^gurN%X0$bj83LmX
zSuBlEaNZf}ZFt{M&QdRn&<z0#om#m>G%%>9H4K~#G8GRtr*-_kP?;)abnL?K2|E_M
zMck4v5*NuhE$#fy=~1s_az^cmn83w4x%@l1yG&Ah7k*bPbnDr;#qNoo#>Hu7?RQ#_
zB59R7virs=9b7?*S%+h&Jl??Y@BdbF1|VQs^`hsT_qHo>o7QS)|3AdQxH8bY{?%Ne
zcE=lAU4QyZFl<azbpR<Gl7QvLnYe$}1urM~@cD5CFx*-bD7EC}E1m+@r=D&nE4BF|
Q4t!-es=~l1RsixI0LZH(fB*mh

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/album_cover_normal.webp b/app/src/main/res/drawable-xxxhdpi/album_cover_normal.webp
new file mode 100644
index 0000000000000000000000000000000000000000..a83b9f975594de86d0b9606a10d31f042daae196
GIT binary patch
literal 4194
zcmWIYbaRUmU|<M$bqWXzuu$*=vI8D5&SliHU}<Exo9MB~XX%o~N(#4L2y77I%*=aO
zexK?8`y9^$j2r*WwJLdedAZ-9qGTP6GGAxq`mWq+w(QES*})VugF5pa<zMczZ&;Y|
zAG=p)KX|Z4;%Dv*<-g{4=l-ZXYkO?oXWw)*wSB=`=UQ0>_-C%c8e}h?T1Q@9yp-kJ
ztaDg{b5#3i&|%4GqseA8%U~;nM~jQm;$nb`3yV5^O@S}hu(u3eJXjau6kJ%jY@Y9@
zgD>W%-~3ifIpN*i|6qI7XDt53TGfsUVvn2Aa2X93Y;_6N_UNb}TKj%9Kt@7<6fpez
zztx-p3Ya-tBqG)@D6gBc`O{0=zjg;Zul}64_v$<QWv>@rue|v2+{;}rO79gPX`aef
zs`l{8z3CH^4nVc)KWc!oXhTKE-TT|Jpo2kjy1v0@?sWYV{2exLrmbAFwqsRk=?TFP
YH!uEXJ$_%2A^QUZV~7WB+yFHd0O$C?aR2}S

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/np_card_blur.webp b/app/src/main/res/drawable-xxxhdpi/np_card_blur.webp
deleted file mode 100644
index d40d2a42cd1bc7edd3763ab5e107314e95bf9544..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14152
zcmV-OH@C=ANk&FMHvj-vMM6+kP&gnoHvj;Tr2(A*DsBP*1wN5TpG>8sBPF3xnDDR?
z31@EnF5fh+tC8zUEPP+TZ|yq5=KuLP-EMqs|Mz-wdQJCv=5T*i9r(XO{%-zmmHFa+
z)BXB$+$rXp&Ew7QrpMPpo!7FSwEU_4M^D$o_Ryv;nqSU83I4m-7xjJm{KwQI*q`lv
zf}n!oA8~&N=d<`8Z}@<4h)@&CJN@4+Ke2zt_7eSs^w{=o=*|0X7T7fmAHQ|^bhJv*
zD@3glv^W2o7l}Kc6wNXIu3wWn8wn{R^19;JOq33xdQTq;aY`PUX4*KNP8zbad0Xhx
zSbzCmYgkxeVTFbk7+7IA|7_@M`vFXMPBH;(YX}BG)mXdSrQQ~iZOEFZKtX;bo7rUm
z2n4RPO3=y;ZB2Pz0DkZAIgj25O9YA)f6zf_cO4=EK$PeDzt|$QO3^DstrE0K(JMr)
z60mi_(I;FTbH$=oiCP>#m}yrKb7YP(mCS=p#mAules_xwMa-IHCOoW^ey*n-+%qAw
zF8WM#aZyqiR)|@&6Yh9-d~5U*0;c=7dA5?spKn~uYDGt!$Eew9kj>YRWd6ApP63wL
zWp7lfZ!y(8=fav15FIiVHJMx}2M{-(mVogu_=9za>L6hYcCRV3o8kc9qRYw8JXlHD
z_`>+Wl!Y>4e+7~UFhq=iFQB>7U$<bVp1EH)M3Hv;m2w`aCa>rN<Fg~nv#}v2sH!TP
zPyqumN}7O395|L3a#X8+zyS>wgT!~(OMLAggO)De*P;X88>1kiGsAfTd{07aOD2Ld
zf42~3mxwfLrQ$|nknlUD01$%(lv^cD*z0B+exOzr)Y{YNn7>za)FgBe54!dP^qO`v
zudHJLxiQCB+FbdLE|%ygIWfd`Uz-%fzy*Hj-(o>_+q?{hchU#QP3)-Z-VKQCBeG2n
z%-&ZFD??^EXd_dnb+bocm4>HzX58VTI2E!qmJU?0AliZsytOQZ$BroxB$gM-xXAQE
z5k0(Obf9i<G|NO(bOQW>bCf<Hgb;!dLI^<!Ap{_V5P}dw2tf!S?mi%Ys@ufX3R<I7
zjYg=);!^pT=F1vJG^2$z=^C1g>gxVGr5xF>C`Ov2X1yaCQO%n4jA=#ncOSY45@C+p
zhsHw{N8C%|*p#+S%-j$ywh|n`KlM%M>+o?qmKm_lC~b067-7EX9RrvxQK~gZ4JZzl
zxzZ$KtoWZ3<J1O213o9kBh)nc3K5#T4uQ})g4G(MRBDY;syJmvX&iVeT^aE*YZ?R)
z7Qk2w0bn@`_aYC#ZhR^eiSa%>s$&dcj4_9kz0LT5?}Ac{Y#(6827FJ6@iJ`$=lA=d
zD-6l3ZkQ2NXbkwD6XJYN#E<$G4d%yK3d5TTr1a<(0?@IBFv(B9>x?%(6%1u^j4_5V
z%EJs{j61-?dy?4x=`d~$LBY5;2Pm^M*+T~xRxCPgO{ujurqtS-Q)*tQi3@Kdu<dUX
zQ8rD<xi==|Xl_X+b1spw>2~&})YvhBp9mzs$O?+QX_mc-();el_utK)76e(tk!*iF
zCmS`5+BP0r_eKoZJ1DY$6+{`c=WS~27N}Cy8l#<5U%==eYB<@!`q+d~ntYNc!U4Wo
z1p<T6l`ZO0biz~JMEPItbSk&@W~sMF{8{FAsvm*W+{QU<<9|6!Bja{%$r7IWZkLaL
zCi|PG_~o-en+;cXwg)WatD899Zi06C6DHg~7@d8Nmxt2$1DznHF@`bbX&dGy6{me1
zZK*`21+pFq3<e;N(Nc;kK#~E&{_y9GaS%cXMHt-QJ^=o#IZ?1B3MO$b4V*6*0Cf1K
zLGvMd8r#H>9)o7yLA%Jofu9rNiJEr;6oD~|On>zJV|me3gIv5yD)#8&22?66-;|7R
zyD_RWKmIgnh~sbII|dfXE`jYgTHI409dn_KZNlZ$b~!pIDl3^n^|daZtk}Q*@FBXI
z@pjKN`_!zz5-#Tu@i8G6bIP%30CUnNO7^K`nrmMd_2M@xT3}C6Bw|iq&zLMNs=_pv
z7NOQnzrNQlDRiT;Bo)`1_FejEB><HFsK*4p$N&{qPZ{FAJN-J*A)`@g+Jk|TdLr~5
z%yW}I;9r@DNu&F>-(x&jm3rYJ<`f<>m1{R<^NDePy;MQk;GE1G7lrnnewuUq$jgSN
zH8q356wXs|ru+kTZqM257GPU0d{0B>b;l{8deFchJFy&m(BNS|;JtWZ`^*2Eb2nuW
z8AK(zdNc~;J6*M@)jPWiX7<C-JATfL92Cb+_DnqkaxBjyt(J|SDrX%qyeZoMrA3QR
z>1YAf?Uo?!*;%93eKZst66S3c-77RS2;3JNSu6QmGWc>y1qpx9Tfs_A8T)C$&=y*_
zAanEbyn(k{X6)3AFDzDP0Q95&IN8n^Ye!oSp?fIWp1$ET3C`>TtMG0Ow-Oxn2wWKS
zpo$TD{6?=_X-HjZ%FrXSpxO8sX2)dQ&}19o76zwcgGbYGD}*00``6ftRo?jy;vSry
z{i_%c7iM`!?!Luw9xSa8+zAN#iA5UVH>hju0>oxS^@2?TG0)q!Cz!TLzyI-AUW-00
zSEQsnyh0ep$bx6%)wdmdU|_$1m&W_K3=+q9Dz3ZhL@aOqt5M_{;W_He0X$Rd@C0c=
z#eP1$DZwPI<lbu@vKnLzSlR>hK}9|do+!`;IP7m}@XRBZ4GQic92?82Djh9_di26t
z1N8E5DpHVG_TtL1wXp28tHXL-t;y|uh@V)?v-3Nd0fh`Q|G3vu)!VI7`s&KACp>@w
z58DrKu;kXw1U^v|qu2N(kXn@PaXux|vE7Q9%zRqUB4bf1?EF4abjXNciE&;3uS}PV
zrZ|)WG!h}%bp-b!TI~d3oJ25i%w!4g4r$lxr_?AbOc%xidD0$&I=xlrsL(gu6%t>|
zi#oA-=&>F1LmP0%qN`%734@B?cOqlFAc@PlfK{zV9GR(^g%Q@3y>ZgD&>xr<*{r+J
z<f17Cij7gKImmg-L2jd4Kb)VT<FN(b@~(xUVUDn%zS25IUrpGE?n;3c;pWP=rfAjn
zN2j@e^+#>twC5|be|_>bs!YH2;LZ0x$3wS9H}P2?S&LqCdH`L}Jq-8zv2Ga5U5@Tv
z{c5pSd_pRIC?glv7ojMSj~k{SW;5FR55P8ZnXSlK^GX|V%PdKzw;e5~V6W;Tl{P4?
z2SCGe#Kf)B)FHvntJ;>sVp8>=h8o<%8f&_C%J;M1V{i_5IMTJ42@H1gwEz?2XJNv7
z4xr6uyf>y)ri6|LWIe9t*7Jie8O0F7VJ#*<YNbt1`eZzu7&xqHNG&$w{8WifS6`9;
ztm?-%`!>zgkfW1dUGx}rHo919pV{(HUsxWP6Fy@F05E~Asm@(r1p#5LeQ-X2%D4)m
zqu<-nhx#QeRmbMa3kb-Z;yQ}=JttV$kpy1=%1nZn1+`sMX|G@CJ%iz-WTreK0wE|O
zZ#yoZ6*~@Qd`y8GWAPhca9ea3RGiA$U;%q$y{XsNws33PE~fc6Unr@3T@HBZ$dfS?
z87c;1uEQvVM23zOFA%|54FlVOEUR}bPiPj~1+W$N!h{tk|D2fkRwe{(7Yo~JZB42s
zeC-w|o8wn3+*u(Wcrf0q6=bznCtQ}OeEglcS??ts_14U{&hDFXFpEnAosSZfi9o$h
z_0oqKvim-K-2SMzCZP5>(ShdMW>BevG=`+!QGvw>rDR%gg?>bdCt-KRq1|<`HNHw=
zFXVI5jm<@zDxsIE1Gwg8dQ8~CetJ{c)XD$S_FSUZBwz>2s6-i<kMs7FEPa>+)ZbX3
zq$D$)0I5`x=8#s{;eZh!=Z)digkSK7MCYhdN71I={+1IO0?B2rz$#G7k4}j=$=K|T
z%PIM%#5_&t!J4iO)FEUr`qg)VfJPKLF2ga9F;`)i!Ls(O;6i{TEZ_)9o$dzv1+s2v
zGurZ&C+3PJz_V8R<E6Y70rwkHM{fa`19RQsj?8^n|NDpTF*nVBkIjBmHym-%FQW$x
z#y?sH;N`R&m_~<u8c1iVaRf}35Tjcou|S2K1EdV4>J@nDhs<de<DF`c--28)SEM%R
z{pw_<Fvb|eD#YJX$R)!OD&45a7|0ncf7H{s^r%+@flKD19?T(UXHc(4vtjVI-fY+h
zfv1rc(&g7K5Fh0N)|k9aAuQ>J;As`(rXMk+SB{u`m1I)pGub_=MmsilajKP~R*6|s
zG%(aL(#Kastf?9<9bbKway4C9wWoT^mt43&f0PSaV(~t*<<~9{ALRnon_N$<xpl%f
z2mrAVLC=eZFvb&L5X%5gZHUi_@SYOX`(tcumCdLjhxbMkU{`IO1w@>uWzm4J6>*v(
zY;c4~@WyefH9?%@Dp`&KqADqMD1s0|2tfx^`fjy&!MHa9{k%s~*D*5^Fvb{L8uL|<
zItMLtG<b+vDU30OFvb|e7-I}!j4_5TwwD4(0RH*%_`JS~_t$@C^86YNr{H{r-J;d!
z46cQ7?8~z_LO=PWR@9CB`<UX`>?4c?<mn><#U~dAZsz|j58E9_J_2DCE3#o7;Q=6u
zs#Ud2G)EwjVvH@|F30A49W(^#%NU%%5t@PJT(vFNbC)v94p#tU#<U3A{@TulQ~Thw
zd*F{wkXi)#dnz4INpD6d@>lhktb!AntQ2Cy@qqW=AiiH5dbqpB@;Zq@1__*hcF3z%
zAb=(SB`19H3#s0*Dg;40HnB#Ph|R5?Y!%hDg&&Uz`^eM70gqK25Ib2bvs@?3-JDdT
zCo*5f=VABB+)v?{OfEbDZ$R@*4!7|ov@e|gz|;wPL;iWI>4&R|T|^E^ak^Ul#U2Ey
zk8hqn5Be;fAb1{(_)?%fb@Q)Xo%6~T&14e3fD9&!3Nqp_JtIk#?rPX?S{aQmppU&6
zMs{MVYUo0F4HIaE$Sl%g+{Y!$0^xY4Vk~z59N|8o+uRh%7wJ(AxXIz^506N`u}1^i
z9Epf6_!@Ky{k~Wc^azK`<X-+|000000oGa`w(a=77u{l$QB)8v(D$#GA@8EkVQKT9
zDreCH=5OYIXZBFyRYX5!ln)Od=rI)J%!_^G4}9*PoY!oDMv94+3$)WXop*?(dnlj@
zTK#0913giT@DlhqKfM`eG8UueOY&famZ61C)+<TmB29MO#AY2~I$OOYVywUX6H$oV
zMZCualj#)Q)#gg^t*{08?K;s(U^X{U8+L<6kwsC~>gK`ky{*@Z!eRN6cHAZ>V>bu~
zziCMz>Vl;k*b9~O?pwJzK`k$V*4PaBuw;=o8t|b77{U>2?Y?o*PdT*4*^Z0xrK?5~
zEL2O!Ks8v`w>ib`YOl2jv?#70$L0Kw!t1m<;O1^ujNvAOWCJlF4`qG@(H^7JO^OU~
zkW7Wjqt4C$SU!SZo1EGuK-3HCl%jjGckOjN$0vE&Q0oC#hED`p6%I}t?QR4YNoizT
zuu;p5dF#1O^^zac#Uq{nVW#h0fpA*v(B}hay<8=Q^ld_~2BiwV0&J-`!XQim;tj1q
zA@d^-d&_tL000H0fCA71`O<-=mB&0S=cOt6>-ec(TSF4MC&g2#)sULV@X!4uCsNfL
z_AAAJJ^+}UUZWHt=Lp#bovZ7{vqaDm+8lU0L^$`MqxUI0A1^n_t51+R{6pJeGr7&N
z0iyMsys*2B7QXs0FVSP?Iw7<n?k~RSwxAVU|0!R5n|YA*@0-;}J$qh#1J6_vsP}eF
zlPHd@^l1L$Dtk-n0ryPSD@XwoQQ+NKfcb7s8|qSxWRbv|{DqSQZl*K<&#!iMrV9|g
z<(6PNf)6dfK{y|=DNhGeN6n&B?D%9^zW+CL$?93e7T3h1Duy6>DMlHZBC&_3sW$A1
zJRD`g!sS_=+tEWM+Hc&-k3U4decP_(GLH$pW5a@AWpy^uVkjzx6}<o`;eA!<pJesh
zS3EYwdtAG<;=DGIVqH0#>sQ7@72q*7T9!NM?#;r)R_5dP$6YRV8S^jQ(nY>iSB1+G
zbD3hISfl7ce=Q4V46;3f*nlggoMHW=&jSYI4~nGOm5LXKRJLvAiXL<fW*A#Gsw!td
z+j?P%U_mf3PQqcuTC{IG%zOzZk`Ux)ML$7z*aFi$#bfukLcA1;Id1*uDb+XIC63?n
zO<)VoLK+XLu{bgKa(#I*^w<m-L6^dG%hN6P8gq_Wl@mn0Fb&~)z@B)NgVvZUCG{d+
z@hli@3L^{-HE#G`9`6#cbn2_cupLfSY(WtFZ!7?C7pn<lPeN&c00qqfR@&ft_((CL
z{-9^hO59BL!KnKT{x@8^Smt|ho_7Tkx8WG5jU5RT0V@wvCBOMeD5~j)=(uLCn;KsI
zNzVs<I@~q@0pj>WS)IDsZN@p`c)AIRE^ec?XNk^HGGm#$kis@m3BdyKUrOO}<EB^(
zZH4#6_vA%Gj!97A%z{{Zm5>7S?@VvcOcOgU$r&Yt!~aV|a(FleZSuYDNEA41q)cm)
zc5=I1=zzr>9cP+VTOGz;?OD`6Dm?ST<<ciF0Qvjt#j2^#TaYBm%fFy^jhxMFDE9{!
z*W)tvE^XM_cNOaoZ)PQd@%`LR(4t-M%72X+rO8KROtW({A<h5R9ZQPD`@}vbVDe)n
zwx<|hkSe}SLQna%vE1}q>(oqqd|gG$%yyrkDL*P{ya@UY4>EwyCepA|uf_5T>YS!$
zczv@rLoW49PZH+M5YAAa+$y(TWNm^^6SN9@tDe%2{8J|}$NuD>k{2WU3;p&5y0#oe
zZ)oXOZjscipr263tZ&iTW<r}y6uo81N!mnS*0(kjiTq-FK*UbL<f&+vn3>h{BLS|t
zqZn9;*8~}k+6fkB(JoJnY2`pa9gkMDc)p^;Pes<bU)qTN$sh(<(b!N5g7yqxJij#x
zSpN4pP$A12QHS|vb8B38OHjY;drhFplBrb#TNZY%Wl<^TuFbQ1NBPUD+Pq7H`uKve
zB8q@Wh+}L?_aCy6Dqpfs^!QUrYodfM0+HTLbB%@0#evK`tb(Zq==(F@$bUT83Xuae
zeo!7^C{A<+Jo8{+R;h(H)@B8Jq3X&n&?0V#>sF=}vOoctmyt=+A)Zwg-be$<uyOfd
zTXZ@aZOfmlSq%$MDT~1XX$%m56L`zD!9AzkN4>%g!bcn+t|E%L>{BmrRO_@`^2wyw
zoz-GwpyIJCEz0GkmWrUK4e)yW%I{z{YtYVqM3Tiqk3XWX)1U;&g$qjD8NaPt0VsT{
zda^nN2Ub$ZL=d)HaS)@esuWjBEa2yLQX7my^XD1ZAf3R37+^JH`i~RItMXC{T8w34
z`iz)bMS)07b4y~0dFY&kSw!WGEU#_lkqGhQuvCV1hKS+Jzux(5m>8f=b}P(>rA6=w
zhdqPWwrhQIj1<amK@W~9I-+ZgTyTRY2p2N4H{BefW~pzU*1#c_5$+pCH`GkijOucq
zbj6%JbSq$(w4=WfNZf0O;91(2cz%AqkDs3hJLUoT*8lbIZo;Jbsgv4{P(G|MGw9Y=
zc6!YU6dVEG!Vo?Wa6W)q)5m>zYX5AC^f&_1p|{5dYi~|a2dQ_c5xu!qI>|}&!CG>;
z)Ne*8P52ZXoqd#)^AUaN>-E`tkrrm_^OwTQWl!z}$?6pzBHwg<wGl9$+C5V0>v+&g
zSh>9Cti*+(u0=OM2P_)525_khaKT5fDWa3WcF-5|#I8Q{;cs2$i{n|S!6NQ>XRLWa
zo>}FO8EviXWnWBdv&<KF?eck0VLOwQ)b)OS2SIy90ttLYPQPDi0&*y&HtrbyzMtbT
zW+Wl->hqPItJOhSzSJ*YTC;L)GYzYAYUEnhk)1GXDCHKOh!{PjaF0eV1llZDQHBV*
zxu}ZbGal!&Ac=DZz1fx=9&Fh)6ehXp5f!#LnHf!D<o{L;#<Zay)Tvfr{=tXtGyjhJ
zloXbvZOvX|&$Ex=HHuKHgjILF7!^vLy-kt|gfFw(;K=|1$3$C)PWvlbqmV~J#&&Z6
zbq1Si3<rn*z?ri!MWNQ2_vQcq%oe==uyf89GBvXTA?Ywum}dR=L$OCsWJtd@x6Om-
zafUa8n(veipY&zj$V@JYGINxR3w|}du;zbqd%}Q~{?a3YMS){kCNi0|Lio&6vC_uQ
zAKoP|7+nqs?K|=ngEf?{nYw+N0TG?y(iEILxtsRWY)GUx2NAS+XCrbNT?;|)I&Zr@
zD<c3u7LI+G_9};e<P_|bgf$TgTcvINx741cnik81s~Q0mnZj72RK7C6jE80V@OfHS
zJ%G2fl!=)J-?NH;Hy{5IQuOB)m%`2I_HvtJs+}p*GdkP?zM8ghJ+1g~JAbPqCzni_
z8C!7>s-mhE7-`?BDWZ96D2~PB_HUYCup6lN_G;a61i^T)7<#lgv@Pursk~uQr2>0j
z;4u)$!t>DFThTOE7^`%yz8|=DRh$mC{dNV-KSp7qCgZSZZ;?FX5Oy528OQdHa7R#&
zJ=TZkpTdTfil5px;<N<@n;iwObVEQ}lNRC(;*nSO!>!jhWMmb@Zn0AFp-=OFMH{I%
z#s8I&b_%7xS#mLwlSw9zHj)bvm$Y~LzOeJBxa<H<M@Ju@Ip1gCKdYH_Nf0u>VMtf}
znrSB|SZKYe0H$!Of1e!3G6r?BFt9iUx2J~^68$aWxuh(-XtD?}ah#XPdo}IU+5MeW
z6_1)_z}EOV1be;_YSe}Zpx-RSp%LHsXTWD3|0<H;#^sSX1?o_t0cx*mB!#*}^3`s#
zF2W%eVmUxKrDTAbjpCRUKlRLjP*ZEQx$GgQCO|`V24JI~ucKw{*M|97q$EbScR5R5
zFrHCCo5gVC&J)0vEuJ`sjHgwH#txVz{oPojd-lyT3gaVu2f$pzGB6-im03)>gund)
zVvAG5>)>;QlaK(X00vWkPbMwyLV=b5UmxnvOf~F-I47IoS_CXyY~Y>!vMQ22ICnDh
z1Z`ue2c8K2`na=t9B@w^@jy|%uLF(-h4gL!Q!b%MJ*0~d*?jlPeIEXioCd}nR%3>#
z&oCD^2PfKYnJVa`TV$+92G9!#IFqgpgP~u-29Z}@r)uY10}%ZxP*eB807R*A;p>yu
zb0xlgUNZBLv9@^<8k9KGv{W@kSZ&p=S{HDAdV6nrHzQ%DdS8ehk(l}*A;E)egyW`p
zy^zORuj()rA7`OdBfOlY|Hh`(x5NKPCBPbOUR=Ga2C(8EDoyyq1ay?vmnCseEF(N1
zR0t}g1p$1ueUbSJt;tM(`XWj$XY2<~Jr8XoUVvI(-6WOnOceV(){eBgEqODYKg?(@
z9Uy?Aw3selw6!se&s5UkTaMzwjgr;GmoGVadMjInaMfTfub_usCo%Ndn89|DML28I
zDu<`<+L?KkfIp$r`FHnngIl9GpotCOaAOUt;LRLMiJ1gg2e;I<0dsudrzcO^Rybl`
zkfndzL1(^M1agc*Ffm%}OEqH@hQV+2Hgmw&h}A(dY`(S|71NO3W|sPZn?r!f8qcGV
zO~o6NB)BJ1^svK(cg9=1Ri`ELQA#3dQff<+X93!P*^=X)e^wGaslxfzq(P;Xt92D?
z!SJ%%1zdDcs~eG^xG~d>EGaUpVk|BDuyHP%r-r;Y-6hC0cO}~p&{b5Nd*HgWtJ^pw
zzMk~*TV_L+YW&s-r9^(rIekG!oRzJCK(IG+lJcsUj2L;|8m4EyStG>{oM+=(P8&$C
zt!1&&o#2A5sGB;aIwEzc+<$rT$Zv&FB46+zcnYA01FaI5NRwn2O+&r!ki&LdXj^BC
zR5@+@h74KhDu|aF$gENIdT4LYYM8bJwuC;h#XxeZP}nbSJ%Hllg7Yx?s&zvH`PMNw
zOiw3VBrzdcXngwth>QwiC48VW@Vzn+3sidu&@0?Awogfj4sRkI=(DRr2_L+?hfZqB
zrAHPJN>kc4D7lC1G!W1gB&8i%)JySXbRs7@3v8aXKEd^VQ|=@27$n=JCt7GDn_~_w
zbEOMcc86KOJDo}6uG5uYsyDSJU11OqBEkg$i6x*`YGh~Y(J$elqC2@;px-J6E_IvG
zFM0I3kCY-On0Lch9EBj)g=Fo<h(?8pnD27(F#>Um)1W=|6VFA_G5-Cq+m+O^3)HgQ
zJ~B$W=-HQTB|BFXe?T^5+Pm8?+8G~G7Oh8$%VCLMav=4~n0K7ywE|Fbp3P9e*mxD<
zgrJ40s-+)~4QJD{Z(LXU!S2EsbcHX&oMsv~UQs3cll0$Kt{MUg<sMq0or8_@EcaPj
zOWkykNSz{N<kM?m!v(POAy@W8*OeFsU1I2;tNw%J?osdIu0d@JYN*iB(<X?rDbyf4
zM#Ll$3T$-5VH1(!X4xyk*q+Z*15zG9CH={#ebGzP$LG|*Zo4sG48><AViv!IG1c#F
zeAn779~tMYhXV-fCN8eSm<6HCPhG&)Mt2v{nv;gf{bZh{aPhe@75pv*R7ILO2i^R$
z&N3M9pT#kYr0<eXvGN3SsgzR~BnHLD2_MtDQAd<_l6vL@720lrs0HfZUecNAw#H~L
zBQ|V_&=|YqmPK}sJ|-H*v65e%N$psM+_@pZb;KdF>;iWnb3cy(syS<j^kVJjw00;v
zua}Iu_f<{pPAH<4=X{bWWZ2va#aJ2!)#XIlSs?s|P?7y<8eSKz*8>$Y(BwYEDUV>K
zl6qB*I{+1QiAoH(nuevJF#JRwvL8c+g3GhS$8e4}#`xZj)&&MP2qd%m#dk=%ghiPd
zrs2$VfEu0qC0uOQ*C+V6r-Z~cmo25SFZ-Izu~gmtsS5AE1j`^eUZu0x{M&^5HIZ(1
z=yCp%!~?kqFy6(Fyf8XYr2BOvL86sQ`<@(JGxED+`icJmpy!9hS^))s2+T0eo{E*<
zvPNpVoYP&i87H{;#*ofH9x5FJd!>t_QrBCF{Z>7!+W{>3FkKWc(00cm6XlMV072OR
zZ)MK)W0lpM0+0_@S&^-Hd?sGonCM&+$8Iryx2s=<uV7v6ZzSu@%0<E0IR6F4J^MRX
z89JsF0<H9c(!7{ND5&>KubJLZWrPm0uH~7ZJ9+@$;3IHhbYVR)n<?v^jgFmN{1Nch
zH+M6xY#;5*->?7B13%U!2l^%*h<{4_1i$2s9rSSR_DDjzcSQ_#P>D5lZh2iG-(13N
z@I&-n*5O<XBIHu^dO1}pKZO|2jSRqtx^X$4e>`Ov{6bL*!y$EV2Dk9cbF$j|{IbYA
z<~P&AOg8EjrayGMy!%#LVSWswRYj;f6niG_zxD5~A$=?-xEEVNeE>kRzVCR;;5rM$
zBOcTPWNro;I$ROHm4(hOHd2;Gcz0LLB#9BO^LQuQ*3#(^-b=INa5sWg+Muu>kLA_n
zBo-`AVZ{0#prut-sgN%S=^a6fD?!dk&iRT(<Wh@3<~OOkcs+nEzmJEU&;5iJ5<w%`
zG(RZ_Fw5W@gRkN&6(7ZfpScIdNQ!osqm%*Q?*&r{oWv`mg`<yNX!tp0;PllipNd3n
zX<6d4l=Cv9SnQ~*EF)fX%6K;$*q<w2?|yo+yF@S`BE*~gTQ<<b@EE|~v`g%q<wTWj
z1gUj&D7c%9nDQvqckn8b6`52K1L8yrnh>sUIGhWJyR!M!2#PNqTmL(=6O!ZtIpxJf
z-4R-?n`eIT0c}U?W!xM{Uurt?(DsJs@-#ssg7ZSuYz;nuh`!sRi+jX!Z<?0LF9<=$
zGqsn!mn-g>fCaq20ocUp?9gQuXL(GL2sSCNvpc7TQeh!yg%gVXn8<VpxH)=R<%a)~
z@!U-WQ2n$kRZ>Vi=%6~iYs_9boz7wq@poP+ZiJ>XAs|7k{Og2-Z2c`c(bEe2ffaSQ
zPgs-u`0ne`lrH@aIs71>?ek*NnfKtcMAY^#*qOpK;oar879-LrlelgZU1rL-$*1~|
z?YKR7-Nx`3B5e4s(K1Jb#L2*kAeu3cOU6%vvQ%835G&hT+;bQqW>Yr6Sw%V3tCFi;
zmK-V)U2j)14mZ!!u>?1a$-&_4VKdEMjmkCOA<eZBN9TKZMd|r6DnNgSl3<60Gj-Ys
zJ@+z$-(mMoy0U<BYJFS-jEi!e^>zQNhe$6Bs!r%981_AAdcX|fjISuXStLweq~_}2
z9mioclUKi`H3%c&>6I2|sk|JP(?REAsm7JFX)n65kG1XrJYntrv10gcxhCCD=rYk|
zb9`MOuCHp+a;D1KewX|Q#Zqcp;$_FoWpn(qzS#;y(uCn2Q@E)^S5PX}ZTZuuTP0}_
z!2KIvQ~A!~7ZiW3i(|gP!kQJxEU^)-ecz6&DjT;c*T8on3ZMz9EuX5l6Yc`_-`qh6
z!2IOJ=gdpjN}nD{F<{Gw0A9KI;6eaL2ZHTjwwRozvVe1w+~mY+CQFW}!oQWT$^lSn
z8~~Y*OFCZ&#|WpG+h)%9FK2U!to(FIB;<%2exirg@~-v-ji4<<xpndiy(dhI>5P|k
zhC-TSHUG>65)=cZ&RtS3C*(|7_i$`ypf<PcV4VgxPq~?2R*9DzoDh&(uolQoOA6cx
z;_{DVBlvO}VTv!mA@Z{Nl>GVlN{;11IOZw4-SkVbF~>1R%*~n54!w*C9h;&T-czfd
z_X`cIEd%1h$j)J`-RC5xLJ9UbaZ>0f*9pEQU|XGywZ5L~vKnwq+vAIb4dj2xjffbA
zqIcd@GGy^;JyebAngo9udrKMNlXaGAmsCL09o6si4Q!qwa11PwK)q7Yj)b-IYXaMc
z;61jQzX0t>#PcbfDefGs2VpwJsz;2%B>z8<0|TL<*Qk7nIb)i{Xl&FMK8~oM53^7!
zIrR8Hq`}S_Vq)SGnzYH86l4=1Rc?MgpZ;j0I#*Jr&F0IiN{@Da+RV}w0?E_WPWHUH
z1JgY^Ltf~^C!urNv@z|(5uz$p(8$<Gg9FRn4x+*mGngn@8loA0UcUAf&cE96v9YkF
zd?<wmco%O~6@)yC+!ELu!>#BokiBYWi`C1=IO*^0%^c-*zTb0=#5Y9)$b4y=h7Zy;
zPKuL(;ln;{x8!V9yGh)UM0wh!Il+M$yojq;GDyE>Jybpnz@BYN8DW?C00|VSVAlQt
zB5xAyHGnVQjp3*z8@#BzH}DJFnX6g48AA|dxCN?h^bB`X&Z#5CX>sa$NqWBu$rr>9
zn&{S3H7u?f4R#4xsnWHc%qEt6$tMULXbXxm;8K%I=Q&*j88k>=q3dAUtz@>K)w;9g
zWR2tj{*>hAV>a3|7o`2;)<l18Nnibrv9)!fN!1DLjr{<H`)59wGlTWOmGL;(7O!!K
z9@Afk@CL;>zmD!~ZJw-1u2D35A_V(YmFCYmn+ub*Hq7ib^~a%P{CvR|+p0w_jX_bQ
zIGhq4UtCx#tZx^8wBQ!Ig9e#ip@29thIVux_$C~Pc5;f3$>}iy0gL$*VlLe<kmozB
z*e4dLSWwmhKA88D<_CX96}VBbgV{B*E=>VEyNz~@4rNG}IjELDZ9gQ)#DKB!Zz(Xm
z-%rfbx3U&jJ$kG9S}jFQL^$&d&8=(lL^*9*5rp;_2~GC7et$pmu0oGOgoxE0Q~8aK
z75)oU+3c0Covow$6g`~e=V+GHG}rC#{lzFKgYl0U*1l-)!11M&F?!pF6EYW?avS8b
z0ZGDuo^-z$xL~zpQtoox4LWx3-qPoLAd%kZ$a4BFYxp&+s?&bLf*g|F=QFBz9lm#z
ziyY;nx8_Mi8gjvtY|P><6Jk`U(*jXdo}6K^qz@nG4TrmLs{oKU`Ui?K<qv(Et!9|P
z4Snnb?=>8z+D4|Ky2S#6KZ`-$i&Ix@Y*lcO2sZ<(aqshS=FdYpj6pMo2ffu;nuktj
zY9EtFMd7CvSh7*MBV#;7LM~^f2;htU7#;-_cE)T*19sK;gM*(G<4n9cQBo3AKj+pz
zhMnerp&1!BV0A~DS43d_EC6shOHxKuGc@5C?X;fFiXJ(SfE`>T2|q|T%qXuc838U+
zoH%!Xume5i#hex!##Dx07&F(8zn>q@4HM}19|iNGZfqS=Ik)_p6$kOh-+{uL&a0Z*
zyna?g@W*KN#hDY_2TI$7h1W`TZI;+gjRg-p`nyL8XDCt*E0*l?UaC6o5W}uR)ZoaB
zgtjHbxmAt+4}t(_XiOszy`q+no*9$)j$oY}^X@>GyPCBm0SGZL!q13@oi5GiML4Nm
z)2ENsq~${0E%@k7#g|!3(abj|tjmki%7d2>&Ab2KFn;nB-XuC|dhGrgz4b_zpK<p!
zoJsXl2~p=|PLoqX3#7LuEU@z%eVf!0F+|iC`i|@8h2|@}>n1f{!HtSBaj4`s%%d{|
z+gtkh>{k0iiZ-I&yN158@(?cT%Bv+U{YC)x;`0fR#-Ysl`eJ(f?sTldWWy}kK3+8>
z#1a`zEAEGV)W41bKalQ!ER)pz;(Md&hRsD542}l8PIuy2hUgCQ=XLoyJMCM|utLJj
zys$UgxU!SL_a*n?|Lt{+jz@qcR8iwFj*@SgExZCx+SWAE4F>3abZK`0Z2AnJYs%+!
zv{PzXBcP+(&-yEubuM&>2V+JV66$_CoTD>~CHJ$7pKuD_4}hvm&S(&na{7ZH54C&2
zZlAy?m8t~?sm@zM#Ujg^ei*B=Ru5F=#07y*g6p-+<j1zMHx|QY0`Z%xI*pjw(IkA=
z3GC}scGtzgk5-JUq>ZKQV_!o|fklM<^5CZ@e{*~KhE%Aps)7*UJ`qGeW5&SFmLp?C
z7d|>zYAn0vuWuZS`J9_PawDlLS}sUNXNM;KV{9g>&H&Dv<(`m$JRaRkzSQshvIvs?
z>O|#^+Fa8u=6Yvt<X}5WVr2V<czJt};Gt;A75}|0A0!Vs@eKmH0M;evyC**yX)xEV
zOV9+Wckk`UfwB|ja@0xc6mNsa#rD2{j-%Y7DNG2EH21pC_<EPg!2mCO&MS6$4%ytF
zfx~fp9HEb)>3!!Lu7M*zie3a;Fmz=z?fO+%#tlLFNF15xwlO0eW}uu?S@F6F=#J_A
zW}c`78xd!Ry-4Aci-}9H@oZ}&#D}>mguX_<X{95UxbWJOVhm1^9?f{J@NSN`Rd4Ma
zIesfSjWYv4AenGZLTw4FA(q@W|Ge@$DxZ(u%#Q$Ai@l7z=yf~FZHUDI&xctX@W}K1
zcVaVNan?$}1tXyWySTzNWT?aSPXsbhs2!|OWO)iZ=Vj*fNq=Y9cQKDCi(7sMO9m51
zQcu?(^zm7;WAvCGML4uqkL+vfL4@2?@#k(eb1+!R27yc%*4Ryi<IyOnh{zQ`$iK=3
z#<0k$K=eB_WcQ27W1~tuU9RJ+gq@}hxh>!lGB$<vXjoDc9ufu0f&rRS!1B3Dx`oLf
z>It^b!!NfOU}a~?VnhoL)wAc0hIK*O<?(`-AM%@e?Clr;S6-gEVS%#L+c-0o2wVmX
zMHv{J=$N)Lq$UIN!-6y*xzS+WYVx9CRWT?fj6bGl>A$?yC)lvv?vW~gC71vbXVr}V
zDhP}0_*4e=eJN4lbFL~2cypV~?%+DzLHswy>^(vuI|5_~%P3FK_S{`_!TJ)kb9R3X
zy=HnEXsu(RXQRaiOlbN`a44m9G*r4TPnW&*ZXR62wA?v}kbBlHS6QlR4c<f%!7L{D
z>|f`?a63iCT|!LT_u_%50qzV7n$@k1*0UpHd2A;71b-qE*jbnrtV^-yYHT86ZPBa}
zGjtaPpizf94%-R0^_lF`(GXdB7iD+8*j{G)vWkdbV$RWE{-(9v*o>25q+pN@l6IHt
z<If#}&^?bs4tCDBtwwLS;%DZS6<FJXE&@TqN&k&oEI)ZEUrN}p=rywPYKt8|F3P#j
z6ez~cD0%+tZ}v>s|02Z9kBYIs{edw_<9qwJux@&y`bbp~)~wjH?Ig{pe#x|Yj#&ih
z2SHL2!qCow`anA|1(GB_MVrk+^;<8tg8+e=p%hap-f#g-HtbH9NEvugk`kE!<2vn~
zcS&zHK0!w58#TU}T-%ykaFgCpZ|2yrciQ&7!H4eW_sU}XNWrPO;tBwDLxIESem(bp
z{^oXlFygA%u+xA-ZD{4RMkQbfr(ONxukHQfi@~F2k@;KiDqMMm=C|)@%x8C8T_Clr
zBtz~twx(9dz~$@FaJP2=enC89(cX&zrL<D>0xMUf|1I;m#s|O)C+Pjm{Ju<;s68=>
z%sA#wHRlj;lrrA;$mzMI>-HQZBRU~aJqOsduJA_B*#R>TZ(K{mza1H&y-`#+0pQ7j
zNO)x2)r@40B<mG`Do=9WZt(Rf0-&Y?j?Eq!dr{+P4msUaKv1HeJ}{GZAOc8e4)AAb
z03B`g);D_qH98cUqCFjb=Ihm&`i3vaP>WVaN=E~cw>u~NF;I^`kJQ`QfG}vZ0A`&P
zx6Uk^_v$_gf=9_KUNK1b=$UXrX9-)f#`#cym-+x;zNBEn$iQWrH5%I<QH0w)(A`S@
zE$COv92UNg3+htkp*@LIX~UDpurv$-;|oz7;3vM8WHcm)t@WXid>ds~Wwe3L=AT@D
z?LaL;!E|oJjcA`brQ^9d^S(VdH_mPV3>+0TZ&@s^C+s%iS)|sPy+A04+{08R6dtwD
zL&4Dw!(jvWz<<E_-uPiS*b6IkBoHm92HVP%qF4J_m^d2^NRv!thVaL6mWbcoI5}%>
z0)*`g;|E~}Krndz>JRc%s-?$mPHNlOU;53^%w8%k{mLvhGffq)Nb=aHUvhIDS_?)g
z#k7`wTBVw=U4sWek_ptmwx%3J9-l9WPP0_U|6<@te{l1BuS-#7Vs2OmtQ1(Eiv!~!
z511;^iOpJZXP*ne(s2V&8o-5foB(hYKO-0uc_8}-gN1I(Ed%?N0b|IiF`GR63QoG9
zaRZd0;`#RAwch!^p1^u|_NZvDo^V`uP6bxcQO*iDmskQHaQW9M)xq%p`V%d*ywi(3
z2Ex2>cqn?>j%!cp#SH23&AAPs6h4nn8hMhe@dbA*K80Jo-Ht>H9CaRpw(tVlo7i5(
zDiVAUNy9O^TQGl~qe)A>Kiqrla?y})#(*`VExPO>t4J!cy&&U1jK9NO=_)QZga4X!
zA<Qy!O8oVn*D!hz##vk3qNI0r741+K?wI_^Y#@16KF52-sFI~lzaNUBCPP$s13E)!
zEy5zQ+CjE89WfhayurYV>Q*Vj*>YH03aaCGm|H3{|8omME(jfc7{rxv-5dUzdm$5l
zO-fe)B9(63z|Ezv0#dv?l80_d{FZ}=@A@4jZ-g?^t%tr6+WN11<1utwfR|r0`wu{f
z!eFW^H%_ML)0+g%nKb7}<A!^$k_&rt$&C(ieED;<;2Pog1%y%`m)Jpx3e|?~Ukf5o
z75S9GK7Ksmh4@y~f8e^?NmTFpL9RVPt`fh7Jj(febV>p`#~^={+5gifl_P_2pWq{j
zOB7+6R7+wXdfRGRn*2OF^J;-llPbo~-U73#O%9U212zsAU4-c6vCdPO&B*&dECNl)
zxYco__Bp7v0CfZT4=#=uDodJl#+R|y&UawvM;_6rY5e{>48uhU`UR=aGZZKc=Xw`V
zHGx0em52V^AmM$UHOo71Le3)Bkni!>fGBo1$~h#wg_HVYyB-M(iS|yD^gqvnlm;<#
z^bdUc3K_(}CzJNbY&pI3j|81015Fujv)_&8d><VIM;2;@nuo~hqqw#}@|*!XX}_8n
zZ-EdIgE&9_nE=zfr#Tq4j_@Mv8;B4G!+gH)e;&)sN_)SKBs_LtemUR%qd?xjrYlwn
zzbvR6ySScBT9q7b0UnW`*tpC()$qGPsl~HDEi|c`i<t}Hj;&?fXb1;Xww1$Ue)<FO
zlDo-I{??TM-bmVhYb@xGUw`q6ijkIH9eA#+Hit6Y63{fpavk3O=4(*=h5I4Ly}&Z_
zJVMY#lqutue0*;?J>2`NKF<UUo-QYl-i6(Y{+qO2lLt$oiSLVB8*uh#sXee4eN^Ei
z_3q!nr)R%%E>SCLHgOXWg7Y&(g$08`D9@Gt^|vZ}hcg8PHz8@yM~~N67g{%18XTk_
z@WAws%19PLHXdZzv=I5dVVcwxuv@-H7%m&YbkjEoQ+jD_?7ujH_i_UZcXX*u&*i}F
zZfMZ3alaRsKmY(2-Ig3KhpIwgSmA`aj&vP%Tu@JsRc?xJ%qjo?1Y27M^G6Zq3kR`s
z&@z80q{+sH8Nr_?I)Dd@fB*mi516a6i4#>V9zTZ0>Sf)K8Y~F1KmY&$WJSOaYzFP_
z4Ed{{j0Bx<W_<g%VTA8n0q0HQFJI$CqKwtZ3g=ncTor>O2svBE#KQochUym@>j~Aa
zd@tfI6Cc#NlBSQ2L(Veb>hrhYujky&dtdkC6E<XzU?Uv1rd~jyW1qjkXF*PyPvY)x
zGH!ZGcIF>Z*#5lRT|yEFRx9a$&+a#&#_K>su?PE)fZd!O1vrCuJg<U9TQ!Y!S1z$(
zGcL9w!&u!Ted9(qAE@8!mberZZ8z;2VO2KlBtD?XeJ7xZ&_}F@B=^q}f_xc|YOc7@
z3$8Ds`*N(X_>MoYV7F~PTNT=+<Y5y}6%Q$IMyJRamF2K1o#CcZ{uDJP@VGub)=|Dp
zZOHfFte@!U6djzPX89IIqTA5|?t=!s5ugA700U205usm8A20Vkh>1<h*Z1TyYsFU3
S8;q-Dlxs6GJY#b<XJ`QQ^ESHx

diff --git a/app/src/main/res/drawable-xxxhdpi/np_holiday.webp b/app/src/main/res/drawable-xxxhdpi/np_holiday.webp
deleted file mode 100644
index 697a9cb8132637610d6d25ad9ff7a4ecbb935269..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16800
zcmXt;V_+st6Rw}w+}O5l+t$W5Hnwfs#>O@`=Ek;dJW0;J-#Mp$Ro6^c&rEk+eNWG*
zNJ~g$2m=6`;vz~KN?b%S|LlY|kX#TNdr$y`K%zvR9C>juNfE0yRy`_=nLQ9HMk$Un
z{q{M3NycF38|(;Y46Mu`XQ1<M-=Tl$7q2&5?YGtE&CAaZs4LC+71Fnsiyr<5{u_m;
zhrMs4C5y+Kr|tfo+HIemCV_`O_a5o5?XPR^CjYt5o|n?k=r79p@JGgHf8b}`r?%kK
zd(_wEySq1!zwLL=S>pG1Q+nCXwEwn$#uM*@|DoXi<Fl`%Lk<6PXqBexJL1=9uV5BV
zh}X)Z7epNNiw);@&qMSuT*!H#pQ-?8pXE*~4CU*PR(cFNGBhE<A~%^$-+Lng3gD4G
z(*qSWN+4BkoS#&Qjv-d2c$*QlaB5<E1w=oGbHex7nYACd4QWA;3KKI>NsYDzp!0DX
z^4fk0?UZrg52QpZwrPZCAa}1057xEJGSnANzf98b*o9Nt1hK{qz&{m9_Y}v!Y2!HI
z%5~}tSihAmCOJ=9g=r(OPdwQpFZ@2f^)pw1)IIg$S?)<7d6a-axK8&G!l`jy6E`}0
z_Z&TUl0^;WuS0r^nHqs}*!OqTpPO^<-;qahtK68&fl<%80Xi#VQy*2sg9U*7d5|Fw
zDxtZk95cI>B144%58?{Jz6}1Q$H#$-5H@5~zpC~qPvlG%0EqR@;6_BP&}*k(wx4xh
zMmY*LzH!P*;G?4S+CG76$XEb>TLR^n=09OrT|yv{39Lv}aOE|yO#>nVgm`?e(~}@(
z9bz~1e(g#EBP#w}w|0G36Yn7-iR@3p-OCoVTP}8G|7UMvwsY+Ak${})I)NLN7u-fb
z6*`%PUjOH3bktw0CTz(6)JB31@WR+D>-sKuv?D6G_6oY=_vICT8!?9%N&DY<yFEj;
zJp-CSBt^6Bj1CV9Kb8{yUnG5`Cw7Y`Q$7;7(*nZgZs9wuZZQ3vg~q&Pn+_W0R0=fn
z^_#Dn@DM&Xe6?pW_OjW3mEbNZu~lTg`8hYc1}$A}(KmhPWUIe@-x}QfFQ7Om^vuuQ
zH}{Ll4}>*B{BRMkorl))`d5=3Av_=2oUbAQ-xi9$hvzT9+!I^wI=Mq0?%A`hbv-tv
zdj8#8yhzj$gua{TTrbvRiZl$XD>y3Q8;E-mguRZn&%c{#d%#<_OQWlwJy3I_b2hz<
ziHBP7+aYM4FcQxq#NnLsPgNk_N4-7=ve1Qxa0vfw6JwyOi{CQ?N1jSag0^7-ikz%`
zw~?h+HaA6ryie`(lTl{MyMGH>;|)ceohq;hm93*5+jeGlS;h+1RZj1=bk|U&eRc-E
z;t~VlsUGyc*Q^-?E3G5Xs5RZ*aE?|^{-RPw+>`l}1Rm?DwrF-u=XZm(T6}8FNbq<g
zBY|KjaF@E!TF>QhH_c_asCy+q#-2j$MRY0Gf1cRD1mAJdT<DH@w0U)`_&s%ERuc6#
z=9|x^9w=F9%j&XEUmU(@1nu)HKH_#m2|79AC{X6DVHBo=IGNAn6P&OyKJz@wgAb%V
zQg9tMFit^nq1qTIMx|HSgC#S|c8ZPW$;SAgUSa}g9Y)0>iUhUO?b;=4o={6}wRt|J
zWUkyp1odO~b&lF73muWp`OKXvf@h=dDe_-n$l=0qJi2lI9J+Op<{@Jo21PH-T#?we
zcX=SY&oKmyEz{ZQ4;D~0LXDO*E$gah>h#k{bIfy<wUcc^=fF(X30P*~8gTWW$&$4E
zEgxyYHR(n9Xns#&hC20-)9KCIld!AZ_3$@N;<3VYLA2E`8dd8xj7df%jn#}*D!hzH
zEwZLYcBNx<{4OO|;t~Vvx3J<g?dMC%#AJ@N1MKy9LoC@igeR*^SQFw3kS~fd_Z+#|
z)qz|(OE}84h&@a*@(|@($!``qD19{i?Qy;QUAFj*Lo30rub(TvACLS=EyQq%8;vBe
z+p`dT`h#9ef45TbY*5-VyBTjqJ~x_<5ebEeWp^1`a_!IIk%;ebIw}Dr*MCU|Tln4>
zzQ*CIa8dw|y@9uW2VD(D`uA1_$uoC=GF}82Yu>6WLJ#-AdvL7>6hH-^>#C`Ze5^a{
zx^c<97gs?KN_RPYYYzV_b=-jp8k2bk>d`Bd_|v=_AmzbZZH*+nhb)v3SydPFfl|R|
zcLe7hw&o|%q&IGVBHw2&@*ip$=>917I2r&w#L6R2TG1vQ4{*|a2fTw`AihUKl*)Gb
z@E0|-f&alm+o%oXU%1$#G&<}zC{ArahyvyRz>yP^quBC~d0&+{CCNCPP2_OVbhMj{
z{{VuCp`|~62ulprJu=txU(nzG(*9opN7K>Viq@FR87{X;G^mpA<s<h}HedSEq{@{3
zs8p*`r#gWlmc|pD%y%bn;LO{iN<t>F{U0kE>igv^Z<c&o;t4^<iUFczTUGESRfIFz
z971NlswuyVQni9$D!v6U+QjLA#>OR=&CDdVwCPMt9~q6Bv;W{W02k&qS5=Aozm*30
zi~M9$<>zdBNn7kc=r*si0Iuqsq#XqIleT@Qa6&>Yg*|>6$wGNkafnL$+R3nbT%A7-
z{SGL}k_=6B6gOqC#m9qmyb}0y%k!?z$RRdg=1_BZOR8joP|rzOz2U8YcvoF6ROQz*
zX&G&l|83~HT*2Oo=aa%I78Gek$?K2bwzDu_)A~7e+QCvC*&d?2+0Ow#5}evRpi}9m
zciIa14(uFZf*oB+Sdx-jd0nf>;Q=k`kO71tE$_neo+Jg-1g{fo1!6W;tCCl*z>}e{
z?tXw>SO3`fuI*ZnIz;rP&Z`JW*u00%ua<1ZWL9i-$n2f4cGa>^%d&$kjEqgyL%5f5
zUtPG^n8HZ-^KW_F_>R~ipstaG$YrZH72v0J3UN9n2Qz>ySWTTKN2ioZx3h}GZQbQ^
ztszdinEOcge=_Bgx(#$Y<;N1&d%49=5Zcn{3O*FO8-GBmXVJ@4wOb7m&*kJir@VSq
zHcPyc>i5w1Y9+2uO&A&dWe@_F)=UUK{N~E$dMVo^eyE@*RC^>1#fnjPmnR4KoC&0|
z>{Ig^L?-%+r-&Ck^O<b+k*k@Jf!3SKkc_|7+uertmHuO2qDp>B0~15V=?}yI)}Jkz
z;n?_A6j?zw2cAgWKU1f5n`tOh%a=7GS6hbtgI6DPDNPTVQPDA1L6c1&01Bg^M78R{
z{=b3t-f-<0#{I;ov^TZZLpvy3ISQ0NB8T^#{;#2%wP!t{WJHlZrZI92>$)mdGNzV~
z$q(_j>LCu$g3ymq*bZ`^{(i>V&C~Sr&C~>*FAf>gfJA`UIT29+S{zw66Q`X<hjAL4
z{@<L_>BMSk^#P$RvwMLmn%zLqw!H1^{++E4P`$ud79Aua2pvg7Kg63y$%d{<XY4Uy
z?%v|NoD%xi2k0UvKqqXgDMwX`(P6x`ENj>_?3V*M#=l10oNwh^g`#!^Q(D~I#f;bW
zwb!t$Z>scK;<9qE8XLCtTy~Q}&xT+hfTc8DM0i3^tzWY1GA2$WbJM~qyN-sdQM?@X
zdOu*epsSfqeT`XKQU_7Op2?nx-S>rlQb&U%*RZYp8}a{?gVIyIGgjEr)$9J{f9Xu+
z+ZnRBGO>Orx{%Fu9?K(S(Y?OALFI(b3FX`h2OGB84+~eyYWVNE48VL0?OA{Xvsh&R
zvM$e)Z8z5i7kaB<3b7P}2+88}kKk)3Z?nzsh9&7I<hfEw*VgJyr8kbi8lNO%+y}aK
zncmxRft)EOReOV7&@-;~(8}^!kQ(n{jxj~ZJ-<3?|DPmiKOs1y>q+O17Ma%R@O~E=
z9;5m5W3@;VlFMEIC4)__pnDtR$#*`LgHn$<<YQL896p|Po09g_i>X9?*U_C8zY{)e
zh<A@{r8Sc&13dEn4FzU9^`LUW#pgCHQ$2o#=DP>$*f53;iWI(qRzxF#po%&#D>6id
z?P&{L4R&87_275-W$-vwqbsan6iet(r@lk%_pE;|<_LNBN0h7=EpPD>d^+GKNVav)
z2>Fd7FU>2CYQK~6l6xp|Y?qzj#(%*~t^PlU@UiVQ|2?bxe_)aTaJ>G16-zJb2vK4G
z|7ITO-<JQYz9?jEsxLs!L-%+zv@}-9FQT;HivQQE=L=fe<A<0-MB9JF>q!0IF#cou
zf29AP^rNLI*}RjrYBUG`UswNQ;0T0zER|U1>%`LXn~@`^pIVsu77r)l$SXa~CL63;
z9@yuL%H`96hKSk!(|*2A5Zh^uB<rApq_YhV8e9r5BKe6O;GXS$k|xl{)eLsm%TKoy
z6=!={&8)>DOG#@-`s6#tc40jZ8q`_;R}9<!e^qSDfzzTLy3k2GO%lI29>{zUBZaVc
z$IWbhVbRp1-)bpir?B^_Un5wJbpGVkqhF_4z4U(#4Z{CC^<V#a!k>(8|1*f2^uE0?
zVhf!Nn5em4vdPo_Edb!etXPeMW#GfS^_=y`O~hHN2dph_YZwCq-hLgv;0-@5iTPye
zd-}A)%Gu%peqh3}Ejyo{n8A&v-hdsPe-f6zW-e`_;)bYk@cExaini3%mI(Ch*D@aS
z5CfZQZyfx8PnHphkP#XH_<BDcp#y!yr8HHdjaFa??^_p&`3AaONe+7}#&k+T98xnj
zF(x<tO)Q?LkpKj)*;9*@0rB&ooIUQ!1Q4(wXS?W3X?ak_NgXftx4qsMseJyT=MHYN
ze0QD%vX$32q4niEc-}t#p>~dA!3t3}1ag8@IB>Y$yC{TZW;lOCzFNh12>}46^3#v{
zh{nG`LI*F1zhsQH-8SiDGFE}?M7yzW=P$F#$Rm@>YzRczk@n+xGg>y+1h7AAA>Ffw
za`WSUO-z8gpnxQQxP78NN7^HHSQtYda`u}gfsmz^W~)c7+5skJ9y9ZH-onHvdRep~
z6tqV>nMHnH0gxWv*pR{VaI3}ny6`RGysXX%`?2U<IPKSelHHqJCu=-{#+yB)%AbOB
zj0)#bg|<2ut3&pj6+T-p@BbPl>uhtRo_X@=eMYJtKXQ!|W82DK%7V3@-reAMaGauV
z%J$*$*5}HE39zHR5g*i@FPa2SmSDg^cAI!u=iNO$7d9bL;9#-uP%WopVqiKZFXFAk
zCv7nOP%01bX8a;>?42?5onxE`jlQe_xj|3s)08ur={{AF)bAHKgm7u5Esp~$n~Gu}
z1(^KS3vvUAaJpmQSc!R-HFhaL3`-}t{Kcqp+h5WocuC-y2gC!k;zZPAhu~ziqr1CV
z&}#=Id7UKmX6AYNVh61ua+tL}?0o;A-8Xs;)TMY(3y4@t5*A>=m}$Z$?A2#**d~g{
zX&o%6ee|cuRWRAqkxaXG33-|{8-+3GQ7BR3A^dZg0IMU`?4o)tRx&$u6?nlh&iw27
z5O=+Ao1B)re0q6=G2`rnH{HIRP{`gHRmIswE5#Dst~02+s@`#Z6e7o!2u)&pSYf9m
znA=u)o*+LFm1tz8*X5ZVhiI!`F;BB!;#{&IN<AU%K#uc-@prw!A{L66Pl36zi4*E8
zWmU^pESb1Q!-^j2Re$9u|HX!D6cFC1X#kdIY8U|5qfmRAUs(RrAP<|(M5m^>%Me+3
zE@YyEdmBh<`t(j#b&_~C`GRZ95_nSM4qs^$4xeJrW&2B=lY^C-Rgc!%1#o2eaFk5N
znQCe%2*(}0i@sMhEXA(r7g8?3vS0Ypv}N<||7hR3G^8J5=n#tUxh0Ov-?30}Z*PyG
zk^!qek7p6}w@<I35Gwvs>M>nQ=yHI^q=+s`G){&tciY3)^GbcxpKbKz)`|IZn`tY_
zS8!IfbvnLzOyf`<H*O~LV{hh%*g9)eaLuY78~ZvP8&054s26GLNyH}~Jl3zlw%mf}
zK)@WNT_=N8wS=bOOhR}JY!cIv{e*n#6+*ju&)?Y3XgNX6I*0?=*vTp=RwxD8D2Go3
zW8T@G?5nu~QW0J;kdSYwR#Ukm4m8vxd-N2GpXRvqg`#xmV}Tcw3?HVOs|Xc2{;0hJ
z37|L^5BNb!AH$I)Bvr&jUx&8p!89=JxaS}>(Xeu0L2`i@Or7I;KY72Yq}mvT%h6=M
zVi}>ogrvWfB$!lYcUZ(F2rH-u$3&_l!GFbbBf~N?-a)~{&__~@rO{jMB?-ND4Hn9_
zM{-L5`Kw|Y2DF?PLKR@@bZ{$S6rX66SapkS7vH|6qHYI%8^CxmaQ22D)5qSKCiUNU
zR#C{6>6tof#n9{W-_;Hg63}5}mC#KLEo;Ccu~wAn|B^-WS?a|#JJKzqWp<2_cX|@v
zUW!ffhW<t^3wRCs2TS?ET*Hf~y#jQGq@!RtSfyP-V>Ap(n7r*r1FiI?+#;smh`FxG
zUBc6Kf3hJK({ZIW#UBTay}o&fPx!YDl{QM={j0g^hksFX<o=c3Y_<gLR&R`wFYe&U
z1q;n@Ck#32Cg;W7C-_S|QQC>}^RXuUc-?Y4J}OU+whhE1;ipimAvT!sP41=KAWu>r
zz|g2HRy~(l2<uy(<U?UANoi;J0!G8Z8s$LeFJ7F5u7d;x`1aE~4)~N>JD?&2K4Frp
zYq<AN2lMOVOHk7S$th`|=dtzv-BmC@;2w^QDdRgj<Y639C=_%q&aKC9!La;-V4%t6
z_vM#@%@HS2Uq(<)8~-UG)@XLJvBSIsMA!)j6^J&Hi=h#Axb@%B1g;>c?>KkDxJ40a
z${7u-sN_T7q?2r9v46C<r3S)u)OwuRdK2%^REsINjAbw+aSe{NjY%XL8A+ihA%;{8
zL%48B^Q34!l}%oHb==W?OfXlCHee&{`%;&;Me-R-l^hz)50v2EdO+nUKw;KP^VLyi
zB24Wa!;-|y&G81re>9`?^fM|$0V}S^n0yhPCbwKWBx|~qN-ng-Mqdy+PSjm=Tmdr<
z0cH@V=Y4;oIomRTuLe~(E$Q|n9!{|-Fi*A#GYgV$So-1}8u25TF+X|g@w8s9Pm<D<
zwdhgYV_jW;8N98#Y%UA#We`0~VL5Kk>AA?CAxoYM!UuMOYh}{xO=m9pS=WD5kJxgm
z@}$E=c?pi4(D*ayw<|n`eq_{uqv{bADtqP|kOLgE2;y7Scdn%PgDSvzyiH&uy~?MG
zNRk;y>scyEl|P3-PO^Z~xR9u<ot-4q6`92gfxe_SH8<yF4hD$=H3MRzHr`?|SVj@W
zQL!!A$rYb5+bapwd>L;Ho9GCOt(M7T0cAIs{R1@@0>rdh>5-4#iFAn&t41{uF*vcy
zI?^`Ag!xS_jKAHq?}249UaLPF%IxFUcqdT#{Z0Q}@J<c6szj9N2%-){td>^-RR~+`
zKB91f@tWu_+@mVtKyEj@j!xd{jxX)sB0m=)?KGwUM&0dXwVYSKe6Pw@!U?oPBoy8R
zCO`Nw^7+N&v*xqs6tl)}*T@8Zu^u|Y031R3HoR`l;7^#RIJAX|2?_b-5bY#mPe~;~
zDSmrY&LQyV9|f}l)u`0>_Eb3p^jI_MQ>8IXMp>;#5gOgT&?di=^bp;CF)4f-6u%#k
zCyOi!SqORFM<Y4Zzz5)}ywR+`Bl_IdRXwPd<9nHXAEeRVq>&nYeo0#q&oD^6>+T#D
zGnWmqiER1hF|V#HRE8C;e6*uDU9;^V5U7~Lv0<LneJf44=nm8yhP=fyF9Dk<vb@-Q
z$}$Q)RKg2Ym~jpOMbAt*U+p<X`$uWKkbQ3tf<1}lu;nx~c@W9u!Q7PVM{K&)8I{*3
zM|{|FqNxQZtu`kwl4c2(UUI$R>!BndP9fM!{U<IyBa3kfaq`WQ@iOY8p6>yybs-rN
zR+t7I7xQn0Av|~Kjb<HXbqv2-W-Y{|MV+B+X@z39uK4KQo`LQh<;pXeaqAw;ynJ_^
zIm0QSEd46BP1QhkdqTv}QpaWe3Em@rh3h_Y3j|kdnTxaCSNFZr93)u<+TH+#nd+S2
zI{wS%eo-edh@2FCkJ0;|Q+3fFczwlNt#2SX5Q&G#S{jh>I};%Ox!fI$2nXNYCUTx;
zLS_y9;L#Nh)qezUvxi1yw|?q={=m||1zp|SV2Uh;;yX1747d)b%I+ByM^xAah$txz
zu|etU?Go(X6)V$`9OXpxn7%(59QUrau_R@p6fA04c$mOW@VU)imddoAV2hD`z|-K4
zN`C`uu4!ls<46|*;U(%D@OiLSuixj2&5I5sJo{9>W7c|ADg#?!=kJM9I*A6;`I<jv
zvT&ZUR8V2iPRh9l7=K2Wp%uvz7`pd}k!y#N+b0|3t~ySsbua^V6q)-M6|29&hx<kf
z%Z|bZ6y!1=FVPpotRsdWNLM%r1&@`S3%FRuALvmD!S{&l%}Xob75W>0yj(y4BDNhU
z@ln+4e9V#z><b{Sv;Q8tT2I-bf#>a`1`S`~^y##x&9Px*Ah$W(!*wrk3j))s>_u_M
z$Z1qkH1UFjZLb4sI9-2eHeYATM}tXC%SJF1Ht=%1v&mH6qJy;&JrKumI(|IOk4`en
zRzN9O`4r(I%hNXmPs2BbGYXqZqYbF>VNi?;3|0|1EcYc%u%grFm@czDSi-vC;K)1N
zxucn^1U$|B;4UL^6F}qul6Q{UW9L-)pWTABfHx2>J$da@#0ZVF*%xY47Vr=)A7dhn
zze4CoWhOFK?eyZm=|xzDwB28x^Z?FJe&g^FUaIOxrE_1ibIG`FDm@e@g+gIHrdB_Z
zhcOVtD=jB4st1}cWYlHabh%!sKsiI<H~!eWGv-*jA?k7I;!qY}uql+z^!?Tgnzcmx
zn4f7w{@ut;EjC=~t1D|awPAnANbmE*ZfOFoagmnyF;RHJ91MD#R%uH`SE<dyEY1GF
zAh<uppO2#HNAT1+QZF#I1AG77KN89t3&zPy@!7~Dh9;B&9`b!L7>L6br%53S65)CX
z6MiUX+hZ3It9$WkThnO0p{%VML<7C|yIg|F$^$W5l%Y{*GdlJ7;0)BLq-c1!l(HGT
z0)b!Sr5#-VB8;IueYXLIbX^N&KLc@FVbrANHkHo{SZ|~W5S|i5yoj##nQX5bNeqQ8
zD3_NW><rla`HWz9o0m^yz*C$5{76^c?|kT@5w@l7=^pzaMUABu%_c-WR^P{pk$O8n
z`;o@%ef-Hd|0}Zj28Z?wH}7hom^(}>4HNEG*pHl*vG1Z@#Sm#V!KuP%*<5-CEdTF<
z<*z386<V%~1;=K;4y%F>IT{weRV)5me!!rdjjsZu!%Dq&4n+A%F1s7z(uhYX^rGlz
zNMsD9LdrO@sfufY!>G|C&rZ1cdi96Vm+jwl?JbzT^gnzJ>8)CJg#ugfGcn(~1vMIa
z%M2abqxzXae;Ue9sqUo`BsJ2W(pe$;O5F<I1L<R{HRRw@r=DgbWN{XOVbP;$+h!eD
zdYf>7wO&D}Z%ai^qbVE7hx?jI&~yXVz5-jUHl|lBED8%m<3z0yy(2VQScEnNCKH=6
zgZ8N#XlpJ|e2^GZY+ZuT`x-KK&do&7Z!$^K1@qz*`}b<eArPfIT)AY1y6r0W?Do^y
zTmE*nK)veb{*8f^GhKrSHA6}~-dkECtpe7?dm#c6dEL9o80{pkg+T`Nk<x6UU{tw#
z9G=5pPcrto_M5``wYLrj<4HVqE8zQh;h;591~Y{3jBINHeF4e9-$)_?m)cNYn=`F*
zATH97f5j5+pMDAhid^<R;;Q+7VUgrZa5QRaF3)NuRgPt?%%f`V3nhACc!nHza8oRI
z$!0W(BaEL?Aic)?*laV@0D{npl0MLd$C@j3;g^Ca^>NM2_H_QXiE8hjQrX7*%U?@j
z-@jSl6=;$p@#3So5PllCJn?&NgzI~YgtQqIgV>ao67TD))`FVSMh=s@BTxQrO%1sd
ze&`h36y1AD{>AJ>%5vZvGzoeT;AN~46%<Zr^x9{paO_2?Zlf_E)P)6bxyMYpNR(yf
zeWNYdhE9d2K^bhN5g~a2y$rqOwDh&h9sQ=#t;;G-4lP509RSL6v@U`O^ob-e3PUvq
zKSJIjzp4OD#6Rhu`{kl76}A`6C(G7;RB#<L$0GG3Rk8^we>yA?Xi2TT?^C87Ecd`;
z)G7U>9;s|-1@a#dE<d=25uW!k$fFDij_-?Ol1ulPUkHXWZ|`#?C|j|ys%yzCfLb3o
zM_`cub(qmM?w8-aA{|vk2}hB;Be)o@$2%bO%OXYVK8K$&`gPkhCER5>08BTdrD2Z|
z#qzXQps<8MC(w<aoAxVDJWqL%nJia9@58C-Mr!&w+Uh=2%I|QGyx=z5xO&(c6xK|Y
z^GrPZ*xBl$Zz+?{Cl6Nvni<F({zV?b4qd%WTgz1Ow{^x08HQf*K((I&4h1YM%=QTD
zCvF4(4#{i+PB_@+A6dP@T{1wn9}ACm<1ZWTLIe`Wk+oa#1f6l)BgtyL*edeKjLM8h
zQ&0$IV^8EF2e)^XZ9Q8Vqe2A2wW^w?Vw9y$QW5#0^I~POoYS8RkAFYFM6>k-(A%C|
z9uRdBP(f}WM2GQ|?=$=HEI0H|u(1eo-IKkr)*?gN0xK;Y-DPv$8;)YO5v@VRIN33p
z{-|V#t<Jb~7+D6bqf=Kc2S8em>?9_Q=)V;CV&Me9QhOq7o{;IOGnErX|FX{Z*&TM#
z?_;H!<RLlw<zEHkem~l4ceWJhF0aEt=60u9!TRY=zuK8RZ-i*JT`s0=es&|(+#Aky
zD(?d1f#-z$1K(W$8AJ|R9>n?xIitJ(2k!(Ck84mt9Y>AyEoTrxwlrcgbNr<=U0@@_
z9zrj%7Z>+K6(@S?$Fhj&O_h>N<nt*($r?<@7B%=_b*QBwDr(qC=lcwEjFI3SCj7t=
zTYl^#!T1mJz>}-g=w3s0H@Q<0c}zNLYQcdKcxC;3SdJ3T^JEj&OfNcSFdfy}KjwX?
zZ1q_fLXUYpMSrFTnj&nV-O3EoFbLM%FMpJU$F@QUyFJ2KN(AY?wa~S!^>$uvXm>XU
za$Fz4iU0LXgWM*V*Ps=LAS0I-{*@T}<q(B)hf0E^qZQl8z=SX=Kr4AljsT~bEpcIJ
zSJC9J(lcTr26)P1>_<UG$3_*!R>sm#bDJ><AnBh`Aw7098D(if$jET(sYDq`eG`ml
zW$KnU3}<>$CJ@)1BgNouZWa{!%dqfcBkSFnd~P!#_X{p~y|*0iVefC0@E44ODj~)Y
z=9?Evmc?1i*q_3bvC&e}^69mTvw=tq>ekzv0+VH}CNK@wGK+s-*6`41E*0T4$N`cV
zP8ZC90mUO&J(FqBj$<(#z6#TY+`f~#BYU0f@r@WDnUCI(gb72h7`ySW11sJ>&D7S0
z`}*&bih=~b@>H0bw5BeSra#`G9KAW~5?n}RneWTDgWQy6g!1-xx{o+|edppeNhk)3
z)BwSW^1Z>RgvJEyRI>GB@f66tYkGw=KeQR{BnxfLfOc(N*ZEU1MmNRaBbme_sl!0!
z{_jA;=mrR4+V|nlR8dl^Dn;-mq9FHBNNEo>!<BCz6RCQ!2d~VuspFXRxERCNvR#|Q
z=BcbtRJRWk_7rCOdMfA*_r0@#71-_I6zLQ0na(AMsJMU%a7N=M`)&ttN4=C)p?o_7
zaFRLcIs?zBe6Fz{7ViW^Ja$l63vdLzVRh)<UR-|S7tF`Nibyh_MB*{=^K5jp2XhNo
zDMU&`%Mpqp<My;W?BI>FVPw&t!8JQn(CE>BJ}Re5h;$v4E??*pghfKDcdw$K3+H?-
zM2#XXNP|2=4q;(9=V>e}iLdR>6a7iOoIzosPA`=jIKb;$)S0w1YY3ZUSdK<{k6hDf
zQ8jG+uhg8*F6nzQ>83uEN=V(_D=u89G%Y{UbeaYv3;b<m54xsCVKJ?Sc1DqW?GnOa
znAVCeoGA;|2{y$0CJU3p`oTSMZ|g)vLdQisLnjT#3zREgwld{CnrSl-$IRz)dXH+2
zGpd*qpn+fL(qITiDhp6ejq+t#u2J#ee)tDhE%ZWU7IW2<B#SWRtZV437%3BtqWNY9
zoBWm^6BoQoo&iWn+k-{iR6P#IW@#zAh|x|$#lCE-rs==FM|+b#ksiM3{4%mfC50ki
z;@FkJ*l-ej)E^AR-4F2$W55b#^NwY=#1DrX7nHXZE%Aourcf9<>fh+m&wldTfWL>O
zyz%7Jfclx<ht;BzODI?dd79Km$5eePk?R%`mlS2z4k}?B_8vSl*h0Z&qtrXn8QqNT
z+JadyS`>(Vv@TkyhA_|JN}^07`EHhBK=!I4c=%O*-wEDXN<WmOKrNn2xbvbQaG*{U
zEUo&7c#0@|3HsmQmFw>S*^3(yF|8ObnabTmuWRX;ksbTNzQ=AqwZb1{h6Zmwv=lUG
z$YApZZav|&wmk^(_{Ub#Xbqw$6El#hLX3;1Z-kD2BAg-(cfua)2BDUq(Z^uJgEeEF
zu;ow|1hwG@l2b}34>c;VZ4Ipz!}e}r^#(N;p81p+u6x{CvD*8{XY#UL@w~%rB_hBz
zmK6Pgi*SqHJ4bKiewbkOP>a|H@qWcoEJ#;{{}T<WX^J8uTt1ELE<8iCb?VN9f_~)v
z6YdxV`s6uuRBX%9<nkvUnD<kD^umej`Mwht_w#@aA+h#Elz#=(8C-JYU48#^4sp%n
zts~1-D&f3TW^4*{TuGkY&ASqz7rAO4nR+$hx%=6T!hB*9CIA4yQ^ys*0Ga(1(`i^Q
zAOYJ3Dxyxi_QPwAIBfsOE6E`{@&`(tfxbGYRzhg0oF^TIL+O&VhXnts9Kv`XWe+pR
zIb05S4MTPq>^y-^d$(mO1pq*e55Wv<l6IM%d03iCp5;eEbu1G9dK&pzO#b?L+u1SW
zd_Hb(ME@IOFPm5Ndqx-70z_Xy<T=Nawogqg?tspM6xX8-5_FHu`U{k;>M_?ky!g@Y
zFX%5WUMaq`%S>`l%^I$s<u1WV#nV{OnRMD{JS1wnKI*}U#gbX3^2KcwQ5H_f!m1C6
z4faW{8jBf=Cl^Y&vPU5Kqu5|H%R{^P0z>|fbI5+&=A_YRV;NQ|9NUuC%x0?mExzWN
z(x9Kc6#^fZ>LqSEp7^W-97t@L`Q4~Py8!9ovmNRACj4O#)$r(<DDJDK*=#J#H+m`m
z+e55G7k$?An177`Om{5@oB2i<t9zhRHjW{(Rcf({*P$JR4f&fFjR^j~ot>=gmI+0;
z2Zr_pONI6ek1Tcb3U(hWh?3mShpBMvg?30befNzL>4EmFK31L|N42X~w=A(kmZvWg
zKDK&T=}~%%7XA&ts7End9Nty)-We&T0<#U0T5D!<LwNP=LMGRh55?e)?w=|d*qcT8
zi{>MIusbGb>*qzVV;}hR0^d+MmYU!ku#V+onhk#2p->pDepaczaJmH&SyuJ(OrnH+
zEp+7v^3Hg1H^fesNPpLK=-SYCgAGC+;B*km-R6_Q8>8SUV-9bMC5ElE6!oeYno#+!
z2VDGQ7ypif7jsLWs6BxU*)}%Y>yohIycJ(Hh^n#43}hg}gcZJVS6Q?xoee;+zfd7_
z$7WP-{fvPyZ&abbw(Pd~lak%!jj^3CR;n+_*`84^+*9-cVw7f|&xj%=8%R0=2G$9G
zm=k)OwhBccHtnP=mtc>J5r4DBVhD13dmgPy+4v5V;9wlR=<X#2vhO8t(28!lmQo=O
z=T3^CYwXZ=WkRD)|8Ga)QkoF0*1QgXZ8gjKNc$!erGa#5PFM5G=WEV_d|{W+1?7|I
z@nRi@HVn*CZNdn)X;7aRdL>7sBte*a$f^2?2Y0}pC`P<X?T$G$dZOHbon^{t=@dg<
zU!w3>jZ;GOLIkA3=xqKe)Y;f#GqK>R{M4MgPsr0})g~9W-?lOaj@iJOz_TiEz=rpC
z4qb8K{B*`*ZJOy|4&%=Ni8MS>D?}ems`C0cmtOa5m~l185C+Pz%#h*T@!E5JpY7^?
z-^n?5uAKuDQ9sY_{HEGXKdMU3;@lzSN0?chsgZhssC#bH3L}JfGL7sB19;M8NIR1V
zfzDjb_zv?nl8JBE@KlL3DY@FI;x~*R5{Jzt&AbPxJ8JD0#XH!I*PXSjXsBriZ@)O|
zv=eqa8q|^QE4=(u*A_q}v<2?F{OHtV2~vt|bCH|<&<+9ACw3QonXx37u?(m$(uTv{
za6IsHJju?ZqadJb9X93#;h}I{OLTF3@idOZx&pvQe9<%}p($z5PLHhBsM=hK-5|R!
zCBiB^a?0C&8I&dpIYsc3Z_pG2gVVbjHz;-3TFBy_YP!od7QO1MVK#N*-){wBE2{g~
zI|;qsf;=AYY3GInLLYfy?=NTMm#-8@>Q4!ztnu{j#)_QZcjol=1gxAC%Mi#KCI3(d
zQ>xZQU?myn&d)09-;eMzdn7uQs_U$@d0-6oyx!VhR`8~0p#YsSj}U_;+xWqTI2|=m
z3>wLqjsRi$WeJIpDdAs&<IjtCk-dGA@}NFRU+ZKUD~l%=yP_Xt+<@-9rBD`~nNya&
z_u3~w%!b!%TT?+2aiwKa@c!~Tzl_G4?w%j8G2Shb7@VCRrCz`DphVORxQr?%fiJ9c
z4a6f{iHfYX4tSG5*Im-iJ#IdNJwjQML{YVx92>yHP7?-+;C!Il@raPDA0+FnG#4|o
z=MWKOwFZkHDt+DgdZohIO!~PCk|o!sxR3*0d<l^Y)6y%xE2tJ}sr-!UI3enM%-Btk
z)158hGqTNC?as`Cw<03Q(}aIc&n$^z>N^=O$bTV{-a2qg`estx^(S`4?Q0YASK$n#
z6x<c`-;sNNBFuqRcW}mYB~;KZWZOF{mbAJN65&e(#PUz#1DtBv;SX@Hu6YaA)mXT}
zJt-79&P1Ps5R6%Iq^4lW2JK#;KlpjaU+1Z$b$CnLPej7tR=5?QOll_r83I){hHa^Y
zfiFVc&UYehSw4u9MtXpGjYxm1SutT{Ko*34$QfY>{eA)L_vs+yie0#=njHQH^5V`R
z$<5SS;1{T~LvBOoM+KXG+Zul`G}}Xn>R9bU9y%zaUi>)VMk1TVhP8EKBrJaTROE|t
zV^`%ki>V>U8s8-P*oS`9ocO4<>=U=2A0@CddF|8DMV$<#U8?d=@H*qTQg3=h!44c{
zk_&v|*0>g*0#Q?<X{=mXjoin2o7cC(KzM?s=pSP;F^xqwo#b-NI#(KwNm8cmGn>u;
zCe4Eu8-VWBJYE(7YnVH)PxLH>Hd@O!rUhJ(SDaL9H!+*3=pGp6xGhXE9UzNt@LHV=
z7ll>Z==Xv9NQ|8gsz`=(ESVr=otrTuEQa)7Z-wC&^zlGl!k({%AiLBvO4C>!DSfFn
zO{z|b?8;tYW8QFNk^tdp&K)S-3;8?6K8o;>u;~`O0jVSwJ`GqrM2=~oMV936jJ}y&
zdpeKsU>2rV0*pVAuyHYc;uFdC`6@jGL%GQ-2K%sD$$y#f(MD?rt{!oFFIBKa)4l}5
zENsKbq3T(a(?3fp{Q~AfA31<TZ6YSW@j&iC%EgFrQ7QKsN7z2e4?WdwM3|Z{Gu`Nf
zjKqOxe5Cb9IFRu6r2{iH3Rm}y19Ge@nviCJg*(&iE`uvhaME4LvjIt9`oSY%7oeS0
zs7vhI@ruo%Q)J6QSR;jt6ySt+7w`a>3|zZKb##AuhJoohQh&$S58nyxum#KJYRaR4
z#QOWI1|k<WWz-Fe&bye%1c)7PUpUSXI|wgV5loDaHpYrj6Y%=^a0tcL9;{$5ho7N>
zL+*`l*NYY9ab=t2J)Sa4){sl+(m0=KP=la9jyeXGgU$ofT<7?8Tf;dV`I^kl6WG?q
ze65(=Y0$d>QN|hBy}(ThTh1sM2e&g9Cpp1P3B(StXywhV{it4rj+1{|p%wE#{Zn<D
z?9zh*3(H;~^f$b<tD(~r7ri0s_SsNWdL2H42#!H(u9X1j9D%38J@Y>1uKMIfPr0wh
z3{OQ%lOit=pzQ{po+B<`EF`s#gmd3}Tf=`;O-U`pCbx7kx_K3~_M?aL3GT%LauEhE
zbi7CV5(lQP2--+q*bZSR+|^|9T?B%9KP1($F0<Q64~>h#bUIp}jd_>utVAcWur_}*
z4g|Bs=+O}GDBt|v$u3kG2ZP8Ka03D(Y8g<9UA5ecSjeU+B+(tJRBWQ@)rui$o_nu0
zpr<$nT574c4r$}sf7dS-w|lyQM&<)B2XJ&$$8Bd_o)4X+SBsvU>MlI=lCVxseln9C
z*_b}N;qzn;Vx11XB;@Ijx+Pr>O|OaapJn{!d0zl7J>Wh(HAg@m7i5p{GAc&2LI;km
z6JVF!?Y5l!xnJP=Qv|k6bpp~xpcV6Yz8|QuV-40fAE0Wyce>nj!*y#@oc>LT5pBRl
z$`vF8S~?~iAVDo0bF4fa7ERJyg<1k5mVBq9R}Ya}wb?(0SQg`OFsNSBi}#u^!f)`a
z6awcMMcSFu0BJG>qHwZF8?(r?H=k9H{Q6njR6Mk_;oW<Ve8tsMJjfb~_Fl7@oCB<9
z;iSDEA-pXOTM<ZWtyxK}V`PT$?X|6gQ;h?Kmd)FIK3|h|>0F-Rn-7o5Wiu{cm8H>D
zBXaI}=ltA9v>>CpBxya1855$#e?5e@Z$D`E{&HOGl?#s$)oTrn4aO4{v<JL9tcUQU
zBs=C+P^#tL_G7MiCwih?SO|9nJ$v)zh*pL~2SYRfnji|$q!oO6{4On3>7?(V-amk>
zglh6EBfU!4ncY~;5L0*!yjAC{-9+^<y#hj`-$aEYKcKT8%{{EV`>IvRnW*a?Fh&Th
ztN`<OO2~)4O9MX_mllQ~@-aEkFwUe@{N)^$Q8sryvmXk=@}?{D>pr)f{mAuKI<zXu
z0c(5Xy<E+*(Gf5n$biKJ0x??K=#l~4!wghS5@j?XFw@;m(<QTODd0D)#FgGYMH2ko
z(NN+=tKa0BzV0+p<AW9?r584DEDP^;A8GTIy5T}&eG~Fujj=DyM<DNFF{2%;!W(tF
zu9XSw^N^0TBg6&`t+#YaabL+j$#$=cDnjjhM$XkHwx_tRGBuzqcP27sU-;=FU2*xL
zqZtrIzJ7-1SUm}ZFIll-_m9aRSFp=^r=#YTxkLJe-@_{+g`f|)fC(eh@yo+CO}%o|
zzjymGp_S)d<3WKNJb{Z=<`4K7F8YCWbP!7O5EV9?cX0mzN9A58<|N?Udbmdgq8Q>)
z3XaH~$6+vqV~UcNr=!Wd)ovbX%bCPPOXnN~E~Pu6a<HAcR>kQoW;sf-*^hLkeN)L0
z7N&kY?;H7<(@W*IAa&{SF<0N6|9FMxUsq1tYM$zkz?n$bM2>pn@A4gV1b^YK%^94R
zKe-o$n7o8O)~f;?(r)d*@2CQObu6C9;W+R9F)Mo|5izn13gh*GL*G4$Z}O6RPY#G}
zPNAvcg?@t@Xa|yU99Vj*ZP+D)p$9TQqua%F?KQ-Bd;E7NSOU8PqLip~sDO{>tV$W=
zhQcXORRnblj;f-JW}dZ2snZAyz=%c{7rRV5z!C~z`tKJRfCK>a3JHixk}45U5ElUI
z#)uyPa#|>aY}_Tnb7nf7M?B9Qv4ZbE1y(X*m_#Te1@5YBCTXa@xa%y`EaIuSuo)jP
zen#ew+EP`clu+E}1D<hnf+<FuSMaK!AnrT1$Fan9FBnJuJmkQ1qFmZqj<2YutUVCN
zf((jU>Xk_YeT*!-3k4N$zihIbX9@~{Pe6g!1DZoBpG`hlpe>Cs{r2U~aS5%=oe@C3
z`)j5GQlUpsh!W0Hc@q0mM%G)7feTICD905B#J^OAKZ*B?v$u9)|7ihW37R2q@Fw`E
zFRO>=tdmV3V}4BJ(m;xa>N8;NHuHjA-DVS-MS=BFc2N`)vbz9+Jh=7;3>R7+))1Ek
zrfGZ}G{6&toeSQQ2sEHJ2=dM&xpaj5Q5F-_quz`2yEJEyp%j(cT}cSuJ(juH$($GQ
z6C!k|r89TzxgIU&d_CUSHK&8~_(_M+DR<QWO(0Sdc<&5tJ3INL7ijeuINpzlKu+&e
zENmRWY5RQXodf#K^q8uS*nD?20`(T|XcU8FmVv}j9WK5zGi&Mw4yn69F{Sq-f(UY?
zz6?*W0k?IXyo31nL;xTQ)`8|0exFnJBE5?wN`RJb5`lPIQdRsIniaUY=zq@lZd1YO
z*mp@u0zQYe6zd@MIU~i;0baVkH=D~mwHuKn&YkY4wGQ7j(qub;elPg3m>M!4&M>Op
zUd;SX+RYBmW?L^APoXWgWoil#_F&%q9g65O#JM>W(ORmL!SgLlF{|7nN*`yNyU=FY
zgnN?-g$wH%qMLe%0L!tTAizx*q@5&jNb!*IF8LBFDe*f^sQK&)x~#R`v!M1t{<z$m
zjU=?U%Hw45hSt1cxj*X3u)O!zWdHyGd+3wAEs7VclP1Nq6wZkDDN%z#V@kidLuNK*
z8;!WkH)C7EGEeagCW6<|Oo!~++&!QqaMe2%q_K?^u)30tAhGFt=tb~TWKSNJg~GD#
z7jAry?S!qmGvvM$E7^x0t6j~0q{60?n!E(szT8mYx|0JJ&*%wg(0UtTzS|7(DF!(d
zyl2aMUPZ_s_$}N(*NrhA1=GhFN-lL)F1;pa=f4p7H-o)~J0mJnOt=4DNd6UQzA&f+
z>Pmcy#fQnMv*7!igP=cJ8!gZM002lFbc1JR90TBSnXvL>D=d>Xy+?5;hDAF4qt`3p
zc>CZZ{+1^{RfmaWJ~49cUo6m2qKS0f?JP(N7LYY?IBv}>kG6kqIDVYd=+A%gsCZI0
zaxopto#zw7^L)QEAo^)dYea97Me*x#^uMbH{eHKD*3=6v=$3p`^g%>e6eqjlG3Lqv
z06aydb)A*JC!$DmM%RxNHp1%WmBEuVN!Yn%D(N)1B^(-zQ>=!cg=?1EHw^h#?{oP|
zj|Hqzx!-d(POClqks`nkiqadpZl2;A&R1NC;db8#wFkGNMgCo!Ej)ml_W5=pYiB(G
zZ1vA}@{*b64lGl8{4O#oPRbctfN?D)>a#qS-@nhF4O|2xB84BN_u!gq%VKH*z7pzr
zn1wFYBjFEB9N<!xp4okcZ*F=PY4+-Tkjd?h+vI8azBs+^-H)BP8JD(s<2wFQ?1s_~
z?0_$k0OYs=P4kPmj<RPo_A6Gc3$LPg`kS}28Y~}4L79vnf6D3<<XlwR3ubmfJJmWk
zK^r$=>5g+-SD@~<s*tmEMraJ)s?Dh<4L39)<qP|%2H1Y{Pvleh+H>DQ7TSqhCGLXh
z181VL%9I|_Oy)r-i4)3H3Yz$e7Y4+`73Q+cGS(*PCBvsZfnRNCTuF{_ol1FT8+|&E
zVya{a+N%=ecis=bm&<9TRvbr(YnB5jQ8;Tsg$Ss6k*|s}McFU=VHjfK!NuP>(L!m%
zs@rut1QABg2^0^qltYuKuZ|bkm35((g$*H9kIg|caIy*W>)=1GtMDiUu{}9iGmp=L
z^@A~jy}esC$V+cw@X`Kyb~VsSp6f*#IWQH(Fohbp7Jcd_|1HReS#3gcQXWfV=S<fS
zhso*)cNmg;M3qrHRg+Ay6)XiEMvUe;1>+kCfzcl@U1c3r>Z0E9)ONTNi;ud#i&D7J
z0<p))Uf|5Mf<YnZ^k6t1CzWrbqvHm}QW^n_$P`ecR&rrP!A{0;9VR}&ws*+`<sOfe
zch^d~2+N;E*l-wCG_;e?G0nUbF=i{}&8i<sqZ{X>4{%nkFziD_S`;&lc5@AxW#0Sp
zP9bF~=px{9CV*>|UMXw~Rf6V>)d#<I!sz|9To$kv4ptm*8n}o+*ZuENXTYYyAjt|4
zW*L9CzrXB7PQ1+?DB3J^jB2`_=Y<mXr00PbMSiee9?i&+65e}Y_6^%dq<j@(o)54T
zLi<O1$7I(5pBoPjZ6nGh=KOa2PW`&iX1T_8%H5BM-Xp4llQi`~)V6_|O;>fw1^{24
zpC4D#E@l^lx**)pvh3=al|M2^ujB58%fB)Ps#&p(Ftx-10a9gMYg5k$LuRVM;p>v-
znQY$gMcZs<_%Tr7>`R+%4&Fi6Lnl?maVITu$=5JO<*9Xdi2Sl7@y<rv3Rl@JQFE7M
z$yKy<W=5H*UCtEQe*jqRp_&u=dE0=Y6!(tvy<yiPyC$R`^`n-h>f=k^At?zkOh;T&
zF!O&&LQX?7xmL3hGY0BIu78ikb%gptQ7n*!e^##{rtW>bg++_1VgId@UlGW`y}Ri;
z<X34B!k>qC;V`cXX7a1e@kEkIl611~g1HyARjZ!?xBtgB_NP$pV$n*W_nje-#Wu+V
zPK}EpjF9-rCYt0!zMHlI=ztc!3Ya*E-f$BT&VE1S;6AHN2v#(RSm8wQ*)z5sEvyLz
zY3pn)g=2?ufl|@E7@nw~p4Ir2p}8vL^8tYP(YgST{hr$${gAMPP)>ofm74%_i2A$!
zzuF)_7}2pkVaJ309%1p<J8+btlGcfeG84SP^6uD(YIIjRjpl!>Rg$;>Gz73cRJDc{
z5CKyu08E>IH2Pn`k`@90GIux@{?&5$6aMpA2>~FtNau8`X(+#~%h=c*F}8gZe}GD_
z(?$`28>8jDzJuM<L6?kqfFupICxUzZ*9M01^+RbpMBI0EwB3eK<?lEu0Oat$10c_W
zZ-L%GFHAXb1ttOo&QdIy8J-F@+*UBIpV)ynjyp#h(pJjk8{<c(68_u$b@JV%8erHc
z`<;aZxA%+x0)Xm_m36y7PdQ~5p(O9Cvg+^=<Cyx3b4A{zDC=vtI$g6|d7N1WgsV&c
zZXgr|3s1>^DpE%+K;_|vA$<cI{gM!u7j8nq@694k<<bo@m+wdNn$c<8{bC>1R$><{
z7-+mt;eAMi#308;Iy$AD)r|2Rt1qbW?Mvp4aFfdn3}G%ERg7!OT!$r2Nv5S9Y{!KS
z%=05qsw70VYI(lWvpB*2ajC@p>$ni+@l>a1b|=0FDNypwNaq?VcxULOdPrORXj*_~
z(zC{R5rWVdx8zpir(Sd=g5K&HBYefPhhskrymt}}BDu@bn*GUcv$NzS9i$2Zo4%r3
zvu}TyX2&;2%KoX4H}@l*n;|Qz=+Or$m1#w0w~#19a;VuuBLILcku3kiLhCQ&yNb$I
zB&_Q2&NFXTj-qvZoA*hWIPg}`v#>1LJ2I;I$26wiJ_`67NPRx$0Z9PqhS%H(E}3yY
zpBhZedhL7(@b2h6;jlHumsrSNSS76tJf^{q4<Vazg(4{XfPPjev~^c?%`;VZo8ZYS
zoo6rgPv}Dp*Ko96A3H8GX37y%h(t&OV)}~CU^V|2y@TPUTZhb|EuBR^NU^@=MfxV^
zX(&l4K^#N#nXXxO2B(`n@X+=;p^i1cfQqGrJZd0R1&_vYs%N3~WiSnxb9FsZ<?@0T
zT8D=>gA))Vvg##V;kjgg9fmAn!MRyB>bcRKXxaBU9IFMY0!{F2MwVE;KiM@@`hn;r
z2dewo_v_MwV99H+_Vuor!5rr+{egr@H~?G?-m)>rFBuZRNRYmocgW^YBuXkho^9sx
zo`+F1_%YY=b-1Ybo)utDG|tJO)!vb&|D6{@gwzdiU>NzR!UKu~Ot;e$rMnDE){ni|
z27DGe)WqLksacf7z~cTqEAe8>LE#$9s+Dn4V;vSXaF&|~QK0Axv>ZcAa6Q_=zYz(J
zYP<c#71~qqUuxh7VBa9Q_xak(ru9caUoG#JzqYgxD^;dIlkD#CNK@LHLwDH*;JK>}
zy96!hliwG;%2p6GG-8_bpC@B)7Ohn0vNasKY_)DSjiachy?4%9scX}4cgsFzgB?<l
zQJr(r*9!5VH}Z>9hX+xB`xYN++>orpD4SXOU31QXesyo?;59XmXrmzd^QC}Id)&zd
z9wp;`oKx!pa3yi72K#+Mh+a(np4bErlq_zOrXP4f2-KFFKXx?n)7*CcPXML>S^w!q
z(YJlyhF5{IhN~FGrf7F>y4jL_+yDZEYSzQCG`OJDf+9K;Ci~zPY=pE01NIdzdvq3H
zK(=m$O3Rgjt4-Wyi9(imhv<61H<+uU2bSzD;E_%n#u(o~9%GaL0*6}rb=IH#4y%wz
z=>Wdfq(S>kF{R{>=mV1g00000Ec-g?ex_DC&TUW&xd+y;`!`ey7h1L%yeBba3nx@2
L-1!KjUH||9`#^L`

diff --git a/app/src/main/res/drawable/abs_timer.xml b/app/src/main/res/drawable/abs_timer.xml
deleted file mode 100644
index 9bd6f56df..000000000
--- a/app/src/main/res/drawable/abs_timer.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/md_orange_A400" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/color_gradient.xml b/app/src/main/res/drawable/color_gradient.xml
deleted file mode 100755
index fe3a193c1..000000000
--- a/app/src/main/res/drawable/color_gradient.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-    <gradient
-        android:angle="90"
-        android:endColor="@android:color/transparent"
-        android:startColor="#80000000"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/et_bg_circular_top_corners.xml b/app/src/main/res/drawable/et_bg_circular_top_corners.xml
index 7f17d0598..35ea574f2 100644
--- a/app/src/main/res/drawable/et_bg_circular_top_corners.xml
+++ b/app/src/main/res/drawable/et_bg_circular_top_corners.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <corners android:radius="8dp" />
    <padding
        android:bottom="12dp"
        android:left="12dp"
        android:right="12dp"
        android:top="12dp" />
    <solid android:color="@color/md_blue_A200" />
</shape>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <corners android:radius="8dp" />
    <solid android:color="#80448AFF" />
</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/gradient.xml b/app/src/main/res/drawable/gradient.xml
deleted file mode 100644
index dd54e4c6a..000000000
--- a/app/src/main/res/drawable/gradient.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient
-        android:angle="90"
-        android:endColor="#FD6A83"
-        android:startColor="#FFA26E"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/gradient_2.xml b/app/src/main/res/drawable/gradient_2.xml
deleted file mode 100644
index d19895a26..000000000
--- a/app/src/main/res/drawable/gradient_2.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient
-        android:angle="135"
-        android:endColor="#b224ef"
-        android:startColor="#7579ff"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/gradient_7.xml b/app/src/main/res/drawable/gradient_7.xml
deleted file mode 100644
index 975e235ca..000000000
--- a/app/src/main/res/drawable/gradient_7.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient
-        android:angle="135"
-        android:endColor="@color/md_cyan_500"
-        android:startColor="@color/md_light_blue_500" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/holiday_background.xml b/app/src/main/res/drawable/holiday_background.xml
deleted file mode 100644
index 55adb780e..000000000
--- a/app/src/main/res/drawable/holiday_background.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient
-        android:angle="90"
-        android:endColor="@color/md_red_A700"
-        android:startColor="@color/md_red_A100" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_app_icon_with_shadow.xml b/app/src/main/res/drawable/ic_app_icon_with_shadow.xml
deleted file mode 100644
index 9eaf32423..000000000
--- a/app/src/main/res/drawable/ic_app_icon_with_shadow.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="108"
-    android:viewportWidth="108" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="0.1" android:fillColor="#FF000000"
-        android:pathData="M42,69.53 L90,108h18V68.55L66,36c-2.58,0.91 -6,2.6 -8,5.92C54.8,47.18 57.91,52 56,57.7 54.84,61.14 51.65,65.74 42,69.53Z" android:strokeAlpha="0.1"/>
-    <path android:fillColor="#fff" android:pathData="M53.91,39.64h0V58.38c-0.32,-0.18 -0.66,-0.33 -1,-0.48A9,9 0,0 1,57.05 70a10.88,10.88 0,0 0,1.43 -4.39V45H53.91Z"/>
-    <path android:fillColor="#fff" android:pathData="M52.91,57.9A9,9 0,1 0,58 66,9 9,0 0,0 52.91,57.9Z"/>
-    <path android:fillColor="#fff" android:pathData="M54.16,36.35h12.19v8.43h-12.19z"/>
-    <path android:fillColor="#fff" android:pathData="M66.1,36.6v7.93H54.41V36.6H66.1m0.5,-0.5H53.91V45H66.6V36.1Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_audio_tag_square.xml b/app/src/main/res/drawable/ic_audio_tag_square.xml
deleted file mode 100644
index 3cfbf30ce..000000000
--- a/app/src/main/res/drawable/ic_audio_tag_square.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="256dp"
-    android:height="256dp"
-    android:viewportWidth="256"
-    android:viewportHeight="256">
-  <path
-      android:pathData="m0,0 l0,256 256,0 0,-256 -256,0zM128,64 L176,64 176,80 144,80 144,160a32,32 0,0 1,-32 32,32 32,0 0,1 -32,-32 32,32 0,0 1,32 -32,32 32,0 0,1 16,4.313l0,-52.313 0,-16z"
-      android:strokeAlpha="1"
-      android:strokeLineJoin="round"
-      android:strokeWidth="4"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"
-      android:fillType="evenOdd"
-      android:fillAlpha="1"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_facebook.xml b/app/src/main/res/drawable/ic_facebook.xml
deleted file mode 100644
index 6b2fa5b9b..000000000
--- a/app/src/main/res/drawable/ic_facebook.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/facebook.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M17,2V2H17V6H15C14.31,6 14,6.81 14,7.5V10H14L17,10V14H14V22H10V14H7V10H10V6A4,4 0 0,1 14,2H17Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_google_plus_white_24dp.xml b/app/src/main/res/drawable/ic_google_plus_white_24dp.xml
deleted file mode 100644
index 6c2c66b03..000000000
--- a/app/src/main/res/drawable/ic_google_plus_white_24dp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- drawable/ic_google_pluslus.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M23,11H21V9H19V11H17V13H19V15H21V13H23M8,11V13.4H12C11.8,14.4 10.8,16.4 8,16.4C5.6,16.4 3.7,14.4 3.7,12C3.7,9.6 5.6,7.6 8,7.6C9.4,7.6 10.3,8.2 10.8,8.7L12.7,6.9C11.5,5.7 9.9,5 8,5C4.1,5 1,8.1 1,12C1,15.9 4.1,19 8,19C12,19 14.7,16.2 14.7,12.2C14.7,11.7 14.7,11.4 14.6,11H8Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 3e01a5427..000000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-  <gradient
-    android:angle="135"
-    android:centerColor="#6945FF"
-    android:endColor="#EC3C59"
-    android:startColor="#3393FA"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index 41bf969e8..000000000
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="108dp"
-        android:height="108dp"
-        android:viewportWidth="135"
-        android:viewportHeight="135">
-    <group android:translateX="13.5"
-            android:translateY="13.5">
-      <path
-          android:fillColor="#FF000000"
-          android:pathData="M44,72l35,36h29V73.8L68,34c-2.74,0.28 -6.49,1.13 -9,4 -3.53,4 -2.09,9.18 -3,15C55.23,57.9 52.58,64.62 44,72Z"
-          android:strokeAlpha="0.1"
-          android:fillAlpha="0.1"/>
-      <path
-          android:pathData="M52.9,34.2V54.57A10.32,10.32 0,0 0,49.6 54a9.9,9.9 0,1 0,9.9 9.9V40.8h8.8V34.2Z"
-          android:fillColor="#fff"/>
-    </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_patreon.xml b/app/src/main/res/drawable/ic_patreon.xml
deleted file mode 100644
index 2e11a0d15..000000000
--- a/app/src/main/res/drawable/ic_patreon.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/patreon.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M14.73,3C18.45,3 21.47,6.03 21.47,9.76C21.47,13.47 18.45,16.5 14.73,16.5C11,16.5 7.97,13.47 7.97,9.76C7.97,6.03 11,3 14.73,3M2.7,21V3H6V21H2.7Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_person_white_24dp.xml b/app/src/main/res/drawable/ic_person_white_24dp.xml
deleted file mode 100644
index c917f3810..000000000
--- a/app/src/main/res/drawable/ic_person_white_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@color/md_white_1000"
-      android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4S8,5.79 8,8S9.79,12 12,12zM12,14c-2.67,0 -8,1.34 -8,4v1c0,0.55 0.45,1 1,1h14c0.55,0 1,-0.45 1,-1v-1C20,15.34 14.67,14 12,14z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_round_add_a_photo_white_24dp.xml b/app/src/main/res/drawable/ic_round_add_a_photo_white_24dp.xml
new file mode 100644
index 000000000..0ebf2312b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_round_add_a_photo_white_24dp.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M3,8c0,0.55 0.45,1 1,1s1,-0.45 1,-1V6h2c0.55,0 1,-0.45 1,-1c0,-0.55 -0.45,-1 -1,-1H5V2c0,-0.55 -0.45,-1 -1,-1S3,1.45 3,2v2H1C0.45,4 0,4.45 0,5c0,0.55 0.45,1 1,1h2V8z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M13,14m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M21,6h-3.17l-1.24,-1.35C16.22,4.24 15.68,4 15.12,4h-6.4C8.89,4.3 9,4.63 9,5c0,1.1 -0.9,2 -2,2H6v1c0,1.1 -0.9,2 -2,2c-0.37,0 -0.7,-0.11 -1,-0.28V20c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8C23,6.9 22.1,6 21,6zM13,19c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5s5,2.24 5,5S15.76,19 13,19z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_vector_square.xml b/app/src/main/res/drawable/ic_vector_square.xml
deleted file mode 100644
index c58ff1944..000000000
--- a/app/src/main/res/drawable/ic_vector_square.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M2,2H8V4H16V2H22V8H20V16H22V22H16V20H8V22H2V16H4V8H2V2M16,8V6H8V8H6V16H8V18H16V16H18V8H16M4,4V6H6V4H4M18,4V6H20V4H18M4,18V20H6V18H4M18,18V20H20V18H18Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_water_bottle_white_24dp.xml b/app/src/main/res/drawable/ic_water_bottle_white_24dp.xml
deleted file mode 100644
index cbd6c961c..000000000
--- a/app/src/main/res/drawable/ic_water_bottle_white_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="511.936"
-    android:viewportWidth="511.936">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M350.7,169.8c-0.8,-2 -2,-3.7 -3.5,-5.2c-0,-0 -0,-0.1 -0,-0.1c-23.5,-23 -38.8,-53.6 -43.2,-86.2V16c0,-8.8 -7.2,-16 -16,-16h-64c-8.8,0 -16,7.2 -16,16v62.4c-4.4,32.6 -19.7,63.1 -43.2,86.1c0,0 0,0 -0,0.1c-1.5,1.4 -2.7,3.2 -3.5,5.2c-0.8,1.9 -1.2,4 -1.2,6.1c0,0 0,0.1 0,0.1v128c0,0.3 0.1,0.4 0.1,0.7c0,1 0.4,2 0.6,3c0.3,1.1 0.5,2.2 1,3.2c0.1,0.2 0.1,0.4 0.2,0.6c18.7,35.4 18.7,77.6 0,113c-1.2,2.3 -1.9,4.9 -1.9,7.5v48c0,17.7 14.3,32 32,32h128c17.7,0 32,-14.3 32,-32v-48c0,-2.6 -0.6,-5.2 -1.9,-7.5c-18.7,-35.4 -18.7,-77.6 0,-113c0.1,-0.2 0.1,-0.4 0.2,-0.6c0.5,-1 0.7,-2.1 0.9,-3.2c0.3,-1 0.6,-2 0.6,-3c0,-0.3 0.2,-0.4 0.2,-0.7v-128c0,-0 0,-0.1 0,-0.1C351.9,173.8 351.6,171.7 350.7,169.8zM240,32h32v32h-32V32zM236.8,96h38.3c4.9,22.9 14,44.7 27.2,64h-92.7C222.8,140.6 231.9,118.9 236.8,96zM320,479.9h-128v-44.1c18,-36.3 20.5,-77.9 7.9,-115.8h112.2c-12.6,37.9 -10.1,79.5 7.9,115.8V479.9zM320,288h-128v-96h128V288z" />
-</vector>
diff --git a/app/src/main/res/drawable/lockscreen_gradient.xml b/app/src/main/res/drawable/lockscreen_gradient.xml
deleted file mode 100644
index 10c5e26c8..000000000
--- a/app/src/main/res/drawable/lockscreen_gradient.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="150dp" />
-    <gradient
-        android:angle="135"
-        android:endColor="@color/md_blue_A200"
-        android:startColor="@color/md_green_A700" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/material_icons.xml b/app/src/main/res/drawable/material_icons.xml
deleted file mode 100644
index f270a2182..000000000
--- a/app/src/main/res/drawable/material_icons.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <padding
-                android:bottom="8dp"
-                android:left="8dp"
-                android:right="8dp"
-                android:top="8dp"/>
-            <gradient
-                android:angle="135"
-                android:endColor="@color/md_light_blue_A200"
-                android:startColor="@color/md_blue_A700"/>
-        </shape>
-    </item>
-    <item android:drawable="@drawable/ic_vector_square">
-
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/mini_player_progress_drawable.xml b/app/src/main/res/drawable/mini_player_progress_drawable.xml
deleted file mode 100644
index 712902f0c..000000000
--- a/app/src/main/res/drawable/mini_player_progress_drawable.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@android:id/progress">
-        <clip>
-            <shape>
-                <gradient
-                    android:endColor="@color/md_blue_A700"
-                    android:startColor="@color/md_green_A200"/>
-            </shape>
-        </clip>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shadow.xml b/app/src/main/res/drawable/shadow.xml
deleted file mode 100644
index 2ebc56461..000000000
--- a/app/src/main/res/drawable/shadow.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <gradient
-        android:angle="90"
-        android:endColor="@android:color/transparent"
-        android:startColor="#616161" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shadow_down_edited.xml b/app/src/main/res/drawable/shadow_down_edited.xml
deleted file mode 100644
index 7e7178e22..000000000
--- a/app/src/main/res/drawable/shadow_down_edited.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-    <gradient
-        android:angle="90"
-        android:endColor="#DD000000"
-        android:startColor="#00000000"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shadow_left_to_right.xml b/app/src/main/res/drawable/shadow_left_to_right.xml
deleted file mode 100644
index 16ba6f80e..000000000
--- a/app/src/main/res/drawable/shadow_left_to_right.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient
-        android:endColor="@color/md_black_1000"
-        android:startColor="@android:color/transparent" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shadow_up_details.xml b/app/src/main/res/drawable/shadow_up_details.xml
deleted file mode 100644
index b81cbed3b..000000000
--- a/app/src/main/res/drawable/shadow_up_details.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-  android:shape="rectangle">
-  <gradient
-    android:angle="90"
-    android:endColor="@android:color/transparent"
-    android:startColor="@color/md_black_1000"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_button_edit.xml b/app/src/main/res/drawable/shape_button_edit.xml
deleted file mode 100644
index 49065e704..000000000
--- a/app/src/main/res/drawable/shape_button_edit.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="false" android:state_selected="false">
-        <shape android:shape="rectangle">
-            <corners android:radius="50dp" />
-            <solid android:color="@android:color/white" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_rounded_edit.xml b/app/src/main/res/drawable/shape_rounded_edit.xml
deleted file mode 100644
index ead9e011a..000000000
--- a/app/src/main/res/drawable/shape_rounded_edit.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="false" android:state_selected="false">
-        <shape android:shape="rectangle">
-            <corners android:radius="150dp" />
-            <solid android:color="#9E9E9E" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shuffle_line_background.xml b/app/src/main/res/drawable/shuffle_line_background.xml
deleted file mode 100644
index a551082d6..000000000
--- a/app/src/main/res/drawable/shuffle_line_background.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="25dp" />
-    <solid android:color="@android:color/white" />
-    <padding
-        android:left="48dp"
-        android:right="48dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/square_play_button.xml b/app/src/main/res/drawable/square_play_button.xml
deleted file mode 100644
index 6fe74edc8..000000000
--- a/app/src/main/res/drawable/square_play_button.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <padding
-                android:bottom="8dp"
-                android:left="8dp"
-                android:right="8dp"
-                android:top="8dp"/>
-            <gradient
-                android:angle="135"
-                android:endColor="@color/md_blue_A700"
-                android:startColor="@color/md_green_A200"/>
-
-        </shape>
-    </item>
-    <item android:drawable="@drawable/ic_play_arrow_white_24dp"/>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/square_play_button_design.xml b/app/src/main/res/drawable/square_play_button_design.xml
deleted file mode 100644
index c76f83ae4..000000000
--- a/app/src/main/res/drawable/square_play_button_design.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <padding
-                android:bottom="8dp"
-                android:left="8dp"
-                android:right="8dp"
-                android:top="8dp"/>
-            <gradient
-                android:angle="135"
-                android:endColor="@color/md_blue_A700"
-                android:startColor="@color/md_green_A200"/>
-
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_album_tag_editor.xml b/app/src/main/res/layout-land/activity_album_tag_editor.xml
index 29e8ee6c8..9bf50ed80 100644
--- a/app/src/main/res/layout-land/activity_album_tag_editor.xml
+++ b/app/src/main/res/layout-land/activity_album_tag_editor.xml
@@ -5,155 +5,197 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/app_bar"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:elevation="0dp"
-        app:elevation="0dp">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
-            style="@style/Toolbar"
-            app:layout_collapseMode="pin"
-            app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp">
+            style="@style/Toolbar48"
+            app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
+            tools:ignore="UnusedAttribute">
 
-            <Button
-                android:id="@+id/edit"
-                style="@style/Widget.AppCompat.Button.Borderless.Colored"
+
+            <TextView
+                android:id="@+id/title"
+                fontPath="@string/circular_std_black"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:text="@string/edit_cover" />
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:text="@string/action_tag_editor"
+                android:textAppearance="@style/TextAppearance.AppCompat.Large"
+                tools:ignore="MissingPrefix" />
+
         </androidx.appcompat.widget.Toolbar>
-    </com.google.android.material.appbar.AppBarLayout>
 
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginEnd="96dp"
-        android:layout_marginStart="96dp"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <androidx.cardview.widget.CardView
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:cardCornerRadius="8dp"
-            app:cardElevation="4dp"
-            app:cardUseCompatPadding="true">
+            android:orientation="horizontal">
 
-            <LinearLayout
+            <FrameLayout
+                android:id="@+id/image_container"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="vertical">
+                android:layout_weight="1"
+                app:layout_collapseMode="parallax"
+                app:layout_collapseParallaxMultiplier="0.5">
 
-                <code.name.monkey.retromusic.views.WidthFitSquareLayout
-                    android:id="@+id/image_container"
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/image"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    app:layout_collapseMode="parallax"
-                    app:layout_collapseParallaxMultiplier="0.5">
+                    android:scaleType="centerCrop"
+                    android:transitionName="@string/transition_album_art"
+                    tools:ignore="UnusedAttribute" />
 
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:id="@+id/image"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:scaleType="centerCrop"
-                        android:transitionName="@string/transition_album_art"
-                        tools:ignore="UnusedAttribute" />
+                <ProgressBar
+                    android:id="@+id/progressBar"
+                    style="?android:attr/progressBarStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:visibility="gone" />
 
-                    <ProgressBar
-                        android:id="@+id/progressBar"
-                        style="?android:attr/progressBarStyle"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:visibility="gone" />
+            </FrameLayout>
+
+            <androidx.core.widget.NestedScrollView
+                android:id="@+id/content"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@color/md_white_1000"
+                app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-                </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
                 <LinearLayout
                     android:id="@+id/editables"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:orientation="vertical"
                     android:padding="8dp">
 
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
 
-                        <EditText
-                            android:id="@+id/title"
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/album_title_container"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:boxBackgroundMode="outline"
+                        app:boxCollapsedPaddingTop="16dp"
+                        app:boxCornerRadiusBottomEnd="8dp"
+                        app:boxCornerRadiusBottomStart="8dp"
+                        app:boxCornerRadiusTopEnd="8dp"
+                        app:boxCornerRadiusTopStart="8dp"
+                        app:boxStrokeColor="?android:attr/textColorPrimary"
+                        app:boxStrokeWidth="1dp"
+                        app:hintEnabled="true">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/album_title"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:fontFamily="sans-serif-medium"
-                            android:gravity="center_vertical"
+                            android:background="@null"
                             android:hint="@string/album"
                             android:inputType="text|textCapWords"
                             android:maxLines="1"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Title" />
-
+                            android:padding="16dp"
+                            android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
                     </com.google.android.material.textfield.TextInputLayout>
 
                     <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/album_artist_container"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        app:boxBackgroundMode="outline"
+                        app:boxCollapsedPaddingTop="16dp"
+                        app:boxCornerRadiusBottomEnd="8dp"
+                        app:boxCornerRadiusBottomStart="8dp"
+                        app:boxCornerRadiusTopEnd="8dp"
+                        app:boxCornerRadiusTopStart="8dp"
+                        app:boxStrokeColor="?android:attr/textColorPrimary"
+                        app:boxStrokeWidth="1dp"
+                        app:hintEnabled="true">
 
-                        <EditText
+                        <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/album_artist"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:fontFamily="sans-serif"
-                            android:gravity="center_vertical"
+                            android:background="@null"
                             android:hint="@string/album_artist"
                             android:inputType="text|textCapWords"
                             android:maxLines="1"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Title" />
-
+                            android:padding="16dp"
+                            android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
                     </com.google.android.material.textfield.TextInputLayout>
 
                     <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/genre_container"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        app:boxBackgroundMode="outline"
+                        app:boxCollapsedPaddingTop="16dp"
+                        app:boxCornerRadiusBottomEnd="8dp"
+                        app:boxCornerRadiusBottomStart="8dp"
+                        app:boxCornerRadiusTopEnd="8dp"
+                        app:boxCornerRadiusTopStart="8dp"
+                        app:boxStrokeColor="?android:attr/textColorPrimary"
+                        app:boxStrokeWidth="1dp"
+                        app:hintEnabled="true">
 
-                        <EditText
+                        <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/genre"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:fontFamily="sans-serif"
-                            android:gravity="center_vertical"
+                            android:background="@null"
                             android:hint="@string/genre"
                             android:inputType="text|textCapWords"
                             android:maxLines="1"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Title" />
-
+                            android:padding="16dp"
+                            android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
                     </com.google.android.material.textfield.TextInputLayout>
 
                     <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/year_container"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        app:boxBackgroundMode="outline"
+                        app:boxCollapsedPaddingTop="16dp"
+                        app:boxCornerRadiusBottomEnd="8dp"
+                        app:boxCornerRadiusBottomStart="8dp"
+                        app:boxCornerRadiusTopEnd="8dp"
+                        app:boxCornerRadiusTopStart="8dp"
+                        app:boxStrokeColor="?android:attr/textColorPrimary"
+                        app:boxStrokeWidth="1dp"
+                        app:hintEnabled="true">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/year"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:fontFamily="sans-serif"
-                            android:gravity="center_vertical"
+                            android:background="@null"
                             android:hint="@string/year"
                             android:inputType="text|number"
                             android:maxLines="1"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Title" />
-
+                            android:padding="16dp"
+                            android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
                     </com.google.android.material.textfield.TextInputLayout>
-
                 </LinearLayout>
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
-    </androidx.core.widget.NestedScrollView>
+
+            </androidx.core.widget.NestedScrollView>
+        </LinearLayout>
+    </LinearLayout>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/save_fab"
diff --git a/app/src/main/res/layout-land/fragment_banner_home.xml b/app/src/main/res/layout-land/fragment_banner_home.xml
index bb5c144fc..1abe8b2ca 100644
--- a/app/src/main/res/layout-land/fragment_banner_home.xml
+++ b/app/src/main/res/layout-land/fragment_banner_home.xml
@@ -20,83 +20,68 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <FrameLayout
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:elevation="0dp"
+            app:elevation="0dp"
+            tools:ignore="UnusedAttribute">
+
+            <com.google.android.material.appbar.CollapsingToolbarLayout
+                android:id="@+id/collapsing_toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_scrollFlags="scroll|enterAlways"
+                app:titleEnabled="false">
+
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/toolbar"
+                    style="@style/Toolbar48"
+                    app:layout_collapseMode="pin"
+                    tools:ignore="UnusedAttribute">
+
+                    <TextView
+                        android:id="@+id/title"
+                        style="@style/BigTitleTextAppearance"
+                        android:text="@string/app_name" />
+
+                    <code.name.monkey.retromusic.views.CircularImageView
+                        android:id="@+id/user_image"
+                        android:layout_width="36dp"
+                        android:layout_height="36dp"
+                        android:layout_gravity="end"
+                        android:layout_marginEnd="16dp"
+                        app:civ_border="false" />
+                </androidx.appcompat.widget.Toolbar>
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/content_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/horizontal_margin"
-            android:layout_marginEnd="@dimen/horizontal_margin">
+            android:layout_marginEnd="@dimen/horizontal_margin"
+            android:layout_weight="1"
+            android:background="@drawable/bg_circular_top_corners"
+            android:elevation="@dimen/card_elevation"
+            app:behavior_overlapTop="24dp"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <include layout="@layout/retro_backdrop" />
-        </FrameLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <com.google.android.material.appbar.AppBarLayout
-                android:id="@+id/app_bar"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:elevation="0dp"
-                app:elevation="0dp"
-                tools:ignore="UnusedAttribute">
+                android:descendantFocusability="blocksDescendants"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:orientation="vertical">
 
-                <com.google.android.material.appbar.CollapsingToolbarLayout
-                    android:id="@+id/collapsing_toolbar"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:layout_scrollFlags="scroll|enterAlways"
-                    app:titleEnabled="false">
+                <include layout="@layout/abs_playlists" />
 
-                    <androidx.appcompat.widget.Toolbar
-                        android:id="@+id/toolbar"
-                        style="@style/Toolbar48"
-                        app:layout_collapseMode="pin"
-                        tools:ignore="UnusedAttribute">
-
-                        <TextView
-                            android:id="@+id/title"
-                            style="@style/BigTitleTextAppearance"
-                            android:text="@string/app_name" />
-
-                        <code.name.monkey.retromusic.views.CircularImageView
-                            android:id="@+id/user_image"
-                            android:layout_width="36dp"
-                            android:layout_height="36dp"
-                            android:layout_gravity="end"
-                            android:layout_marginEnd="16dp"
-                            app:civ_border="false" />
-                    </androidx.appcompat.widget.Toolbar>
-                </com.google.android.material.appbar.CollapsingToolbarLayout>
-            </com.google.android.material.appbar.AppBarLayout>
-
-            <androidx.core.widget.NestedScrollView
-                android:id="@+id/content_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/horizontal_margin"
-                android:layout_marginEnd="@dimen/horizontal_margin"
-                android:layout_weight="1"
-                android:background="@drawable/bg_circular_top_corners"
-                android:elevation="@dimen/card_elevation"
-                app:behavior_overlapTop="24dp"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:descendantFocusability="blocksDescendants"
-                    android:focusable="true"
-                    android:focusableInTouchMode="true"
-                    android:orientation="vertical">
-
-                    <include layout="@layout/abs_playlists" />
-
-                    <include layout="@layout/home_section_content" />
-                </LinearLayout>
-            </androidx.core.widget.NestedScrollView>
-        </LinearLayout>
+                <include layout="@layout/home_section_content" />
+            </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_home.xml b/app/src/main/res/layout-land/fragment_home.xml
index 56e0ebf92..8d9dd9bdd 100644
--- a/app/src/main/res/layout-land/fragment_home.xml
+++ b/app/src/main/res/layout-land/fragment_home.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent">
 
     <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appbar"
+        android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         tools:ignore="UnusedAttribute">
diff --git a/app/src/main/res/layout-land/retro_backdrop.xml b/app/src/main/res/layout-land/retro_backdrop.xml
deleted file mode 100644
index 30c226f47..000000000
--- a/app/src/main/res/layout-land/retro_backdrop.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/menu_container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingTop="72dp"
-    tools:ignore="MissingPrefix">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-            android:id="@+id/action_home"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="4dp"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:padding="12dp"
-            android:text="@string/home" />
-
-        <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-            android:id="@+id/action_library"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="4dp"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:padding="12dp"
-            android:text="@string/library" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-            android:id="@+id/action_folders"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="4dp"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:padding="12dp"
-            android:text="@string/folders" />
-
-        <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-            android:id="@+id/action_settings"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="4dp"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:padding="12dp"
-            android:text="@string/action_settings" />
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/retro_backdrop.xml b/app/src/main/res/layout-sw600dp/retro_backdrop.xml
deleted file mode 100644
index 92854c2a3..000000000
--- a/app/src/main/res/layout-sw600dp/retro_backdrop.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/menu_container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:paddingTop="72dp"
-    tools:ignore="MissingPrefix">
-
-
-    <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-        android:id="@+id/action_home"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="4dp"
-        android:layout_weight="1"
-        android:padding="12dp"
-        android:text="@string/home"
-        android:textColor="?android:attr/textColorPrimary" />
-
-    <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-        android:id="@+id/action_library"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="4dp"
-        android:layout_weight="1"
-        android:padding="12dp"
-        android:text="@string/library"
-        android:textColor="?android:attr/textColorPrimary" />
-
-    <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-        android:id="@+id/action_folders"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="4dp"
-        android:layout_weight="1"
-        android:padding="12dp"
-        android:text="@string/folders"
-        android:textColor="?android:attr/textColorPrimary" />
-
-    <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-        android:id="@+id/action_settings"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="4dp"
-        android:layout_weight="1"
-        android:padding="12dp"
-        android:text="@string/action_settings"
-        android:textColor="?android:attr/textColorPrimary" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge-land/activity_album_tag_editor.xml b/app/src/main/res/layout-xlarge-land/activity_album_tag_editor.xml
deleted file mode 100644
index c708bbd08..000000000
--- a/app/src/main/res/layout-xlarge-land/activity_album_tag_editor.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/gradient_background"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/app_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:elevation="0dp"
-        app:elevation="0dp">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            style="@style/Toolbar"
-            app:layout_collapseMode="pin">
-
-            <Button
-                android:id="@+id/edit"
-                style="@style/Widget.AppCompat.Button.Borderless.Colored"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:text="@string/edit_cover" />
-        </androidx.appcompat.widget.Toolbar>
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginEnd="156dp"
-        android:layout_marginStart="156dp"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <androidx.cardview.widget.CardView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:cardCornerRadius="8dp"
-            app:cardElevation="4dp"
-            app:cardUseCompatPadding="true">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
-
-                <code.name.monkey.retromusic.views.WidthFitSquareLayout
-                    android:id="@+id/image_container"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    app:layout_collapseMode="parallax"
-                    app:layout_collapseParallaxMultiplier="0.5">
-
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:id="@+id/image"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:scaleType="centerCrop"
-                        android:transitionName="@string/transition_album_art"
-                        tools:ignore="UnusedAttribute" />
-
-                    <ProgressBar
-                        android:id="@+id/progressBar"
-                        style="?android:attr/progressBarStyle"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:visibility="gone" />
-
-                </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-
-                <LinearLayout
-                    android:id="@+id/editables"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:padding="8dp">
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <EditText
-                            android:id="@+id/title"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:fontFamily="sans-serif-medium"
-                            android:gravity="center_vertical"
-                            android:hint="@string/album"
-                            android:inputType="text|textCapWords"
-                            android:maxLines="1"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Title" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <EditText
-                            android:id="@+id/album_artist"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:fontFamily="sans-serif"
-                            android:gravity="center_vertical"
-                            android:hint="@string/album_artist"
-                            android:inputType="text|textCapWords"
-                            android:maxLines="1"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Title" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <EditText
-                            android:id="@+id/genre"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:fontFamily="sans-serif"
-                            android:gravity="center_vertical"
-                            android:hint="@string/genre"
-                            android:inputType="text|textCapWords"
-                            android:maxLines="1"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Title" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/year"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:fontFamily="sans-serif"
-                            android:gravity="center_vertical"
-                            android:hint="@string/year"
-                            android:inputType="text|number"
-                            android:maxLines="1"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Title" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                </LinearLayout>
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
-    </androidx.core.widget.NestedScrollView>
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/save_fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="16dp"
-        app:srcCompat="@drawable/ic_save_white_24dp" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-xlarge-land/activity_artist_details_blur.xml b/app/src/main/res/layout-xlarge-land/activity_artist_details_blur.xml
deleted file mode 100755
index b0e4a35c0..000000000
--- a/app/src/main/res/layout-xlarge-land/activity_artist_details_blur.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/root"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/app_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <com.google.android.material.appbar.CollapsingToolbarLayout
-            android:id="@+id/collapsing_toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-
-            app:layout_scrollFlags="scroll|exitUntilCollapsed">
-
-            <code.name.monkey.retromusic.views.WidthFitSquareLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@android:color/transparent"
-                app:layout_collapseMode="parallax">
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/image"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerCrop"
-                    android:transitionName="@string/transition_artist_image" />
-
-            </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/gradient_background"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:overScrollMode="never"
-        app:behavior_overlapTop="24dp"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <androidx.cardview.widget.CardView
-            android:id="@+id/content"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:cardCornerRadius="8dp"
-            app:cardElevation="8dp">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:orientation="vertical"
-                        android:padding="16dp">
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:id="@+id/title"
-                            fontPath="@string/circular_std_black"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:maxLines="2"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                            tools:ignore="MissingPrefix" />
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:id="@+id/text"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:ellipsize="marquee"
-                            android:focusable="true"
-                            android:focusableInTouchMode="true"
-                            android:freezesText="true"
-                            android:marqueeRepeatLimit="marquee_forever"
-                            android:scrollHorizontally="true"
-                            android:singleLine="true"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                            tools:ignore="MissingPrefix"
-                            tools:text="Title" />
-
-                    </LinearLayout>
-
-                    <com.google.android.material.floatingactionbutton.FloatingActionButton
-                        android:id="@+id/action_shuffle_all"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="16dp"
-                        android:layout_weight="0"
-                        app:srcCompat="@drawable/ic_shuffle_white_24dp" />
-                </LinearLayout>
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/biography_title"
-                    fontPath="@string/circular_std_black"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:padding="12dp"
-                    android:text="@string/biography"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                    android:textColor="?android:attr/textColorPrimary"
-                    android:visibility="gone"
-                    tools:ignore="MissingPrefix" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/biography"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="end"
-                    android:maxLines="4"
-                    android:padding="16dp"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-                    android:visibility="gone" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/album_title"
-                    fontPath="@string/circular_std_black"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:padding="12dp"
-                    android:text="@string/albums"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                    android:textColor="?android:attr/textColorPrimary" />
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/album_recycler_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:nestedScrollingEnabled="false" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/song_title"
-                    fontPath="@string/circular_std_black"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:padding="12dp"
-                    android:text="@string/songs"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                    android:textColor="?android:attr/textColorPrimary"
-                    tools:ignore="MissingPrefix" />
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/recycler_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:nestedScrollingEnabled="false" />
-
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
-    </androidx.core.widget.NestedScrollView>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="72dp"
-        android:background="@drawable/shadow_down_strong" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <include layout="@layout/status_bar" />
-
-        </LinearLayout>
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <androidx.appcompat.widget.AppCompatImageButton
-                android:id="@+id/menu_close"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="8dp"
-                android:background="@drawable/color_circle_gradient"
-                android:padding="8dp"
-                app:backgroundTint="@color/twenty_percent_black_overlay"
-                app:srcCompat="@drawable/ic_close_white_24dp" />
-
-            <androidx.appcompat.widget.AppCompatImageButton
-                android:id="@+id/menu"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_marginTop="8dp"
-                android:layout_marginEnd="16dp"
-                android:background="@drawable/color_circle_gradient"
-                android:padding="8dp"
-                app:backgroundTint="@color/twenty_percent_black_overlay"
-                app:srcCompat="@drawable/ic_more_vert_white_24dp" />
-        </FrameLayout>
-    </LinearLayout>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml b/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml
index 1b8d04c80..cbbc3f8e1 100644
--- a/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml
@@ -20,83 +20,67 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <FrameLayout
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:elevation="0dp"
+            app:elevation="0dp"
+            tools:ignore="UnusedAttribute">
+
+            <com.google.android.material.appbar.CollapsingToolbarLayout
+                android:id="@+id/collapsing_toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_scrollFlags="scroll|enterAlways"
+                app:titleEnabled="false">
+
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/toolbar"
+                    style="@style/Toolbar48"
+                    app:layout_collapseMode="pin"
+                    tools:ignore="UnusedAttribute">
+
+                    <TextView
+                        android:id="@+id/title"
+                        style="@style/BigTitleTextAppearance"
+                        android:text="@string/app_name" />
+
+                    <code.name.monkey.retromusic.views.CircularImageView
+                        android:id="@+id/user_image"
+                        android:layout_width="36dp"
+                        android:layout_height="36dp"
+                        android:layout_gravity="end"
+                        android:layout_marginEnd="16dp"
+                        app:civ_border="false" />
+                </androidx.appcompat.widget.Toolbar>
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/content_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/horizontal_margin"
-            android:layout_marginEnd="@dimen/horizontal_margin">
+            android:layout_marginEnd="@dimen/horizontal_margin"
+            android:layout_weight="1"
+            android:background="@color/md_white_1000"
+            android:elevation="@dimen/card_elevation"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <include layout="@layout/retro_backdrop" />
-        </FrameLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <com.google.android.material.appbar.AppBarLayout
-                android:id="@+id/app_bar"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:elevation="0dp"
-                app:elevation="0dp"
-                tools:ignore="UnusedAttribute">
+                android:descendantFocusability="blocksDescendants"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:orientation="vertical">
 
-                <com.google.android.material.appbar.CollapsingToolbarLayout
-                    android:id="@+id/collapsing_toolbar"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:layout_scrollFlags="scroll|enterAlways"
-                    app:titleEnabled="false">
+                <include layout="@layout/abs_playlists" />
 
-                    <androidx.appcompat.widget.Toolbar
-                        android:id="@+id/toolbar"
-                        style="@style/Toolbar48"
-                        app:layout_collapseMode="pin"
-                        tools:ignore="UnusedAttribute">
-
-                        <TextView
-                            android:id="@+id/title"
-                            style="@style/BigTitleTextAppearance"
-                            android:text="@string/app_name" />
-
-                        <code.name.monkey.retromusic.views.CircularImageView
-                            android:id="@+id/user_image"
-                            android:layout_width="36dp"
-                            android:layout_height="36dp"
-                            android:layout_gravity="end"
-                            android:layout_marginEnd="16dp"
-                            app:civ_border="false" />
-                    </androidx.appcompat.widget.Toolbar>
-                </com.google.android.material.appbar.CollapsingToolbarLayout>
-            </com.google.android.material.appbar.AppBarLayout>
-
-
-            <androidx.core.widget.NestedScrollView
-                android:id="@+id/content_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/horizontal_margin"
-                android:layout_marginEnd="@dimen/horizontal_margin"
-                android:layout_weight="1"
-                android:background="@color/md_white_1000"
-                android:elevation="@dimen/card_elevation"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:descendantFocusability="blocksDescendants"
-                    android:focusable="true"
-                    android:focusableInTouchMode="true"
-                    android:orientation="vertical">
-
-                    <include layout="@layout/abs_playlists" />
-
-                    <include layout="@layout/home_section_content" />
-                </LinearLayout>
-            </androidx.core.widget.NestedScrollView>
-        </LinearLayout>
+                <include layout="@layout/home_section_content" />
+            </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge-land/fragment_home.xml b/app/src/main/res/layout-xlarge-land/fragment_home.xml
index e8efb0c57..9e46ecaa6 100644
--- a/app/src/main/res/layout-xlarge-land/fragment_home.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_home.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent">
 
     <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appbar"
+        android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:focusable="true"
@@ -17,6 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:contentScrim="?attr/colorPrimary"
+            app:layout_scrollFlags="scroll|enterAlwaysCollapsed"
             app:statusBarScrim="?attr/colorPrimary">
 
             <ImageView
@@ -28,45 +29,54 @@
                 app:layout_collapseParallaxMultiplier="0.7"
                 tools:ignore="ContentDescription" />
 
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/home_toolbar"
-                style="@style/Toolbar"
-                tools:ignore="UnusedAttribute">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_collapseMode="pin">
 
-                <LinearLayout
+                <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal">
+                    android:elevation="0dp"
+                    tools:ignore="UnusedAttribute">
 
-                    <code.name.monkey.retromusic.views.IconImageView
-                        android:id="@+id/search"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:padding="16dp"
-                        android:src="@drawable/ic_search_white_24dp" />
+                    <include layout="@layout/status_bar" />
 
-                    <TextView
-                        android:id="@+id/title"
-                        fontPath="@string/circular_std_black"
+                </FrameLayout>
+
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/home_toolbar"
+                    style="@style/Toolbar"
+                    tools:ignore="UnusedAttribute">
+
+                    <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:text="@string/app_name"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                        tools:ignore="MissingPrefix" />
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
 
-                    <code.name.monkey.retromusic.views.CircularImageView
-                        android:id="@+id/user_image"
-                        android:layout_width="36dp"
-                        android:layout_height="36dp"
-                        android:layout_marginEnd="16dp"
-                        android:layout_weight="0"
-                        app:civ_border="false" />
-                </LinearLayout>
-            </androidx.appcompat.widget.Toolbar>
+                        <TextView
+                            android:id="@+id/title"
+                            fontPath="@string/circular_std_black"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:text="@string/app_name"
+                            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+                            tools:ignore="MissingPrefix" />
+
+                        <code.name.monkey.retromusic.views.CircularImageView
+                            android:id="@+id/user_image"
+                            android:layout_width="36dp"
+                            android:layout_height="36dp"
+                            android:layout_marginEnd="16dp"
+                            android:layout_weight="0"
+                            app:civ_border="false" />
+                    </LinearLayout>
+                </androidx.appcompat.widget.Toolbar>
+            </LinearLayout>
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -76,7 +86,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="96dp"
         android:layout_marginEnd="96dp"
-        android:background="@drawable/bg_bottom_sheet_dialog_fragment"
+        android:background="@drawable/bg_circular_top_corners"
         app:behavior_overlapTop="112dp"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
diff --git a/app/src/main/res/layout-xlarge/activity_album_tag_editor.xml b/app/src/main/res/layout-xlarge/activity_album_tag_editor.xml
deleted file mode 100644
index 4597f6bc9..000000000
--- a/app/src/main/res/layout-xlarge/activity_album_tag_editor.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/gradient_background"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/app_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            style="@style/Toolbar"
-            app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp">
-
-            <Button
-                android:id="@+id/edit"
-                style="@style/Widget.AppCompat.Button.Borderless.Colored"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:text="@string/edit_cover" />
-        </androidx.appcompat.widget.Toolbar>
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginEnd="96dp"
-        android:layout_marginStart="96dp"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <androidx.cardview.widget.CardView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:cardCornerRadius="8dp"
-            app:cardElevation="4dp"
-            app:cardUseCompatPadding="true">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
-
-                <code.name.monkey.retromusic.views.WidthFitSquareLayout
-                    android:id="@+id/image_container"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    app:layout_collapseMode="parallax"
-                    app:layout_collapseParallaxMultiplier="0.5">
-
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:id="@+id/image"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:scaleType="centerCrop"
-                        android:transitionName="@string/transition_album_art"
-                        tools:ignore="UnusedAttribute" />
-
-                    <ProgressBar
-                        android:id="@+id/progressBar"
-                        style="?android:attr/progressBarStyle"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:visibility="gone" />
-
-                </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-
-                <LinearLayout
-                    android:id="@+id/editables"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical"
-                    android:padding="8dp">
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <EditText
-                            android:id="@+id/title"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:fontFamily="sans-serif-medium"
-                            android:gravity="center_vertical"
-                            android:hint="@string/album"
-                            android:inputType="text|textCapWords"
-                            android:maxLines="1"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Title" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <EditText
-                            android:id="@+id/album_artist"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:fontFamily="sans-serif"
-                            android:gravity="center_vertical"
-                            android:hint="@string/album_artist"
-                            android:inputType="text|textCapWords"
-                            android:maxLines="1"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Title" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <EditText
-                            android:id="@+id/genre"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:fontFamily="sans-serif"
-                            android:gravity="center_vertical"
-                            android:hint="@string/genre"
-                            android:inputType="text|textCapWords"
-                            android:maxLines="1"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Title" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/year"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:fontFamily="sans-serif"
-                            android:gravity="center_vertical"
-                            android:hint="@string/year"
-                            android:inputType="text|number"
-                            android:maxLines="1"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Title" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                </LinearLayout>
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
-    </androidx.core.widget.NestedScrollView>
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/save_fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="16dp"
-        app:srcCompat="@drawable/ic_save_white_24dp" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-xlarge/fragment_home.xml b/app/src/main/res/layout-xlarge/fragment_home.xml
index 0e955899c..8d3642569 100644
--- a/app/src/main/res/layout-xlarge/fragment_home.xml
+++ b/app/src/main/res/layout-xlarge/fragment_home.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent">
 
     <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appbar"
+        android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:focusable="true"
@@ -17,6 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:contentScrim="?attr/colorPrimary"
+            app:layout_scrollFlags="scroll|enterAlwaysCollapsed"
             app:statusBarScrim="?attr/colorPrimary">
 
             <ImageView
@@ -28,45 +29,55 @@
                 app:layout_collapseParallaxMultiplier="0.7"
                 tools:ignore="ContentDescription" />
 
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/home_toolbar"
-                style="@style/Toolbar"
-                tools:ignore="UnusedAttribute">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_collapseMode="pin">
 
-                <LinearLayout
+                <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal">
+                    android:elevation="0dp"
+                    tools:ignore="UnusedAttribute">
 
-                    <code.name.monkey.retromusic.views.IconImageView
-                        android:id="@+id/search"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:padding="16dp"
-                        android:src="@drawable/ic_search_white_24dp" />
+                    <include layout="@layout/status_bar" />
 
-                    <TextView
-                        android:id="@+id/title"
-                        fontPath="@string/circular_std_black"
+                </FrameLayout>
+
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/home_toolbar"
+                    style="@style/Toolbar"
+                    tools:ignore="UnusedAttribute">
+
+                    <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="center"
-                        android:text="@string/app_name"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                        tools:ignore="MissingPrefix" />
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
 
-                    <code.name.monkey.retromusic.views.CircularImageView
-                        android:id="@+id/user_image"
-                        android:layout_width="36dp"
-                        android:layout_height="36dp"
-                        android:layout_marginEnd="16dp"
-                        android:layout_weight="0"
-                        app:civ_border="false" />
-                </LinearLayout>
-            </androidx.appcompat.widget.Toolbar>
+
+                        <TextView
+                            android:id="@+id/title"
+                            fontPath="@string/circular_std_black"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:gravity="center"
+                            android:text="@string/app_name"
+                            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+                            tools:ignore="MissingPrefix" />
+
+                        <code.name.monkey.retromusic.views.CircularImageView
+                            android:id="@+id/user_image"
+                            android:layout_width="36dp"
+                            android:layout_height="36dp"
+                            android:layout_marginEnd="16dp"
+                            android:layout_weight="0"
+                            app:civ_border="false" />
+                    </LinearLayout>
+                </androidx.appcompat.widget.Toolbar>
+            </LinearLayout>
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout-xlarge/fragment_name.xml b/app/src/main/res/layout-xlarge/fragment_name.xml
deleted file mode 100644
index 01e99ac49..000000000
--- a/app/src/main/res/layout-xlarge/fragment_name.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginEnd="64dp"
-    android:layout_marginStart="64dp"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <TextView
-            fontPath="@string/circular_std_black"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:text="@string/title_user_info"
-            android:textAppearance="@style/TextAppearance.AppCompat.Display2"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textStyle="bold"
-            tools:ignore="MissingPrefix" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingEnd="16dp"
-            android:paddingStart="16dp"
-            android:text="@string/summary_user_info"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
-
-        <androidx.cardview.widget.CardView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="-16dp"
-            android:layout_marginEnd="38dp"
-            android:layout_marginStart="38dp"
-            android:layout_marginTop="16dp"
-            app:cardCornerRadius="16dp"
-            app:cardElevation="16dp">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/gradient_3"
-                    android:orientation="vertical"
-                    android:padding="16dp">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/name"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        android:hint="@string/my_name"
-                        android:padding="12dp"
-                        android:textColor="@color/md_white_1000"
-                        android:textColorHint="?android:attr/textColorSecondary" />
-
-                </LinearLayout>
-
-                <FrameLayout
-                    android:id="@+id/image_container"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:id="@+id/image"
-                        android:layout_width="match_parent"
-                        android:layout_height="128dp"
-                        android:scaleType="centerCrop" />
-
-                    <TextView
-                        android:layout_width="88dp"
-                        android:layout_height="88dp"
-                        android:layout_gravity="center"
-                        android:layout_margin="16dp"
-                        android:background="@drawable/color_circle_gradient"
-                        android:gravity="center"
-                        android:text="@string/add_photo"
-                        android:textAllCaps="true"
-                        android:textColor="@color/md_white_1000" />
-
-                    <code.name.monkey.retromusic.views.CircularImageView
-                        android:id="@+id/user_image"
-                        android:layout_width="88dp"
-                        android:layout_height="88dp"
-                        android:layout_gravity="center" />
-
-                    <code.name.monkey.retromusic.views.IconImageView
-                        android:id="@+id/banner_select"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="bottom|end"
-                        android:background="?roundSelector"
-                        android:padding="16dp"
-                        app:srcCompat="@drawable/ic_edit_white_24dp" />
-                </FrameLayout>
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
-    </LinearLayout>
-
-    <ImageButton
-        android:id="@+id/next"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="16dp"
-        android:background="@drawable/color_circle_gradient"
-        android:elevation="8dp"
-        android:padding="16dp"
-        app:srcCompat="@drawable/ic_arrow_forward_white_24dp" />
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_album_tag_editor.xml b/app/src/main/res/layout/activity_album_tag_editor.xml
index 793236545..204d10121 100755
--- a/app/src/main/res/layout/activity_album_tag_editor.xml
+++ b/app/src/main/res/layout/activity_album_tag_editor.xml
@@ -12,144 +12,198 @@
         android:elevation="0dp"
         app:elevation="0dp">
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            style="@style/Toolbar"
-            app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp">
-
-            <Button
-                android:id="@+id/edit"
-                style="@style/Widget.AppCompat.Button.Borderless.Colored"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:text="@string/edit_cover" />
-        </androidx.appcompat.widget.Toolbar>
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <androidx.cardview.widget.CardView
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:id="@+id/collapsing_toolbar"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:cardCornerRadius="8dp"
-            app:cardElevation="4dp"
-            app:cardUseCompatPadding="true">
+            android:layout_height="wrap_content"
+            app:layout_scrollFlags="scroll|enterAlwaysCollapsed"
+            app:titleEnabled="false">
+
+            <code.name.monkey.retromusic.views.WidthFitSquareLayout
+                android:id="@+id/image_container"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:layout_collapseMode="parallax"
+                app:layout_collapseParallaxMultiplier="0.5">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/image"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:scaleType="centerCrop"
+                    android:transitionName="@string/transition_album_art"
+                    tools:ignore="UnusedAttribute" />
+
+                <ProgressBar
+                    android:id="@+id/progressBar"
+                    style="?android:attr/progressBarStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:visibility="gone" />
+
+            </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_collapseMode="pin">
 
-                <code.name.monkey.retromusic.views.WidthFitSquareLayout
-                    android:id="@+id/image_container"
+                <FrameLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    app:layout_collapseMode="parallax"
-                    app:layout_collapseParallaxMultiplier="0.5">
+                    android:layout_height="wrap_content">
 
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:id="@+id/image"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:scaleType="centerCrop"
-                        android:transitionName="@string/transition_album_art"
-                        tools:ignore="UnusedAttribute" />
+                    <include layout="@layout/status_bar" />
+                </FrameLayout>
 
-                    <ProgressBar
-                        android:id="@+id/progressBar"
-                        style="?android:attr/progressBarStyle"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:visibility="gone" />
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/toolbar"
+                    style="@style/Toolbar48"
+                    app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
+                    tools:ignore="UnusedAttribute">
 
-                </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
-                <LinearLayout
-                    android:id="@+id/editables"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical"
-                    android:padding="8dp">
+                    <TextView
+                        android:id="@+id/title"
+                        style="@style/BigTitleTextAppearance"
+                        android:text="@string/action_tag_editor" />
 
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <EditText
-                            android:id="@+id/title"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:fontFamily="sans-serif-medium"
-                            android:gravity="center_vertical"
-                            android:hint="@string/album"
-                            android:inputType="text|textCapWords"
-                            android:maxLines="1"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Title" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <EditText
-                            android:id="@+id/album_artist"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:fontFamily="sans-serif"
-                            android:gravity="center_vertical"
-                            android:hint="@string/album_artist"
-                            android:inputType="text|textCapWords"
-                            android:maxLines="1"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Title" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <EditText
-                            android:id="@+id/genre"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:fontFamily="sans-serif"
-                            android:gravity="center_vertical"
-                            android:hint="@string/genre"
-                            android:inputType="text|textCapWords"
-                            android:maxLines="1"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Title" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/year"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:fontFamily="sans-serif"
-                            android:gravity="center_vertical"
-                            android:hint="@string/year"
-                            android:inputType="text|number"
-                            android:maxLines="1"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Title" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                </LinearLayout>
+                </androidx.appcompat.widget.Toolbar>
             </LinearLayout>
-        </androidx.cardview.widget.CardView>
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?dividerColor" />
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_circular_top_corners"
+        app:behavior_overlapTop="24dp"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <LinearLayout
+            android:id="@+id/editables"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:padding="8dp">
+
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/album_title_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:boxBackgroundMode="outline"
+                app:boxCollapsedPaddingTop="16dp"
+                app:boxCornerRadiusBottomEnd="8dp"
+                app:boxCornerRadiusBottomStart="8dp"
+                app:boxCornerRadiusTopEnd="8dp"
+                app:boxCornerRadiusTopStart="8dp"
+                app:boxStrokeColor="?android:attr/textColorPrimary"
+                app:boxStrokeWidth="1dp"
+                app:hintEnabled="true">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/album_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:hint="@string/album"
+                    android:inputType="text|textCapWords"
+                    android:maxLines="1"
+                    android:padding="16dp"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/album_artist_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                app:boxBackgroundMode="outline"
+                app:boxCollapsedPaddingTop="16dp"
+                app:boxCornerRadiusBottomEnd="8dp"
+                app:boxCornerRadiusBottomStart="8dp"
+                app:boxCornerRadiusTopEnd="8dp"
+                app:boxCornerRadiusTopStart="8dp"
+                app:boxStrokeColor="?android:attr/textColorPrimary"
+                app:boxStrokeWidth="1dp"
+                app:hintEnabled="true">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/album_artist"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:hint="@string/album_artist"
+                    android:inputType="text|textCapWords"
+                    android:maxLines="1"
+                    android:padding="16dp"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/genre_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                app:boxBackgroundMode="outline"
+                app:boxCollapsedPaddingTop="16dp"
+                app:boxCornerRadiusBottomEnd="8dp"
+                app:boxCornerRadiusBottomStart="8dp"
+                app:boxCornerRadiusTopEnd="8dp"
+                app:boxCornerRadiusTopStart="8dp"
+                app:boxStrokeColor="?android:attr/textColorPrimary"
+                app:boxStrokeWidth="1dp"
+                app:hintEnabled="true">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/genre"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:hint="@string/genre"
+                    android:inputType="text|textCapWords"
+                    android:maxLines="1"
+                    android:padding="16dp"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/year_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                app:boxBackgroundMode="outline"
+                app:boxCollapsedPaddingTop="16dp"
+                app:boxCornerRadiusBottomEnd="8dp"
+                app:boxCornerRadiusBottomStart="8dp"
+                app:boxCornerRadiusTopEnd="8dp"
+                app:boxCornerRadiusTopStart="8dp"
+                app:boxStrokeColor="?android:attr/textColorPrimary"
+                app:boxStrokeWidth="1dp"
+                app:hintEnabled="true">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/year"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:hint="@string/year"
+                    android:inputType="text|number"
+                    android:maxLines="1"
+                    android:padding="16dp"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+            </com.google.android.material.textfield.TextInputLayout>
+        </LinearLayout>
+
     </androidx.core.widget.NestedScrollView>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
diff --git a/app/src/main/res/layout/activity_artist_details_blur.xml b/app/src/main/res/layout/activity_artist_details_blur.xml
deleted file mode 100755
index b09badc7e..000000000
--- a/app/src/main/res/layout/activity_artist_details_blur.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:id="@+id/root"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent">
-
-  <com.google.android.material.appbar.AppBarLayout
-    android:id="@+id/app_bar"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <com.google.android.material.appbar.CollapsingToolbarLayout
-      android:id="@+id/collapsing_toolbar"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      app:layout_scrollFlags="scroll|exitUntilCollapsed">
-
-      <code.name.monkey.retromusic.views.WidthFitSquareLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <View
-          android:id="@+id/background"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:background="@drawable/shadow_down_strong"/>
-        <LinearLayout
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_gravity="center"
-          android:background="@android:color/transparent"
-          android:gravity="center"
-          android:orientation="vertical">
-
-          <androidx.cardview.widget.CardView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:cardCornerRadius="8dp"
-            app:cardElevation="8dp"
-            app:cardUseCompatPadding="true">
-            <androidx.appcompat.widget.AppCompatImageView
-              android:id="@+id/image"
-              android:layout_width="196dp"
-              android:layout_height="196dp"
-              android:layout_gravity="center"
-              android:scaleType="centerCrop"
-              android:transitionName="@string/transition_artist_image"
-              />
-          </androidx.cardview.widget.CardView>
-          <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:padding="16dp"
-            android:orientation="vertical">
-
-            <androidx.appcompat.widget.AppCompatTextView
-              android:id="@+id/title"
-              fontPath="@string/circular_std_black"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:gravity="center"
-              android:maxLines="2"
-              android:textAppearance="@style/TextAppearance.AppCompat.Title"
-              tools:ignore="MissingPrefix"
-              tools:text="Title"/>
-
-            <androidx.appcompat.widget.AppCompatTextView
-              android:id="@+id/text"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:layout_gravity="center"
-              android:ellipsize="marquee"
-              android:focusable="true"
-              android:focusableInTouchMode="true"
-              android:freezesText="true"
-              android:gravity="center"
-              android:marqueeRepeatLimit="marquee_forever"
-              android:scrollHorizontally="true"
-              android:singleLine="true"
-              android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-              tools:ignore="MissingPrefix"
-              tools:text="Title"/>
-
-          </LinearLayout>
-        </LinearLayout>
-      </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-    </com.google.android.material.appbar.CollapsingToolbarLayout>
-
-  </com.google.android.material.appbar.AppBarLayout>
-
-  <androidx.core.widget.NestedScrollView
-    android:id="@+id/gradient_background"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:overScrollMode="never"
-    app:behavior_overlapTop="24dp"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:orientation="vertical">
-      <TextView
-        android:id="@+id/action_shuffle_all"
-        fontPath="@string/circular_std_black"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:paddingTop="16dp"
-        android:paddingBottom="16dp"
-        android:paddingStart="48dp"
-        android:paddingEnd="48dp"
-        android:background="@drawable/shuffle_line_background"
-        android:text="@string/action_shuffle_all"
-        tools:ignore="MissingPrefix"
-        />
-      <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/biography_title"
-        fontPath="@string/circular_std_black"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="12dp"
-        android:text="@string/biography"
-        android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-        android:textColor="?android:attr/textColorPrimary"
-        android:visibility="gone"
-        tools:ignore="MissingPrefix"/>
-
-      <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/biography"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:ellipsize="end"
-        android:maxLines="4"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-        android:visibility="gone"/>
-
-      <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/album_title"
-        fontPath="@string/circular_std_black"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="12dp"
-        android:text="@string/albums"
-        android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-        android:textColor="?android:attr/textColorPrimary"/>
-
-      <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/album_recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:nestedScrollingEnabled="false"/>
-
-      <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/song_title"
-        fontPath="@string/circular_std_black"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="12dp"
-        android:text="@string/songs"
-        android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-        android:textColor="?android:attr/textColorPrimary"
-        tools:ignore="MissingPrefix"/>
-
-      <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:nestedScrollingEnabled="false"/>
-
-    </LinearLayout>
-
-  </androidx.core.widget.NestedScrollView>
-
-  <View
-    android:layout_width="match_parent"
-    android:layout_height="72dp"
-    android:background="@drawable/shadow_down_strong"/>
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <include layout="@layout/status_bar"/>
-
-    <FrameLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content">
-
-      <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/menu_close"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginStart="16dp"
-        android:padding="8dp"
-        android:background="@drawable/color_circle_gradient"
-        app:backgroundTint="@color/twenty_percent_black_overlay"
-        app:srcCompat="@drawable/ic_close_white_24dp"/>
-
-      <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/menu"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="16dp"
-        android:layout_gravity="end"
-        android:padding="8dp"
-        android:background="@drawable/color_circle_gradient"
-        app:backgroundTint="@color/twenty_percent_black_overlay"
-        app:srcCompat="@drawable/ic_more_vert_white_24dp"/>
-    </FrameLayout>
-  </LinearLayout>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_lock_screen.xml b/app/src/main/res/layout/activity_lock_screen.xml
deleted file mode 100644
index f944a04a4..000000000
--- a/app/src/main/res/layout/activity_lock_screen.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ImageView
-        android:id="@+id/image"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/shadow_up_full_theme"
-        android:clickable="true"
-        android:focusable="true" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:orientation="vertical"
-        android:paddingBottom="52dp"
-        tools:ignore="UselessParent">
-
-        <fragment
-            android:id="@+id/playback_controls_fragment"
-            android:name="code.name.monkey.retromusic.ui.fragments.player.lockscreen.LockScreenPlayerControlsFragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:layout="@layout/fragment_lock_screen_playback_controls" />
-
-        <TextView
-            android:id="@+id/slide"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:padding="24dp"
-            android:text="Swipe to unlock"
-            android:textColor="@color/md_white_1000" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="16dp">
-
-        <TextClock
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:format12Hour="hh.mm"
-            android:gravity="center"
-            android:text="@string/title_dashboard"
-            android:textAppearance="@style/Base.TextAppearance.AppCompat.Display3"
-            android:textColor="@color/md_white_1000" />
-
-        <TextClock
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:format24Hour="EEEE, MMMM d"
-            android:gravity="center"
-            android:textColor="@color/md_white_1000" />
-    </LinearLayout>
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main_content.xml b/app/src/main/res/layout/activity_main_content.xml
index a9e82bc64..064a9d6da 100644
--- a/app/src/main/res/layout/activity_main_content.xml
+++ b/app/src/main/res/layout/activity_main_content.xml
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:elevation="0dp"
-        tools:ignore="UnusedAttribute">
-
-        <include layout="@layout/status_bar" />
-
-    </FrameLayout>
 
     <FrameLayout
         android:id="@+id/fragment_container"
diff --git a/app/src/main/res/layout/activity_song_tag_editor.xml b/app/src/main/res/layout/activity_song_tag_editor.xml
index 69b684c33..f638e7f84 100755
--- a/app/src/main/res/layout/activity_song_tag_editor.xml
+++ b/app/src/main/res/layout/activity_song_tag_editor.xml
@@ -13,61 +13,53 @@
         android:elevation="0dp"
         app:elevation="0dp">
 
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/appbar"
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:id="@+id/collapsing_toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            tools:ignore="UnusedAttribute">
+            app:layout_scrollFlags="scroll|enterAlwaysCollapsed"
+            app:titleEnabled="false">
 
-            <com.google.android.material.appbar.CollapsingToolbarLayout
-                android:id="@+id/collapsing_toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:layout_scrollFlags="scroll|enterAlwaysCollapsed"
-                app:titleEnabled="false">
+            <FrameLayout
+                android:id="@+id/image_container"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
 
-                <FrameLayout
-                    android:id="@+id/image_container"
+                <ImageView
+                    android:id="@+id/image"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:visibility="gone" />
+            </FrameLayout>
 
-                    <ImageView
-                        android:id="@+id/image"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:visibility="gone" />
-                </FrameLayout>
-
-                <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/toolbar"
-                    style="@style/Toolbar48"
-                    app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
-                    tools:ignore="UnusedAttribute">
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar48"
+                app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
+                tools:ignore="UnusedAttribute">
 
 
-                    <TextView
-                        android:id="@+id/title"
-                        fontPath="@string/circular_std_black"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:text="@string/action_tag_editor"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Large"
-                        tools:ignore="MissingPrefix" />
+                <TextView
+                    android:id="@+id/title"
+                    fontPath="@string/circular_std_black"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="@string/action_tag_editor"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Large"
+                    tools:ignore="MissingPrefix" />
 
 
-                </androidx.appcompat.widget.Toolbar>
-            </com.google.android.material.appbar.CollapsingToolbarLayout>
+            </androidx.appcompat.widget.Toolbar>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="?dividerColor" />
-        </com.google.android.material.appbar.AppBarLayout>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?dividerColor" />
     </com.google.android.material.appbar.AppBarLayout>
 
-
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index 83f3b5eba..ee8d9a073 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -1,11 +1,139 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/root"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-    <FrameLayout
-        android:id="@+id/fragment_container"
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"  />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+        android:layout_height="wrap_content"
+        android:elevation="0dp"
+        app:elevation="0dp">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            style="@style/Toolbar48">
+
+            <TextView
+                android:id="@+id/title"
+                fontPath="@string/circular_std_black"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:text="@string/profile"
+                android:textAppearance="@style/TextAppearance.AppCompat.Large"
+                tools:ignore="MissingPrefix" />
+
+        </androidx.appcompat.widget.Toolbar>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+
+            <FrameLayout
+                android:id="@+id/image_container"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/image"
+                    android:layout_width="match_parent"
+                    android:layout_height="128dp"
+                    android:scaleType="centerCrop"
+                    app:srcCompat="@drawable/material_design_default" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="128dp"
+                    android:background="@color/twenty_percent_black_overlay" />
+
+                <code.name.monkey.retromusic.views.IconImageView
+                    android:id="@+id/banner_select"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:background="?roundSelector"
+                    android:padding="16dp"
+                    app:srcCompat="@drawable/ic_round_add_a_photo_white_24dp" />
+
+                <FrameLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    android:layout_margin="8dp">
+
+                    <code.name.monkey.retromusic.views.CircularImageView
+                        android:id="@+id/user_image"
+                        android:layout_width="72dp"
+                        android:layout_height="72dp"
+                        android:layout_gravity="center"
+                        android:scaleType="centerCrop"
+                        app:civ_border="false"
+                        app:civ_shadow="false"
+                        app:srcCompat="@drawable/ic_person_flat" />
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_margin="16dp"
+                        android:gravity="center"
+                        android:padding="12dp"
+                        android:src="@drawable/ic_round_add_a_photo_white_24dp"
+                        app:tint="?iconColor" />
+                </FrameLayout>
+
+            </FrameLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/name_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="12dp"
+                app:boxBackgroundMode="outline"
+                app:boxCollapsedPaddingTop="16dp"
+                app:boxCornerRadiusBottomEnd="8dp"
+                app:boxCornerRadiusBottomStart="8dp"
+                app:boxCornerRadiusTopEnd="8dp"
+                app:boxCornerRadiusTopStart="8dp"
+                app:boxStrokeColor="@color/md_grey_700"
+                app:boxStrokeWidth="1dp"
+                app:hintEnabled="true">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/name"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:hint="@string/my_name"
+                    android:inputType="textPersonName|textCapWords|text"
+                    android:padding="16dp"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+            </com.google.android.material.textfield.TextInputLayout>
+        </LinearLayout>
+    </LinearLayout>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/next"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        android:elevation="8dp"
+        android:padding="16dp"
+        app:srcCompat="@drawable/ate_check" />
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_credit.xml b/app/src/main/res/layout/card_credit.xml
index c5f8a6e77..660e2bfa1 100644
--- a/app/src/main/res/layout/card_credit.xml
+++ b/app/src/main/res/layout/card_credit.xml
@@ -29,144 +29,11 @@
                 android:textColor="@color/md_white_1000"
                 tools:ignore="MissingPrefix" />
 
-            <LinearLayout
-                android:id="@+id/marko_name_link"
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recycler_view"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?attr/rectSelector"
-                android:clickable="true"
-                android:focusable="true"
-                android:gravity="center_vertical"
-                android:minHeight="@dimen/md_listitem_height"
-                android:orientation="horizontal"
-                android:paddingStart="16dp"
-                android:paddingEnd="0dp"
-                tools:ignore="PrivateResource">
+                android:layout_height="wrap_content" />
 
-                <code.name.monkey.retromusic.views.NetworkImageView
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    app:civ_border="false"
-                    app:civ_shadow="false"
-                    app:url_link="https://avatars2.githubusercontent.com/u/35743654?s=400&amp;u=f8b4a90a352a661625ae71d455a82aaa9bc3316b&amp;v=4" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingStart="16dp"
-                    android:paddingTop="8dp"
-                    android:paddingEnd="16dp"
-                    android:paddingBottom="8dp">
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/marko_name"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                        android:textColor="@color/md_white_1000" />
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:alpha="0.85"
-                        android:text="@string/marko_summary"
-                        android:textColor="@color/md_white_1000" />
-                </LinearLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/gaurav_singh_link"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?attr/rectSelector"
-                android:clickable="true"
-                android:focusable="true"
-                android:gravity="center_vertical"
-                android:minHeight="@dimen/md_listitem_height"
-                android:orientation="horizontal"
-                android:paddingStart="16dp"
-                android:paddingEnd="0dp"
-                tools:ignore="PrivateResource">
-
-                <code.name.monkey.retromusic.views.NetworkImageView
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    app:civ_border="false"
-                    app:civ_shadow="false"
-                    app:url_link="https://cdn5.telesco.pe/file/Gnko_d39iKSqzKhsVK53sjUFz_sfLKe_OpxFE9kR-VUEjDbm6SOr8CT09tyI3zhDSuTowqOhNY4nogFx1Z8QbixyZLAWccl94JdX4dqkPrZyHMS9K7xUzq-wgZCoNIbO8_eAnGOy8Gmu3-uzLuQf2u3G7BRIxm5mzqwqGoeX7_V-fcs3Lr6Br7hPFeCHSm1U39I69E3R9ovs-kPfxCpze-riCjD-QhwwOEOfiudx9OmkmLJGvYugX2EpHSBFfNh6WFQEvBAvR6xPrXul3LxZEebH0xwz5HX-bmyuoxdGaW0J4ywDgiiu4I7cfUJe8lKqWwkPQRg8zTtYNiG3MZio7w.jpg" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingStart="16dp"
-                    android:paddingTop="8dp"
-                    android:paddingEnd="16dp"
-                    android:paddingBottom="8dp">
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/gaurav_singh_name"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                        android:textColor="@color/md_white_1000" />
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:alpha="0.85"
-                        android:text="@string/moderator"
-                        android:textColor="@color/md_white_1000" />
-                </LinearLayout>
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/yt_gaming_link"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?attr/rectSelector"
-                android:clickable="true"
-                android:focusable="true"
-                android:gravity="center_vertical"
-                android:minHeight="@dimen/md_listitem_height"
-                android:orientation="horizontal"
-                android:paddingStart="16dp"
-                android:paddingEnd="0dp"
-                tools:ignore="PrivateResource">
-
-                <code.name.monkey.retromusic.views.NetworkImageView
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    app:civ_border="false"
-                    app:civ_shadow="false"
-                    app:url_link="https://cdn.discordapp.com/attachments/469540889883181077/471361944385880065/91_98910_29110_20180616_17122501.jpg" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingStart="16dp"
-                    android:paddingTop="8dp"
-                    android:paddingEnd="16dp"
-                    android:paddingBottom="8dp">
-
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/yt_gaming_name"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                        android:textColor="@color/md_white_1000" />
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:alpha="0.85"
-                        android:text="@string/yt_gaming_summary"
-                        android:textColor="@color/md_white_1000" />
-                </LinearLayout>
-            </LinearLayout>
         </LinearLayout>
     </androidx.cardview.widget.CardView>
 
diff --git a/app/src/main/res/layout/content_banner_home.xml b/app/src/main/res/layout/content_banner_home.xml
deleted file mode 100644
index b5ddfaa91..000000000
--- a/app/src/main/res/layout/content_banner_home.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/content_container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_weight="1"
-    android:background="@color/md_white_1000"
-    android:elevation="@dimen/card_elevation"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:showIn="@layout/fragment_banner_home">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:descendantFocusability="blocksDescendants"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:orientation="vertical">
-
-        <include layout="@layout/abs_playlists" />
-
-        <include layout="@layout/home_section_content" />
-    </LinearLayout>
-</androidx.core.widget.NestedScrollView>
-        
-        
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_create_playlist.xml b/app/src/main/res/layout/dialog_create_playlist.xml
index cd2b91f61..871f4f9ef 100644
--- a/app/src/main/res/layout/dialog_create_playlist.xml
+++ b/app/src/main/res/layout/dialog_create_playlist.xml
@@ -55,7 +55,7 @@
             style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/cancel_current_timer"
+            android:text="@android:string/cancel"
             app:strokeColor="@color/md_grey_700"
             app:strokeWidth="1dp" />
 
diff --git a/app/src/main/res/layout/dialog_delete.xml b/app/src/main/res/layout/dialog_delete.xml
index a926e4c1e..00f4c0d47 100644
--- a/app/src/main/res/layout/dialog_delete.xml
+++ b/app/src/main/res/layout/dialog_delete.xml
@@ -20,6 +20,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingEnd="12dp"
+        android:paddingStart="0dp"
         android:gravity="end">
 
         <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/dialog_playlist_rename.xml b/app/src/main/res/layout/dialog_playlist_rename.xml
index 67251b796..cf17df2ba 100644
--- a/app/src/main/res/layout/dialog_playlist_rename.xml
+++ b/app/src/main/res/layout/dialog_playlist_rename.xml
@@ -55,7 +55,7 @@
             style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/cancel_current_timer"
+            android:text="@android:string/cancel"
             app:strokeColor="@color/md_grey_700"
             app:strokeWidth="1dp" />
 
diff --git a/app/src/main/res/layout/dialog_sleep_timer.xml b/app/src/main/res/layout/dialog_sleep_timer.xml
index cf21d09d1..5be7cf1a0 100644
--- a/app/src/main/res/layout/dialog_sleep_timer.xml
+++ b/app/src/main/res/layout/dialog_sleep_timer.xml
@@ -56,7 +56,7 @@
                 style="@style/Widget.MaterialComponents.Button.TextButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/cancel_current_timer"
+                android:text="@android:string/cancel"
                 app:strokeColor="@color/md_grey_700"
                 app:strokeWidth="1dp"
                 tools:visibility="visible" />
diff --git a/app/src/main/res/layout/fragment_album_carousal_cover.xml b/app/src/main/res/layout/fragment_album_carousal_cover.xml
deleted file mode 100644
index 2996d4ae9..000000000
--- a/app/src/main/res/layout/fragment_album_carousal_cover.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_vertical">
-
-
-    <androidx.cardview.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        app:cardCornerRadius="8dp"
-        app:cardUseCompatPadding="true">
-
-        <code.name.monkey.retromusic.views.WidthFitSquareLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/player_image"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scaleType="centerCrop"
-                tools:ignore="ContentDescription,UnusedAttribute" />
-        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-    </androidx.cardview.widget.CardView>
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_adaptive_cover.xml b/app/src/main/res/layout/fragment_album_full_card_cover.xml
similarity index 59%
rename from app/src/main/res/layout/fragment_adaptive_cover.xml
rename to app/src/main/res/layout/fragment_album_full_card_cover.xml
index 4a9014084..1622df64c 100644
--- a/app/src/main/res/layout/fragment_adaptive_cover.xml
+++ b/app/src/main/res/layout/fragment_album_full_card_cover.xml
@@ -5,24 +5,17 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:cardCornerRadius="8dp"
-        app:cardElevation="16dp"
         app:cardUseCompatPadding="true">
 
-        <FrameLayout
+        <ImageView
+            android:id="@+id/player_image"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <ImageView
-                android:id="@+id/player_image"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scaleType="centerCrop"
-                tools:ignore="ContentDescription,UnusedAttribute" />
-        </FrameLayout>
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            tools:ignore="ContentDescription,UnusedAttribute" />
     </androidx.cardview.widget.CardView>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_banner_home.xml b/app/src/main/res/layout/fragment_banner_home.xml
index 55c54ad93..3ebe4ec00 100644
--- a/app/src/main/res/layout/fragment_banner_home.xml
+++ b/app/src/main/res/layout/fragment_banner_home.xml
@@ -11,28 +11,33 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <include layout="@layout/retro_backdrop" />
-
-        <LinearLayout
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_bar"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:elevation="0dp"
+            app:elevation="0dp"
+            tools:ignore="UnusedAttribute">
 
-            <com.google.android.material.appbar.AppBarLayout
-                android:id="@+id/app_bar"
+            <com.google.android.material.appbar.CollapsingToolbarLayout
+                android:id="@+id/collapsing_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:elevation="0dp"
-                app:elevation="0dp"
-                tools:ignore="UnusedAttribute">
+                app:layout_scrollFlags="scroll|enterAlways"
+                app:titleEnabled="false">
 
-                <com.google.android.material.appbar.CollapsingToolbarLayout
-                    android:id="@+id/collapsing_toolbar"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:layout_scrollFlags="scroll|enterAlways"
-                    app:titleEnabled="false">
+                    android:orientation="vertical">
+
+                    <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <include layout="@layout/status_bar" />
+                    </FrameLayout>
 
                     <androidx.appcompat.widget.Toolbar
                         android:id="@+id/toolbar"
@@ -53,31 +58,31 @@
                             android:layout_marginEnd="16dp"
                             app:civ_border="false" />
                     </androidx.appcompat.widget.Toolbar>
-                </com.google.android.material.appbar.CollapsingToolbarLayout>
-            </com.google.android.material.appbar.AppBarLayout>
+                </LinearLayout>
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
 
-            <androidx.core.widget.NestedScrollView
-                android:id="@+id/content_container"
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/content_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:background="@color/md_white_1000"
+            android:elevation="@dimen/card_elevation"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="@color/md_white_1000"
-                android:elevation="@dimen/card_elevation"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior">
+                android:descendantFocusability="blocksDescendants"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:orientation="vertical">
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:descendantFocusability="blocksDescendants"
-                    android:focusable="true"
-                    android:focusableInTouchMode="true"
-                    android:orientation="vertical">
+                <include layout="@layout/abs_playlists" />
 
-                    <include layout="@layout/abs_playlists" />
-
-                    <include layout="@layout/home_section_content" />
-                </LinearLayout>
-            </androidx.core.widget.NestedScrollView>
-        </LinearLayout>
+                <include layout="@layout/home_section_content" />
+            </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_cast_mini_controller.xml b/app/src/main/res/layout/fragment_cast_mini_controller.xml
deleted file mode 100644
index 746ccf76e..000000000
--- a/app/src/main/res/layout/fragment_cast_mini_controller.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<fragment xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/castMiniController"
-    class="com.google.android.gms.cast.framework.media.widget.MiniControllerFragment"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_alignParentBottom="true"
-    android:layout_gravity="bottom"
-    android:gravity="bottom" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index f90f05d2a..6d6edf11a 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -7,25 +7,34 @@
     android:orientation="vertical">
 
     <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:elevation="0dp"
+        tools:ignore="UnusedAttribute">
+
+        <include layout="@layout/status_bar" />
+
+    </FrameLayout>
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordinator_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1">
 
-        <include layout="@layout/retro_backdrop" />
-
-        <LinearLayout
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_bar"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:elevation="0dp"
+            app:elevation="0dp">
 
-            <com.google.android.material.appbar.AppBarLayout
-                android:id="@+id/app_bar"
+            <com.google.android.material.appbar.CollapsingToolbarLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:elevation="0dp"
-                app:elevation="0dp">
+                app:layout_scrollFlags="scroll|enterAlways"
+                app:titleEnabled="false">
 
                 <FrameLayout
                     android:layout_width="match_parent"
@@ -50,37 +59,38 @@
                         android:layout_width="match_parent"
                         android:layout_height="48dp" />
                 </FrameLayout>
-            </com.google.android.material.appbar.AppBarLayout>
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
 
+        <FrameLayout
+            android:id="@+id/container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@color/md_white_1000"
+            android:elevation="@dimen/card_elevation"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <FrameLayout
-                android:id="@+id/container"
+            <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
+                android:id="@+id/recycler_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@color/md_white_1000"
-                android:elevation="@dimen/card_elevation">
+                android:clipToPadding="false"
+                android:layoutAnimation="@anim/layout_animation_fall_down"
+                android:scrollbars="none" />
 
-                <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
-                    android:id="@+id/recycler_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:clipToPadding="false"
-                    android:layoutAnimation="@anim/layout_animation_fall_down"
-                    android:scrollbars="none" />
+            <TextView
+                android:id="@android:id/empty"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/empty"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="@dimen/empty_text_size" />
 
-                <TextView
-                    android:id="@android:id/empty"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:text="@string/empty"
-                    android:textColor="?android:textColorSecondary"
-                    android:textSize="@dimen/empty_text_size" />
+        </FrameLayout>
 
-            </FrameLayout>
-        </LinearLayout>
-    </FrameLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index ae4aeb595..68bb91f1f 100755
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -28,7 +27,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:scaleType="centerCrop"
-                app:layout_collapseMode="none"
+                app:layout_collapseMode="parallax"
                 tools:ignore="ContentDescription" />
 
             <LinearLayout
@@ -37,7 +36,15 @@
                 android:orientation="vertical"
                 app:layout_collapseMode="pin">
 
-                <include layout="@layout/status_bar" />
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:elevation="0dp"
+                    tools:ignore="UnusedAttribute">
+
+                    <include layout="@layout/status_bar" />
+
+                </FrameLayout>
 
                 <androidx.appcompat.widget.Toolbar
                     android:id="@+id/home_toolbar"
@@ -64,41 +71,30 @@
 
                 </androidx.appcompat.widget.Toolbar>
             </LinearLayout>
+
         </com.google.android.material.appbar.CollapsingToolbarLayout>
-
     </com.google.android.material.appbar.AppBarLayout>
 
-
     <androidx.core.widget.NestedScrollView
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@drawable/bg_circular_top_corners"
-        android:elevation="@dimen/card_elevation"
         app:behavior_overlapTop="24dp"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <RelativeLayout
+        <LinearLayout
+            android:id="@+id/content_container"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:descendantFocusability="blocksDescendants"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:orientation="vertical">
 
-            <include layout="@layout/retro_backdrop" />
+            <include layout="@layout/abs_playlists" />
 
-            <LinearLayout
-                android:id="@+id/content_container"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:descendantFocusability="blocksDescendants"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:orientation="vertical">
-
-                <include layout="@layout/abs_playlists" />
-
-                <include layout="@layout/home_section_content" />
-            </LinearLayout>
-        </RelativeLayout>
+            <include layout="@layout/home_section_content" />
+        </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-
-
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index e5d2055dd..e53c9f917 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -7,25 +7,34 @@
     android:orientation="vertical">
 
     <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:elevation="0dp"
+        tools:ignore="UnusedAttribute">
+
+        <include layout="@layout/status_bar" />
+
+    </FrameLayout>
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordinator_layout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1">
+        android:layout_height="match_parent">
 
-        <include layout="@layout/retro_backdrop" />
 
-        <LinearLayout
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_bar"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:elevation="0dp"
+            app:elevation="0dp">
 
-            <com.google.android.material.appbar.AppBarLayout
-                android:id="@+id/app_bar"
+            <com.google.android.material.appbar.CollapsingToolbarLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:elevation="0dp"
-                app:elevation="0dp">
+                app:layout_scrollFlags="scroll|enterAlways"
+                app:titleEnabled="false">
 
                 <FrameLayout
                     android:layout_width="match_parent"
@@ -55,33 +64,18 @@
                         android:layout_width="match_parent"
                         android:layout_height="48dp" />
                 </FrameLayout>
-            </com.google.android.material.appbar.AppBarLayout>
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
 
 
-            <FrameLayout
-                android:id="@+id/fragment_container"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@color/md_white_1000"
-                android:elevation="@dimen/card_elevation"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-        </LinearLayout>
-    </FrameLayout>
+        <FrameLayout
+            android:id="@+id/fragment_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@color/md_white_1000"
+            android:elevation="@dimen/card_elevation"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?dividerColor" />
-
-    <com.google.android.material.bottomnavigation.BottomNavigationView
-        android:id="@+id/bottom_navigation"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0"
-        app:itemIconTint="@drawable/bottom_navigation_item_colors"
-        app:itemTextColor="@drawable/bottom_navigation_item_colors"
-        app:labelVisibilityMode="labeled"
-        app:menu="@menu/bottom_navigation_main"
-        tools:visibility="visible" />
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_main_options.xml b/app/src/main/res/layout/fragment_main_options.xml
index 8596e4ce1..75636397c 100644
--- a/app/src/main/res/layout/fragment_main_options.xml
+++ b/app/src/main/res/layout/fragment_main_options.xml
@@ -1,15 +1,150 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-
-    <com.google.android.material.navigation.NavigationView
-        android:id="@+id/navigation_view"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        app:menu="@menu/menu_main_options" />
+        android:orientation="vertical"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        tools:ignore="MissingPrefix">
 
-</LinearLayout>
\ No newline at end of file
+
+        <LinearLayout
+            android:id="@+id/user_info_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingStart="8dp"
+            android:paddingTop="16dp"
+            android:paddingEnd="8dp"
+            android:paddingBottom="16dp">
+
+            <code.name.monkey.retromusic.views.CircularImageView
+                android:id="@+id/user_image_bottom"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_weight="0"
+                app:civ_border="false"
+                tools:src="@drawable/hemanth_s" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="vertical"
+                android:paddingBottom="8dp">
+
+                <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
+                    android:id="@+id/title_welcome"
+                    fontPath="@string/circular_std_black"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:maxLines="2"
+                    android:paddingStart="16dp"
+                    android:paddingEnd="16dp"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:textStyle="bold"
+                    tools:ignore="MissingPrefix" />
+
+                <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+                    android:id="@+id/text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:alpha="0.75"
+                    android:ellipsize="end"
+                    android:paddingStart="16dp"
+                    android:paddingEnd="16dp"
+                    android:text="@string/lets_play_something" />
+
+            </LinearLayout>
+
+            <code.name.monkey.retromusic.views.IconImageView
+                android:id="@+id/action_settings"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?roundSelector"
+                android:gravity="center_vertical"
+                android:padding="12dp"
+                android:textAllCaps="false"
+                app:srcCompat="@drawable/ic_settings_white_24dp" />
+        </LinearLayout>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/action_folders"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:text="@string/folders"
+            android:textAllCaps="false"
+            android:textColor="?android:attr/textColorPrimary"
+            app:icon="@drawable/ic_folder_white_24dp"
+            app:iconPadding="12dp"
+            app:iconTint="?iconColor"
+            app:rippleColor="?iconColor" />
+
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/action_sleep_timer"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:text="@string/action_sleep_timer"
+            android:textAllCaps="false"
+            android:textColor="?android:attr/textColorPrimary"
+            app:icon="@drawable/ic_timer_white_24dp"
+            app:iconPadding="12dp"
+            app:iconTint="?iconColor"
+            app:rippleColor="?iconColor" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/action_about"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:text="@string/action_about"
+            android:textAllCaps="false"
+            android:textColor="?android:attr/textColorPrimary"
+            app:icon="@drawable/ic_help_white_24dp"
+            app:iconPadding="12dp"
+            app:iconTint="?iconColor"
+            app:rippleColor="?iconColor" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/action_rate"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:text="@string/rate_app"
+            android:textAllCaps="false"
+            android:textColor="?android:attr/textColorPrimary"
+            app:icon="@drawable/ic_star_white_24dp"
+            app:iconPadding="12dp"
+            app:iconTint="?iconColor"
+            app:rippleColor="?iconColor" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/action_buy_pro"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:text="@string/buy_retromusic_pro"
+            android:textAllCaps="false"
+            android:textColor="?android:attr/textColorPrimary"
+            app:icon="@drawable/ic_card_giftcard_white_24dp"
+            app:iconPadding="12dp"
+            app:iconTint="?iconColor"
+            app:rippleColor="?iconColor" />
+
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_mini_player.xml b/app/src/main/res/layout/fragment_mini_player.xml
index a9771bdae..43217f5f9 100644
--- a/app/src/main/res/layout/fragment_mini_player.xml
+++ b/app/src/main/res/layout/fragment_mini_player.xml
@@ -13,7 +13,9 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:paddingStart="0dp"
+        android:paddingEnd="16dp">
 
         <code.name.monkey.retromusic.views.IconImageView
             android:id="@+id/mini_player_image"
@@ -28,38 +30,40 @@
         <TextView
             android:id="@+id/mini_player_title"
             android:layout_width="0dp"
-            android:gravity="center"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:singleLine="true"  />
+            android:gravity="center"
+            android:singleLine="true" />
 
         <code.name.monkey.retromusic.views.IconImageView
             android:id="@+id/action_prev"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:layout_gravity="center_vertical"
             android:background="?roundSelector"
-            android:padding="8dp"
+            android:padding="6dp"
             app:srcCompat="@drawable/ic_skip_previous_white_24dp" />
 
         <code.name.monkey.retromusic.views.IconImageView
             android:id="@+id/mini_player_play_pause_button"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:layout_gravity="center_vertical"
             android:background="?roundSelector"
+            android:padding="6dp"
             android:scaleType="center"
+            app:srcCompat="@drawable/ic_pause_white_24dp"
             tools:ignore="ContentDescription" />
 
         <code.name.monkey.retromusic.views.IconImageView
             android:id="@+id/action_next"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:layout_gravity="center_vertical"
-            android:layout_marginEnd="16dp"
             android:background="?roundSelector"
-            android:padding="8dp"
+            android:padding="6dp"
             app:srcCompat="@drawable/ic_skip_next_white_24dp" />
+
     </LinearLayout>
 
     <me.zhanghai.android.materialprogressbar.MaterialProgressBar
@@ -67,7 +71,6 @@
         style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
         android:layout_width="match_parent"
         android:layout_height="3dp"
-        android:layout_gravity="bottom"
         android:progress="20"
         app:mpb_progressStyle="horizontal"
         app:mpb_showProgressBackground="false"
diff --git a/app/src/main/res/layout/fragment_name.xml b/app/src/main/res/layout/fragment_name.xml
deleted file mode 100644
index b0b321d5f..000000000
--- a/app/src/main/res/layout/fragment_name.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <TextView
-            fontPath="@string/circular_std_black"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:text="@string/title_user_info"
-            android:textAppearance="@style/TextAppearance.AppCompat.Display2"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textStyle="bold"
-            tools:ignore="MissingPrefix" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingEnd="16dp"
-            android:paddingStart="16dp"
-            android:text="@string/summary_user_info"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
-
-        <androidx.cardview.widget.CardView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="-16dp"
-            android:layout_marginEnd="38dp"
-            android:layout_marginStart="38dp"
-            android:layout_marginTop="16dp"
-            app:cardCornerRadius="16dp"
-            app:cardElevation="16dp">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-
-                <FrameLayout
-                    android:id="@+id/image_container"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:id="@+id/image"
-                        android:layout_width="match_parent"
-                        android:layout_height="128dp"
-                        android:scaleType="centerCrop"
-                        app:srcCompat="@drawable/material_design_default" />
-
-                    <TextView
-                        android:layout_width="88dp"
-                        android:layout_height="88dp"
-                        android:layout_gravity="center"
-                        android:layout_margin="16dp"
-                        android:background="@drawable/color_circle_gradient"
-                        android:gravity="center"
-                        android:text="@string/add_photo"
-                        android:textAllCaps="true"
-                        android:textColor="@color/md_white_1000" />
-
-                    <code.name.monkey.retromusic.views.CircularImageView
-                        android:id="@+id/user_image"
-                        android:layout_width="88dp"
-                        android:layout_height="88dp"
-                        android:layout_gravity="center"
-                        android:scaleType="centerCrop" />
-
-                    <code.name.monkey.retromusic.views.IconImageView
-                        android:id="@+id/banner_select"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="bottom|end"
-                        android:background="?roundSelector"
-                        android:padding="16dp"
-                        app:srcCompat="@drawable/ic_edit_white_24dp" />
-                </FrameLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/gradient_3"
-                    android:orientation="vertical"
-                    android:padding="16dp">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/name"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        android:gravity="center"
-                        android:hint="@string/my_name"
-                        android:padding="12dp"
-                        android:textColor="@color/md_white_1000"
-                        android:textColorHint="@color/md_white_1000" />
-
-                </LinearLayout>
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
-    </LinearLayout>
-
-    <ImageButton
-        android:id="@+id/next"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="16dp"
-        android:background="@drawable/color_circle_gradient"
-        android:elevation="8dp"
-        android:padding="16dp"
-        app:srcCompat="@drawable/ic_arrow_forward_white_24dp" />
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_playlist.xml b/app/src/main/res/layout/fragment_playlist.xml
deleted file mode 100644
index 77e275d14..000000000
--- a/app/src/main/res/layout/fragment_playlist.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <include layout="@layout/recycler_view_sec" />
-
-        <LinearLayout
-            android:id="@+id/genre_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingBottom="4dp"
-            android:visibility="gone"
-            tools:visibility="visible">
-
-            <TextView
-                fontPath="@string/circular_std_black"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingBottom="8dp"
-                android:paddingEnd="16dp"
-                android:paddingStart="16dp"
-                android:paddingTop="8dp"
-                android:text="@string/genre"
-                android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                android:textColor="?android:attr/textColorPrimary"
-                tools:ignore="MissingPrefix" />
-
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/genre_recycler_view"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:nestedScrollingEnabled="false" />
-
-        </LinearLayout>
-    </LinearLayout>
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_queue_player.xml b/app/src/main/res/layout/fragment_queue_player.xml
deleted file mode 100644
index 752a7faf1..000000000
--- a/app/src/main/res/layout/fragment_queue_player.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:clickable="true"
-    android:focusable="true"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/player_toolbar"
-            style="@style/Toolbar48"
-            android:navigationIcon="@drawable/ic_close_white_24dp"
-            app:layout_collapseMode="pin"
-            app:navigationIcon="@drawable/ic_close_white_24dp" />
-
-        <code.name.monkey.retromusic.views.WidthFitSquareLayout
-            android:id="@+id/album_cover_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_collapseMode="parallax"
-            app:layout_collapseParallaxMultiplier="0.5">
-
-            <fragment
-                android:id="@+id/player_album_cover_fragment"
-                android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:layout="@layout/fragment_album_cover" />
-        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <fragment
-                android:id="@+id/playback_controls_fragment"
-                android:name="code.name.monkey.retromusic.ui.fragments.player.queue.QueuePlaybackControlsFragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:layout="@layout/fragment_player_playback_controls" />
-        </FrameLayout>
-
-        <TextView
-            android:id="@+id/title"
-            fontPath="@string/circular_std_black"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:padding="12dp"
-            android:text="Queue"
-            android:textAppearance="@style/TextAppearance.AppCompat.Display1"
-            android:textColor="?android:attr/textColorPrimary"
-            tools:ignore="MissingPrefix" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recycler_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_horizontal"
-            android:background="@color/md_red_200"
-            android:nestedScrollingEnabled="false" />
-    </LinearLayout>
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_queue_player_playback_controls.xml b/app/src/main/res/layout/fragment_queue_player_playback_controls.xml
deleted file mode 100644
index 912f01c45..000000000
--- a/app/src/main/res/layout/fragment_queue_player_playback_controls.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    tools:ignore="MissingPrefix">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingEnd="12dp"
-        android:paddingStart="12dp">
-
-
-        <TextView
-            android:id="@+id/player_song_current_progress"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:paddingEnd="8dp"
-            android:paddingStart="8dp"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textSize="12sp"
-            android:textStyle="bold"
-            tools:text="22.00" />
-
-
-        <TextView
-            android:id="@+id/player_song_total_time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:paddingEnd="8dp"
-            android:paddingStart="8dp"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textSize="12sp"
-            android:textStyle="bold"
-            tools:text="22.00" />
-    </LinearLayout>
-
-    <androidx.appcompat.widget.AppCompatSeekBar
-        android:id="@+id/player_progress_slider"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:maxHeight="3dp"
-        android:paddingEnd="20dp"
-        android:paddingStart="20dp"
-        android:splitTrack="false"
-        tools:progress="20" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:padding="8dp">
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:ellipsize="marquee"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:freezesText="true"
-            android:gravity="center"
-            android:marqueeRepeatLimit="marquee_forever"
-            android:paddingEnd="16dp"
-            android:paddingStart="16dp"
-            android:scrollHorizontally="true"
-            android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:textColor="?android:attr/textColorPrimary"
-            tools:text="Title" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginTop="4dp"
-            android:ellipsize="end"
-            android:gravity="center"
-            android:maxLines="1"
-            android:paddingEnd="16dp"
-            android:paddingStart="16dp" />
-    </LinearLayout>
-
-    <RelativeLayout
-        android:id="@+id/player_media_controller_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        tools:ignore="ContentDescription,UnusedAttribute">
-
-        <ImageButton
-            android:id="@+id/player_prev_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginEnd="8dp"
-            android:layout_toStartOf="@+id/dummy_fab"
-            android:background="?attr/roundSelector"
-            android:padding="16dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_skip_previous_white_24dp"
-            tools:ignore="MissingPrefix"
-            tools:tint="@color/md_black_1000" />
-
-        <ImageButton
-            android:id="@+id/player_next_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="8dp"
-            android:layout_toEndOf="@+id/dummy_fab"
-            android:background="?attr/roundSelector"
-            android:padding="16dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_skip_next_white_24dp"
-            tools:ignore="MissingPrefix"
-            tools:tint="@color/md_black_1000" />
-
-        <ImageButton
-            android:id="@+id/player_repeat_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentStart="true"
-            android:layout_centerVertical="true"
-            android:background="?attr/roundSelector"
-            android:padding="16dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_repeat_white_24dp"
-            tools:ignore="MissingPrefix"
-            tools:tint="@color/md_black_1000" />
-
-        <ImageButton
-            android:id="@+id/player_shuffle_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:background="?attr/roundSelector"
-            android:padding="16dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_shuffle_white_24dp"
-            tools:ignore="MissingPrefix"
-            tools:tint="@color/md_black_1000" />
-
-        <Space
-            android:id="@+id/dummy_fab"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
-            android:layout_centerInParent="true"
-            android:layout_margin="8dp" />
-
-        <ImageButton
-            android:id="@+id/player_play_pause_button"
-            android:layout_width="52dp"
-            android:layout_height="52dp"
-            android:layout_above="@id/title_container"
-            android:layout_centerInParent="true"
-            android:background="@drawable/color_circle_gradient"
-            android:elevation="6dp"
-            android:padding="16dp"
-            app:srcCompat="@drawable/ic_play_arrow_white_24dp" />
-
-    </RelativeLayout>
-
-    <FrameLayout
-        android:id="@+id/volume_fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <fragment
-            android:id="@+id/volume_fragment"
-            android:name="code.name.monkey.retromusic.ui.fragments.VolumeFragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            tools:layout="@layout/fragment_volume" />
-    </FrameLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/home_shortcuts.xml b/app/src/main/res/layout/home_shortcuts.xml
deleted file mode 100644
index 8d8be8b4c..000000000
--- a/app/src/main/res/layout/home_shortcuts.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:orientation="vertical">
-
-  <androidx.appcompat.widget.AppCompatTextView xmlns:tools="http://schemas.android.com/tools"
-    fontPath="@string/circular_std_black"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="12dp"
-    android:text="@string/for_you"
-    android:textAppearance="@style/TextAppearance.AppCompat.Title"
-    android:textColor="?android:attr/textColorPrimary"
-    android:visibility="gone"
-    tools:ignore="MissingPrefix"/>
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="12dp"
-    android:gravity="center_horizontal"
-    android:orientation="horizontal">
-
-    <LinearLayout
-      android:id="@+id/action_shuffle"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"
-      android:orientation="vertical">
-
-      <androidx.appcompat.widget.AppCompatImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:padding="16dp"
-        android:background="@drawable/abs_shuffle"
-        android:elevation="2dp"
-        app:srcCompat="@drawable/ic_shuffle_white_24dp"
-        app:tint="@color/md_white_1000"/>
-
-      <androidx.appcompat.widget.AppCompatTextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="8dp"
-        android:gravity="center"
-        android:text="@string/shuffle"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textSize="12sp"/>
-
-    </LinearLayout>
-
-    <LinearLayout
-      android:id="@+id/timer"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"
-      android:orientation="vertical">
-
-      <androidx.appcompat.widget.AppCompatImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:padding="16dp"
-        android:background="@drawable/abs_timer"
-        android:elevation="2dp"
-        app:srcCompat="@drawable/ic_timer_white_24dp"
-        app:tint="@color/md_white_1000"/>
-
-      <androidx.appcompat.widget.AppCompatTextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="8dp"
-        android:gravity="center"
-        android:text="@string/action_sleep_timer"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textSize="12sp"/>
-
-    </LinearLayout>
-    <LinearLayout
-      android:id="@+id/settings"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"
-      android:orientation="vertical">
-
-      <androidx.appcompat.widget.AppCompatImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:padding="16dp"
-        android:background="@drawable/abs_history_playlist"
-        android:elevation="2dp"
-        app:srcCompat="@drawable/ic_settings_white_24dp"
-        app:tint="@color/md_white_1000"/>
-
-      <androidx.appcompat.widget.AppCompatTextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="8dp"
-        android:gravity="center"
-        android:text="@string/action_settings"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textSize="12sp"/>
-
-    </LinearLayout>
-
-    <LinearLayout
-      android:id="@+id/folder"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"
-      android:orientation="vertical">
-
-      <androidx.appcompat.widget.AppCompatImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:padding="16dp"
-        android:background="@drawable/abs_last_added_playlist"
-        android:elevation="2dp"
-        app:srcCompat="@drawable/ic_folder_white_24dp"
-        app:tint="@color/md_white_1000"/>
-
-      <androidx.appcompat.widget.AppCompatTextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="8dp"
-        android:gravity="center"
-        android:text="@string/folders"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textSize="12sp"/>
-
-    </LinearLayout>
-  </LinearLayout>
-
-  <View
-    android:layout_width="match_parent"
-    android:layout_height="1dp"
-    android:layout_margin="12dp"
-    android:background="?attr/dividerColor"/>
-</LinearLayout>
diff --git a/app/src/main/res/layout/horizontal_progress.xml b/app/src/main/res/layout/horizontal_progress.xml
deleted file mode 100644
index a60f5ba46..000000000
--- a/app/src/main/res/layout/horizontal_progress.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<me.zhanghai.android.materialprogressbar.MaterialProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/progress"
-    style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="3dp"
-    android:visibility="gone"
-    app:mpb_progressStyle="horizontal"
-    app:mpb_useIntrinsicPadding="false" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_contributor.xml b/app/src/main/res/layout/item_contributor.xml
new file mode 100644
index 000000000..d4c611b41
--- /dev/null
+++ b/app/src/main/res/layout/item_contributor.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/rectSelector"
+    android:gravity="center_vertical"
+    android:minHeight="@dimen/md_listitem_height"
+    android:orientation="horizontal"
+    android:paddingStart="12dp"
+    android:paddingEnd="12dp"
+    tools:ignore="PrivateResource">
+
+    <code.name.monkey.retromusic.views.NetworkImageView
+        android:id="@+id/image"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        app:civ_border="false"
+        app:civ_shadow="false" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingStart="16dp"
+        android:paddingTop="8dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="8dp">
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+            android:textColor="@color/md_white_1000" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:alpha="0.85"
+            android:textColor="@color/md_white_1000" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_contributors.xml b/app/src/main/res/layout/item_contributors.xml
deleted file mode 100644
index c4496926e..000000000
--- a/app/src/main/res/layout/item_contributors.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body2"
-        android:textColor="?android:attr/textColorPrimary" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml
index 487a9df73..ae39711fc 100755
--- a/app/src/main/res/layout/item_list.xml
+++ b/app/src/main/res/layout/item_list.xml
@@ -30,8 +30,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_weight="0"
-            android:paddingEnd="0dp"
-            android:paddingLeft="16dp">
+            android:paddingLeft="16dp"
+            android:paddingEnd="0dp">
 
             <androidx.cardview.widget.CardView
                 android:id="@+id/image_text_container"
@@ -51,11 +51,13 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/image_text"
-                    android:layout_width="36dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:fontFamily="sans-serif"
                     android:gravity="center"
                     android:maxLines="1"
+                    tools:text="1"
+                    tools:visibility="visible"
                     android:minHeight="40dp"
                     android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
                     android:visibility="gone" />
@@ -67,12 +69,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginBottom="12dp"
             android:layout_marginTop="12dp"
+            android:layout_marginBottom="12dp"
             android:layout_weight="1.0"
             android:orientation="vertical"
-            android:paddingEnd="16dp"
-            android:paddingStart="16dp">
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp">
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/title"
diff --git a/app/src/main/res/layout/item_queue.xml b/app/src/main/res/layout/item_queue.xml
new file mode 100644
index 000000000..d52494574
--- /dev/null
+++ b/app/src/main/res/layout/item_queue.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?rectSelector"
+    android:clickable="true"
+    android:focusable="true"
+    android:minHeight="72dp"
+    tools:ignore="MissingPrefix">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+        <code.name.monkey.retromusic.views.IconImageView
+            android:id="@+id/drag_view"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical|start"
+            android:visibility="gone"
+            android:padding="8dp"
+            app:srcCompat="@drawable/ic_drag_vertical_white_24dp"
+            tools:ignore="ContentDescription"
+            tools:visibility="visible" />
+
+        <FrameLayout
+            android:id="@+id/image_container"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="0">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/image_text"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:fontFamily="sans-serif"
+                android:gravity="center"
+                android:maxLines="1"
+                android:minWidth="36dp"
+                android:minHeight="40dp"
+                android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                android:visibility="gone"
+                tools:text="1"
+                tools:visibility="visible" />
+
+        </FrameLayout>
+
+        <LinearLayout
+            android:id="@+id/title_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="12dp"
+            android:layout_weight="1.0"
+            android:orientation="vertical"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/title"
+                style="@style/TextAppearance.AppCompat.Subhead"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="2dp"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textColor="?android:attr/textColorPrimary" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/text"
+                style="@style/TextAppearance.AppCompat.Body1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textColor="?android:attr/textColorSecondary" />
+        </LinearLayout>
+
+        <code.name.monkey.retromusic.views.IconImageView
+            android:id="@+id/menu"
+            style="@style/OverFlowButton"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="0" />
+
+    </LinearLayout>
+
+    <View
+        android:id="@+id/short_separator"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_gravity="bottom"
+        android:layout_marginStart="72dp"
+        android:background="?attr/dividerColor"
+        android:visibility="gone" />
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/pager_recycler_view.xml b/app/src/main/res/layout/pager_recycler_view.xml
deleted file mode 100644
index a209ffe0a..000000000
--- a/app/src/main/res/layout/pager_recycler_view.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingBottom="4dp">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingBottom="8dp"
-        android:paddingEnd="0dp"
-        android:paddingStart="16dp"
-        android:paddingTop="8dp"
-        android:visibility="gone">
-
-        <TextView
-            android:id="@+id/title"
-            fontPath="@string/circular_std_black"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="@style/TextAppearance.AppCompat.Title"
-            android:textColor="?android:attr/textColorPrimary"
-            tools:ignore="MissingPrefix"
-            tools:text="@string/songs"
-            tools:visibility="visible" />
-
-    </LinearLayout>
-
-    <code.name.monkey.retromusic.views.MetalRecyclerViewPager
-        android:id="@+id/recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:nestedScrollingEnabled="false" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_margin="12dp"
-        android:background="?attr/dividerColor" />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/preference_dialog_library_categories.xml b/app/src/main/res/layout/preference_dialog_library_categories.xml
deleted file mode 100644
index a407c6f8a..000000000
--- a/app/src/main/res/layout/preference_dialog_library_categories.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml b/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml
deleted file mode 100644
index 89c4ba88d..000000000
--- a/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:descendantFocusability="blocksDescendants"
-    android:focusable="true"
-    android:foreground="?attr/rectSelector"
-    android:minHeight="@dimen/md_listitem_height"
-    android:orientation="horizontal"
-    android:paddingEnd="@dimen/md_dialog_frame_margin"
-    android:paddingLeft="@dimen/md_dialog_frame_margin"
-    android:paddingRight="@dimen/md_dialog_frame_margin"
-    android:paddingStart="@dimen/md_dialog_frame_margin"
-    tools:gravity="start|center_vertical">
-
-    <code.name.monkey.appthemehelper.common.views.ATECheckBox
-        android:id="@+id/checkbox"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:background="@null"
-        android:clickable="false"
-        android:focusable="false"
-        android:gravity="center_vertical" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:ellipsize="end"
-        android:gravity="center_vertical"
-        android:minHeight="@dimen/md_listitem_height"
-        android:paddingBottom="@dimen/md_listitem_vertical_margin_choice"
-        android:paddingLeft="@dimen/md_listitem_control_margin"
-        android:paddingStart="@dimen/md_listitem_control_margin"
-        android:paddingTop="@dimen/md_listitem_vertical_margin_choice"
-        android:singleLine="true"
-        android:textSize="@dimen/md_listitem_textsize"
-        tools:text="Item" />
-
-    <code.name.monkey.retromusic.views.IconImageView
-        android:id="@+id/drag_view"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="end|center_vertical"
-        android:clickable="false"
-        android:focusable="false"
-        android:minHeight="@dimen/md_listitem_height"
-        android:tint="?attr/iconColor"
-        android:tintMode="src_in"
-        app:srcCompat="@drawable/ic_drag_vertical_white_24dp"
-        tools:ignore="ContentDescription" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/recycler_view_sec.xml b/app/src/main/res/layout/recycler_view_sec.xml
deleted file mode 100644
index 8120b05a6..000000000
--- a/app/src/main/res/layout/recycler_view_sec.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingBottom="4dp">
-
-    <TextView
-        android:id="@+id/title"
-        fontPath="@string/circular_std_black"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="12dp"
-        android:text="Recent albums"
-        android:textAppearance="@style/TextAppearance.AppCompat.Title"
-        android:textColor="?android:attr/textColorPrimary"
-        tools:ignore="MissingPrefix" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:nestedScrollingEnabled="false" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_margin="12dp"
-        android:background="?attr/dividerColor" />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/retro_backdrop.xml b/app/src/main/res/layout/retro_backdrop.xml
deleted file mode 100644
index 074b723b7..000000000
--- a/app/src/main/res/layout/retro_backdrop.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/menu_container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingTop="72dp"
-    tools:ignore="MissingPrefix">
-
-
-    <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-        android:id="@+id/action_home"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="4dp"
-        android:padding="12dp"
-        android:text="@string/home"
-        android:textColor="?android:attr/textColorPrimary" />
-
-    <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-        android:id="@+id/action_library"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="4dp"
-        android:padding="12dp"
-        android:text="@string/library"
-        android:textColor="?android:attr/textColorPrimary" />
-
-    <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-        android:id="@+id/action_folders"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="4dp"
-        android:padding="12dp"
-        android:text="@string/folders"
-        android:textColor="?android:attr/textColorPrimary" />
-
-    <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-        android:id="@+id/action_settings"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="4dp"
-        android:padding="12dp"
-        android:text="@string/action_settings" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/simple_list_item.xml b/app/src/main/res/layout/simple_list_item.xml
deleted file mode 100644
index 087bc1bdc..000000000
--- a/app/src/main/res/layout/simple_list_item.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@android:id/text1"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="12dp"
-    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-    tools:text="@string/telegram_group" />
diff --git a/app/src/main/res/layout/sliding_music_panel_layout.xml b/app/src/main/res/layout/sliding_music_panel_layout.xml
index 06fc3c5e7..2e81699d8 100644
--- a/app/src/main/res/layout/sliding_music_panel_layout.xml
+++ b/app/src/main/res/layout/sliding_music_panel_layout.xml
@@ -1,48 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:sothree="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/sliding_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_weight="1"
-    android:gravity="bottom"
-    sothree:umanoOverlay="false"
-    sothree:umanoPanelHeight="0dp"
-    sothree:umanoScrollableView="@+id/recycler_view"
-    sothree:umanoShadowHeight="0dp">
+    android:layout_height="match_parent">
 
-    <FrameLayout
-        android:id="@+id/content_container"
+    <com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:sothree="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/sliding_layout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-
-    <FrameLayout
-        android:id="@+id/sliding_panel"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
+        android:layout_height="match_parent"
+        android:gravity="bottom"
+        sothree:umanoOverlay="false"
+        sothree:umanoPanelHeight="0dp"
+        sothree:umanoScrollableView="@+id/recycler_view"
+        sothree:umanoShadowHeight="0dp">
 
         <FrameLayout
-            android:id="@+id/player_fragment_container"
+            android:id="@+id/content_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-        <fragment
-            android:id="@+id/mini_player_fragment"
-            android:name="code.name.monkey.retromusic.ui.fragments.MiniPlayerFragment"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            tools:layout="@layout/fragment_mini_player" />
 
-        <fragment
-            android:id="@+id/castMiniController"
-            app:castShowImageThumbnail="false"
-            class="com.google.android.gms.cast.framework.media.widget.MiniControllerFragment"
+        <FrameLayout
+            android:id="@+id/sliding_panel"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:visibility="visible" />
-    </FrameLayout>
-</com.sothree.slidinguppanel.SlidingUpPanelLayout>
+            android:layout_height="match_parent">
+
+
+            <FrameLayout
+                android:id="@+id/player_fragment_container"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+            <fragment
+                android:id="@+id/mini_player_fragment"
+                android:name="code.name.monkey.retromusic.ui.fragments.MiniPlayerFragment"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                tools:layout="@layout/fragment_mini_player" />
+
+        </FrameLayout>
+    </com.sothree.slidinguppanel.SlidingUpPanelLayout>
+
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/bottom_navigation"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:layout_gravity="bottom"
+        app:itemIconTint="@drawable/bottom_navigation_item_colors"
+        app:itemTextColor="@drawable/bottom_navigation_item_colors"
+        app:labelVisibilityMode="labeled"
+        app:menu="@menu/bottom_navigation_main" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/user_action_details.xml b/app/src/main/res/layout/user_action_details.xml
deleted file mode 100644
index 033a94970..000000000
--- a/app/src/main/res/layout/user_action_details.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?android:attr/windowBackground"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:id="@+id/user_info_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:padding="16dp">
-
-        <code.name.monkey.retromusic.views.CircularImageView
-            android:id="@+id/user_image_bottom"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_weight="0"
-            app:civ_border="false"
-            tools:src="@drawable/hemanth_s" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical"
-            android:paddingBottom="8dp">
-
-            <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                android:id="@+id/title_welcome"
-                fontPath="@string/circular_std_black"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:maxLines="2"
-                android:paddingStart="16dp"
-                android:paddingEnd="16dp"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                android:textStyle="bold"
-                tools:ignore="MissingPrefix" />
-
-            <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
-                android:id="@+id/text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:alpha="0.75"
-                android:ellipsize="end"
-                android:paddingStart="16dp"
-                android:paddingEnd="16dp"
-                android:text="@string/lets_play_something" />
-
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingStart="4dp"
-        android:paddingEnd="4dp">
-
-        <LinearLayout
-            android:id="@+id/action_sleep_timer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?rectSelector"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <code.name.monkey.retromusic.views.IconImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="12dp"
-                app:srcCompat="@drawable/ic_timer_white_24dp" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="16dp">
-
-                <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                    android:id="@+id/tv_sleep_timer"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="marquee"
-                    android:singleLine="true"
-                    android:text="@string/action_sleep_timer"
-                    android:textSize="@dimen/ate_default_textsize_subheading" />
-
-            </LinearLayout>
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:id="@+id/action_settings"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?rectSelector"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <code.name.monkey.retromusic.views.IconImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="12dp"
-                app:srcCompat="@drawable/ic_settings_white_24dp" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="16dp">
-
-                <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                    android:id="@+id/tv_settings"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="marquee"
-                    android:singleLine="true"
-                    android:text="@string/action_settings"
-                    android:textSize="@dimen/ate_default_textsize_subheading" />
-
-            </LinearLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/action_about"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?rectSelector"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <code.name.monkey.retromusic.views.IconImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="12dp"
-                app:srcCompat="@drawable/ic_help_white_24dp" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="16dp">
-
-                <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                    android:id="@+id/tv_about"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="marquee"
-                    android:singleLine="true"
-                    android:text="@string/action_about"
-                    android:textSize="@dimen/ate_default_textsize_subheading" />
-
-            </LinearLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/action_rate"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?rectSelector"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <code.name.monkey.retromusic.views.IconImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="12dp"
-                app:srcCompat="@drawable/ic_star_white_24dp" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="16dp">
-
-                <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                    android:id="@+id/tv_rate_app"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="marquee"
-                    android:singleLine="true"
-                    android:text="@string/rate_app"
-                    android:textSize="@dimen/ate_default_textsize_subheading" />
-
-            </LinearLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/action_buy_pro"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?rectSelector"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <code.name.monkey.retromusic.views.IconImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="12dp"
-                app:srcCompat="@drawable/ic_card_giftcard_white_24dp" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="16dp">
-
-                <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
-                    android:id="@+id/tv_buy_pro"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="marquee"
-                    android:singleLine="true"
-                    android:text="@string/buy_retromusic_pro"
-                    android:textSize="@dimen/ate_default_textsize_subheading" />
-            </LinearLayout>
-        </LinearLayout>
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/bottom_navigation_main.xml b/app/src/main/res/menu/bottom_navigation_main.xml
index b642de4a4..d24122585 100644
--- a/app/src/main/res/menu/bottom_navigation_main.xml
+++ b/app/src/main/res/menu/bottom_navigation_main.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/action_home"
+        android:enabled="true"
+        android:icon="@drawable/ic_home_white_24dp"
+        android:title="@string/home" />
+
     <item
         android:id="@+id/action_song"
         android:enabled="true"
@@ -20,10 +27,5 @@
         android:enabled="true"
         android:icon="@drawable/ic_queue_music_white_24dp"
         android:title="@string/playlists" />
-    <item
-        android:id="@+id/action_genre"
-        android:enabled="true"
-        android:icon="@drawable/ic_guitar_acoustic_white_24dp"
-        android:title="@string/genre" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_home.xml b/app/src/main/res/menu/menu_home.xml
deleted file mode 100644
index d0d66c8eb..000000000
--- a/app/src/main/res/menu/menu_home.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/action_search"
-        android:icon="@drawable/ic_search_white_24dp"
-        android:title="@string/action_search"
-        app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/action_folder"
-        android:icon="@drawable/ic_folder_white_24dp"
-        android:title="@string/folders"
-        app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/action_settings"
-        android:icon="@drawable/ic_settings_white_24dp"
-        android:title="@string/action_settings"
-        app:showAsAction="ifRoom" />
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_main_options.xml b/app/src/main/res/menu/menu_main_options.xml
deleted file mode 100644
index 904eca91c..000000000
--- a/app/src/main/res/menu/menu_main_options.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/action_home"
-        android:icon="@drawable/ic_home_white_24dp"
-        android:title="@string/home"
-        app:showAsAction="always" />
-    <item
-        android:id="@+id/action_library"
-        android:icon="@drawable/ic_library_music_white_24dp"
-        android:title="@string/library"
-        app:showAsAction="always" />
-    <item
-        android:id="@+id/action_folders"
-        android:icon="@drawable/ic_folder_white_24dp"
-        android:title="@string/folders"
-        app:showAsAction="always" />
-    <item
-        android:id="@+id/action_settings"
-        android:icon="@drawable/ic_settings_white_24dp"
-        android:title="@string/action_settings"
-        app:showAsAction="always" />
-
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_search.xml b/app/src/main/res/menu/menu_search.xml
deleted file mode 100644
index 0277f89e2..000000000
--- a/app/src/main/res/menu/menu_search.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/search"
-        android:icon="@drawable/ic_search_white_24dp"
-        android:title="@string/action_search"
-        app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:showAsAction="ifRoom|collapseActionView" />
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
deleted file mode 100644
index 22c545796..000000000
--- a/app/src/main/res/navigation/nav_graph.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<navigation xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/nav_graph"
-    app:startDestination="@id/bannerHomeFragment">
-    <fragment
-        android:id="@+id/bannerHomeFragment"
-        android:name="code.name.monkey.retromusic.ui.fragments.mainactivity.home.BannerHomeFragment"
-        android:label="fragment_banner_home"
-        tools:layout="@layout/fragment_banner_home">
-        <action
-            android:id="@+id/action_bannerHomeFragment2_to_libraryFragment"
-            app:destination="@id/libraryFragment" />
-        <action
-            android:id="@+id/action_bannerHomeFragment2_to_foldersFragment"
-            app:destination="@id/foldersFragment" />
-        <action
-            android:id="@+id/action_bannerHomeFragment_to_settingsActivity"
-            app:destination="@id/settingsActivity" />
-    </fragment>
-    <fragment
-        android:id="@+id/foldersFragment"
-        android:name="code.name.monkey.retromusic.ui.fragments.mainactivity.folders.FoldersFragment"
-        android:label="fragment_folder"
-        tools:layout="@layout/fragment_folder" />
-    <fragment
-        android:id="@+id/libraryFragment"
-        android:name="code.name.monkey.retromusic.ui.fragments.mainactivity.LibraryFragment"
-        android:label="fragment_library"
-        tools:layout="@layout/fragment_library">
-        <action
-            android:id="@+id/action_libraryFragment_to_songsFragment"
-            app:destination="@id/songsFragment" />
-    </fragment>
-    <fragment
-        android:id="@+id/songsFragment"
-        android:name="code.name.monkey.retromusic.ui.fragments.mainactivity.SongsFragment"
-        android:label="SongsFragment" />
-    <activity
-        android:id="@+id/settingsActivity"
-        android:name="code.name.monkey.retromusic.ui.activities.SettingsActivity"
-        android:label="activity_settings"
-        tools:layout="@layout/fragment_main_settings" />
-</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/transition/default_window_fade.xml b/app/src/main/res/transition/default_window_fade.xml
deleted file mode 100644
index 7a455c622..000000000
--- a/app/src/main/res/transition/default_window_fade.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<fade xmlns:android="http://schemas.android.com/apk/res/android">
-    <targets>
-        <target android:excludeId="@android:id/statusBarBackground" />
-        <target android:excludeId="@android:id/navigationBarBackground" />
-        <target android:excludeId="@id/app_bar" />
-    </targets>
-</fade>
\ No newline at end of file
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 54920019d..291668d06 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -17,13 +17,11 @@
     <string name="action_grant">منح</string>
     <string name="action_grid_size">حجم الشبكة</string>
     <string name="action_grid_size_land">حجم الشبكة (أفقي)</string>
-    <string name="action_new_playlist">قائمة تشغيل جديدة</string>
     <string name="action_next">التالي</string>
     <string name="action_play">تشغيل</string>
     <string name="action_play_next">تشغيل التالي</string>
     <string name="action_play_pause">تشغيل/إيقاف</string>
     <string name="action_previous">السابق</string>
-    <string name="action_re_download_artist_image">تحديث صورة الفنان</string>
     <string name="action_remove_from_favorites">إزالة من المفضلة</string>
     <string name="action_remove_from_playing_queue">إزالة من قائمة ما يتم تشغيله الآن</string>
     <string name="action_remove_from_playlist">إزالة من قائمة التشغيل</string>
@@ -36,10 +34,7 @@
     <string name="action_set_as_start_directory">تعيين كملف البدء</string>
     <string name="action_settings">"إعدادات"</string>
     <string name="action_share">مشاركة</string>
-    <string name="action_show_lyrics">إظهار كلمات الأغنية</string>
-    <string name="action_shuffle_album">تشغيل الألبوم عشوائياً</string>
     <string name="action_shuffle_all">تشغيل الكل عشوائياً</string>
-    <string name="action_shuffle_artist">تشغيل عشوائي للفنان</string>
     <string name="action_shuffle_playlist">تشغيل عشوائي لقائمة التشغيل</string>
     <string name="action_sleep_timer">مؤقت النوم</string>
     <string name="action_tag_editor">تحرير المعلومات</string>
@@ -50,7 +45,6 @@
     <string name="added_x_titles_to_playing_queue">تمت إضافة %1$d أغاني إلى قائمة ما يتم تشغيله الآن.</string>
     <string name="album">الألبوم</string>
     <string name="album_artist">ألبوم الفنان</string>
-    <string name="album_desc">حسب الألبوم تنازلياً</string>
     <string name="album_or_artist_empty">خانة العنوان أو اسم الفنان فارغة.</string>
     <string name="albums">الألبومات</string>
     <string name="always">دائماً</string>
@@ -62,19 +56,14 @@
     <string name="app_shortcut_shuffle_all_short">تشغيل عشوائي</string>
     <string name="app_shortcut_top_tracks_long">@string/my_top_tracks</string>
     <string name="app_shortcut_top_tracks_short">أكثر الأغاني تشغيلاً</string>
-    <string name="app_summary">تطبيق هجين بين تصميم ماتيريال و ios كذلك.</string>
     <string name="app_widget_big_name">Retro music - Big</string>
-    <string name="app_widget_big_name_2">Retro music - Big2</string>
     <string name="app_widget_card_name">Retro music - Card</string>
     <string name="app_widget_classic_name">Retro music - Classic</string>
     <string name="app_widget_small_name">Retro music - Small</string>
     <string name="artist">الفنان</string>
-    <string name="artist_desc">حسب الفنان تنازلياً</string>
     <string name="artists">الفنانين</string>
     <string name="audio_focus_denied">تم رفض التركيز الصوتي.</string>
-    <string name="bass_boost_strength">قوة تعزيز الجهير</string>
     <string name="biography">سيرة شخصية</string>
-    <string name="biography_unavailable">\u062a\u0639\u0630\u0631 \u0627\u0644\u0639\u062b\u0648\u0631 \u0639\u0644\u0649 \u0627\u0644\u0633\u064a\u0631\u0629 \u0627\u0644\u0634\u062e\u0635\u064a\u0629 \u0644\u0644\u0641\u0646\u0627\u0646.</string>
     <string name="black_theme_name">اسود فقط</string>
     <string name="blacklist">القائمة السوداء</string>
     <string name="cancel_current_timer">إلغاء الموقت الحالي</string>
@@ -84,7 +73,6 @@
     <string name="clear_blacklist">محو القائمة السوداء</string>
     <string name="clear_playlist_title">محو قائمة التشغيل</string>
     <string name="clear_playlist_x"><![CDATA[\u0645\u062d\u0648 \u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u062a\u0634\u063a\u064a\u0644 <b>%1$s</b>\u061f \u0644\u0627 \u064a\u0645\u0643\u0646 \u0627\u0644\u062a\u0631\u0627\u062c\u0639 \u0639\u0646 \u0630\u0644\u0643!]]></string>
-    <string name="colored_footers">تلوين الهوامش</string>
     <string name="colors">الألوان</string>
     <string name="could_not_create_playlist">\u062a\u0639\u0630\u0631 \u0625\u0646\u0634\u0627\u0621 \u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u062a\u0634\u063a\u064a\u0644.</string>
     <string name="could_not_download_album_cover">"\u062a\u0639\u0630\u0631 \u062a\u0646\u0632\u064a\u0644 \u0635\u0648\u0631\u0629 \u0645\u0637\u0627\u0628\u0642 \u0644\u0644\u0623\u0644\u0628\u0648\u0645."</string>
@@ -92,16 +80,11 @@
     <string name="create_action">إنشاء</string>
     <string name="created_playlist_x">إنشاء قائمة التشغيل %1$s.</string>
     <string name="currently_listening_to_x_by_x">تستمع حالياً لـ %1$s التي غناها %2$s .</string>
-    <string name="custom">تخصيص</string>
-    <string name="date">التاريخ</string>
     <string name="default_hint">لا تتوفر كلمات الأغنية</string>
-    <string name="delete_action">حذف</string>
     <string name="delete_playlist_title">حذف قائمة التشغيل</string>
     <string name="delete_playlist_x"><![CDATA[حذف قائمة التشغيل <b>%1$s</b>؟]]></string>
     <string name="delete_playlists_title">حذف قوائم التشغيل</string>
-    <string name="delete_song_title">حذف الأغنية</string>
     <string name="delete_song_x"><![CDATA[حذف الأغنية <b>%1$s</b>؟]]></string>
-    <string name="delete_songs_title">حذف الأغاني</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>
@@ -110,11 +93,8 @@
     <string name="donate">تبرع</string>
     <string name="donate_summary">إذا كنت تعتقد بأنني أستحق الحصول على الأموال مقابل ما قمت به من عمل، يمكنك إعطائي بضعة دولارات هنا.</string>
     <string name="download_from_last_fm">تحميل من Last.fm</string>
-    <string name="duration">المدة</string>
     <string name="empty">فارغ</string>
     <string name="equalizer">محسِّن الصوت</string>
-    <string name="error_loading_lyrics_from_network">حدث خطأ أثناء التحميل من الشبكة</string>
-    <string name="failed_to_save_playlist">فشل حفظ قائمة التشغيل (%s).</string>
     <string name="favorites">المفضلة</string>
     <string name="flat">مسطحة</string>
     <string name="folders">مجلدات</string>
@@ -130,15 +110,9 @@
     <string name="history">السجل</string>
     <string name="home">الرئيسية</string>
     <string name="full">ممتلئ</string>
-    <string name="pref_title_day_dream">احلام اليقظة</string>
-    <string name="pref_summary_day_dream">يعرض تفاصيل الأغنية في الحلم عندما تشغيل الموسيقى</string>
     <string name="inserted_x_songs_into_playlist_x">تم إدراج %1$d أغانية إلى قائمة التشغيل %2$s.</string>
-    <string name="inspired_designs_by">التصاميم مستوحاة من</string>
-    <string name="join_community">انضم إلى منتدى غوغل بلس</string>
-    <string name="join_community_summary">إذا كنت بحاجة إلى المساعدة أو لديك أسئلة، فإن منتدى Retro Music على غوغل بلس هو مكان جيد للذهاب إليه.</string>
     <string name="summary_user_info">فقط لإظهار اسمك على الشاشة الرئيسية</string>
     <string name="label_bit_rate">معدل البت</string>
-    <string name="label_details">التفاصيل</string>
     <string name="label_file_format">النوع</string>
     <string name="label_file_name">اسم الملف</string>
     <string name="label_file_path">مسار الملف</string>
@@ -151,12 +125,9 @@
     <string name="licenses">التراخيص</string>
     <string name="light_theme_name">أبيض واضح</string>
     <string name="listing_files">إدراج الملفات</string>
-    <string name="loading">جارِ التحميل...</string>
     <string name="loading_products">جارِ تحميل المنتجات ...</string>
     <string name="lyrics">كلمات الاغنية</string>
-    <string name="more">المزيد</string>
     <string name="my_name">اسمي</string>
-    <string name="my_playlists">قوائم التشغيل الخاصة بي</string>
     <string name="my_top_tracks">أكثر الأغاني تشغيلاً</string>
     <string name="never">أبداً</string>
     <string name="new_playlist_title">قائمة تشغيل جديدة</string>
@@ -165,7 +136,6 @@
     <string name="no_artists">لا فنانين</string>
     <string name="no_audio_ID">"شغل أغنية أولاً، ثم أعد المحاولة."</string>
     <string name="no_equalizer">لم يتم العثور على تطبيق محسِّن الصوت.</string>
-    <string name="no_files">"لا توجد ملفات "</string>
     <string name="no_lyrics_found">لم يتم العثور على كلمات الأغنية</string>
     <string name="no_playlists">لا توجد قوائم تشغيل</string>
     <string name="no_results">لا نتائج</string>
@@ -181,7 +151,6 @@
     <string name="permission_external_storage_denied">تم رفض الإذن بالوصول إلى ذاكرة التخزين الخارجية.</string>
     <string name="permissions_denied">تم رفض الأذونات.</string>
     <string name="pick_from_local_storage">اختر من ذاكرة التخزين المحلية</string>
-    <string name="play">تشغيل</string>
     <string name="playing_notification_description">إشعار مايتم تشغيله الآن يوفر لك التحكم فيه، تشغيل/إيقاف.. إلخ.</string>
     <string name="playing_notification_name">إشعار مايتم تشغيله الآن</string>
     <string name="playlist_empty_text">قائمة تشغيل فارغة</string>
@@ -191,11 +160,8 @@
     <string name="pref_header_audio">الصوت</string>
     <string name="pref_header_images">الصور</string>
     <string name="pref_header_lockscreen">شاشة التأمين</string>
-    <string name="pref_header_now_playing_screen">مايتم تشغيله الآن</string>
     <string name="pref_header_playlists">قوائم التشغيل</string>
     <string name="pref_only_lollipop">"متوفر فقط على أندرويد لولي بوب."</string>
-    <string name="pref_only_nougat_mr1">"متوفر فقط على أندرويد نوجا 7.1."</string>
-    <string name="pref_summary_about">أشخاص ساعدوا في المشروع</string>
     <string name="pref_summary_album_art_on_lockscreen">تستخدم صورة ألبوم الأغنية الحالية كخلفية لشاشة التأمين.</string>
     <string name="pref_summary_audio_ducking">الإشعارات، التنقل.. إلخ.</string>
     <string name="pref_summary_blurred_album_art">تجعل صورة ألبوم الأغنية على شاشة التأمين ضبابية. يمكن أن يتسبب هذا الإعداد بمشاكل مع تطبيقات الطرف الثالث والويدجت.</string>
@@ -204,13 +170,10 @@
     <string name="pref_summary_colored_app_shortcuts">تغيير لون إختصارات التطبيق لجعلها مثل اللون الرئيسي للتطبيق. قم بإعادة تفعيل هذا الإعداد في كل مرة تقوم فيها بتغيير اللون الرئيسي للتطبيق.</string>
     <string name="pref_summary_colored_navigation_bar">تلوين شريط التنقل باللون الرئيسي للتطبيق.</string>
     <string name="pref_summary_colored_notification">"\u062a\u0644\u0648\u064a\u0646 \u0627\u0644\u0625\u0634\u0639\u0627\u0631 \u062d\u0633\u0628 \u0635\u0648\u0631\u0629 \u0623\u0644\u0628\u0648\u0645 \u0627\u0644\u0623\u063a\u0646\u064a\u0629."</string>
-    <string name="pref_summary_exclude_songs">"استبعاد الأغاني التي تقل مدتها عن 30 ثانية "</string>
     <string name="pref_summary_gapless_playback">"يمكن أن يسبب مشاكل في التشغيل عند بعض الأجهزة."</string>
     <string name="pref_summary_ignore_media_store_artwork">يمكنك زيادة جودة صورة الألبوم ولكن قد يسبب بطأ وقت تحميل الصورة. قم بتفعيلها فقط إذا كانت لديك مشكلة إنخفاض دقة صور الألبوم.</string>
-    <string name="pref_summary_lock_screen_app">عرض عناصر التحكم الكاملة في شاشة التأمين.</string>
     <string name="pref_summary_open_source_licences">تفاصيل ترخيص البرنامج المفتوح المصدر</string>
     <string name="pref_summary_round_corners">زاويا مستديرة للنوافذ وصورة الألبوم.. إلخ.</string>
-    <string name="pref_summary_toggle_bottom_bar_titles">تعطيل العناوين من شريط التنقل السفلي</string>
     <string name="pref_summary_toggle_full_screen">تمكين وضع الشاشة الكاملة</string>
     <string name="pref_summary_toggle_volume">إذا كانت هناك مساحة في شاشة ما يتم تشغيله الآن ستتم إضافة وحدة التحكم بالصوت</string>
     <string name="pref_title_album_art_on_lockscreen">إظهار صورة الألبوم</string>
@@ -222,19 +185,15 @@
     <string name="pref_title_colored_app">التلوين التلقائي</string>
     <string name="dark_theme_name">غامق نوعاً ما</string>
     <string name="pref_title_colored_notification">تلوين الإشعارات</string>
-    <string name="pref_title_exclude_songs">استبعاد الأغاني</string>
     <string name="pref_title_gapless_playback">التشغيل دون إنقطاع</string>
     <string name="pref_title_general_theme">السمة العامة</string>
-    <string name="pref_title_gradient_color">اختيار اللون</string>
     <string name="pref_title_ignore_media_store_artwork">تجاهل الصور من Media Store</string>
     <string name="pref_title_last_added_interval">فترة آخر قائمة تشغيل تمت إضافتها</string>
     <string name="pref_title_lock_screen">عناصر التحكم في الشاشة الكاملة</string>
-    <string name="pref_title_lock_screen_app">شاشة تأمين Retro</string>
     <string name="pref_title_navigation_bar">تلوين شريط التنقل</string>
     <string name="pref_title_now_playing_screen_appearance">المظهر</string>
     <string name="pref_title_open_source_licences">تراخيص المصدر المفتوح</string>
     <string name="pref_title_round_corners">زوايا مستديرة</string>
-    <string name="pref_title_toggle_bottom_bar_titles">تعطيل العناوين</string>
     <string name="pref_title_toggle_full_screen">شاشة كاملة</string>
     <string name="pref_title_toggle_volume">عناصر التحكم في مستوى الصوت</string>
     <string name="pref_title_user_info">معلومات المستخدم</string>
@@ -242,7 +201,6 @@
     <string name="queue">قائمة ما يتم تشغيله الآن</string>
     <string name="rate_app">قيم التطبيق</string>
     <string name="rate_on_google_play_summary">أحببت هذا التطبيق أخبرنا بذلك في متجر غوغل بلاي لتوفير تجربة أفضل</string>
-    <string name="recent_activity">النشاط الأخير</string>
     <string name="remove_action">إزالة</string>
     <string name="remove_cover">إزالة صورة الألبوم</string>
     <string name="remove_from_blacklist">إزالة من القائمة السوداء</string>
@@ -250,18 +208,14 @@
     <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_action">إعادة تسمية</string>
     <string name="rename_playlist_title">إعادة تسمية  قائمة التشغيل</string>
     <string name="restored_previous_purchases">تمت استعادة عمليات الشراء السابقة.</string>
-    <string name="retro">Retro</string>
     <string name="retro_equalizer">محسِّن الصوت Retri</string>
     <string name="save_playlist_title">حفظ كملف</string>
     <string name="saved_playlist_to">تم حفظ قائمة التشغيل إلى %s.</string>
     <string name="saving_changes">جارِ حفظ التغييرات</string>
-    <string name="saving_to_file">جار الحفظ إلى الملف...</string>
     <string name="scanned_files">تم فحص %1$d من %2$d ملف.</string>
     <string name="search_hint">البحث في مكتبتك ...</string>
-    <string name="select_preset">حدد الإعداد المسبق</string>
     <string name="shuffle">تشغيل عشوائي</string>
     <string name="sleep_timer_canceled">تم إلغاء مؤقت النوم.</string>
     <string name="sleep_timer_set">تم تعيين مؤقت النوم لـ %d دقيقة/دقائق من الآن.</string>
@@ -271,36 +225,22 @@
     <string name="sort_order">طريقة الترتيب</string>
     <string name="speech_not_supported">عذراً، جهازك لايدعم إدخال الكلام</string>
     <string name="speech_prompt">ابحث في مكتبتك</string>
-    <string name="summary_material_design_city_wallpaper">خلفية Material design city من موقع www.techjuice.pk</string>
-    <string name="summary_material_design_icons">جميع الرموز التي استخدمناها من هذه المواقع www.flaticon.com أو www.materialdesignicons.com</string>
     <string name="support_development">إدعم المطور</string>
     <string name="thank_you">شكراً جزيلاً!</string>
     <string name="the_audio_file">الملف الصوتي</string>
     <string name="this_month">هذا الشهر</string>
     <string name="this_week">هذا الاسبوع</string>
     <string name="this_year">هذا العام</string>
-    <string name="title">العنوان</string>
     <string name="title_dashboard">لوحة التحكم الرئيسية</string>
-    <string name="title_desc">تنازلياً حسب العنوان</string>
-    <string name="title_home">الرئيسية</string>
-    <string name="title_material_design_city_wallpaper">خلفية المدينة</string>
-    <string name="title_material_design_icons">الأيقونات</string>
-    <string name="title_notifications">الإشعارات</string>
     <string name="today">اليوم</string>
-    <string name="top_tracks">أكثر الأغاني تشغيلاً</string>
     <string name="track_hint">"الأغنية (2 للأغنية 2 أو 3004 لـ CD3 الأغنية 4)"</string>
     <string name="track_list">رقم الأغنية</string>
     <string name="translate">ترجمة</string>
-    <string name="translate_summary">ساعد في ترجمة Retro music إلى لغتك الأم.</string>
     <string name="unplayable_file">\u062a\u0639\u0630\u0631 \u062a\u0634\u063a\u064a\u0644 \u0647\u0630\u0647 \u0627\u0644\u0623\u063a\u0646\u064a\u0629.</string>
     <string name="up_next">التالي</string>
-    <string name="update">تحديث</string>
     <string name="update_image">تحديث الصورة</string>
-    <string name="updated_artist_image">تم تحديث صورة الفنان.</string>
     <string name="updating">جارِ التحديث...</string>
     <string name="version">الإصدار</string>
-    <string name="virtualizer_strength">شدة المحاكاة الافتراضية</string>
-    <string name="volume_control">عناصر التحكم في مستوى الصوت</string>
     <string name="web_search">البحث في الويب</string>
     <string name="what_do_you_want_to_share">ما الذي تريد مشاركته؟</string>
     <string name="title_user_info">ما اسمك</string>
@@ -309,33 +249,22 @@
     <string name="year">عام</string>
     <string name="reset_artist_image">إعادة تعيين صورة الفنان</string>
     <string name="set_artist_image">تعيين صورة الفنان</string>
-    <string name="edit">تعديل</string>
     <string name="donation_header">اشتري لي</string>
     <string name="plain">سهل</string>
-    <string name="tool_tip_see_all">مشاهدة جميع الأغاني</string>
-    <string name="toggle_lyrics_size">تبديل حجم كلمات الأغاني</string>
     <string name="title_good_night">ليلة سعيدة</string>
     <string name="title_good_evening">مساء الخير</string>
     <string name="title_good_afternoon">طاب مسائك</string>
     <string name="title_good_morning">صباح الخير</string>
     <string name="title_good_day">يوم سعيد</string>
-    <string name="language_contributors">المساهمون في الترجمة</string>
     <string name="simple">بسيط</string>
     <string name="pref_summary_toggle_headset">عند توصيل سماعة الرأس، إبدأ بتشغيل الوسيقى</string>
     <string name="pref_title_toggle_toggle_headset">تشغيل تلقائي</string>
     <string name="pref_summary_tab_titles">تمكين / تعطيل علامات التبويب بالأسفل</string>
     <string name="pref_title_toggle_tab_titles">عناوين علامات التبويب</string>
-    <string name="pref_summary_language_en">تغيير لغة التطبيق إلى اللغة الإنجليزية (هذا اختبار لخيارات اللغات المتعددة)</string>
-    <string name="pref_title_toggle_language_en">English language</string>
-    <string name="see_all">اظهار الكل</string>
     <string name="for_you">لك فقط</string>
-    <string name="play_all">تشغيل الكل</string>
     <string name="normal">عادي</string>
-    <string name="experimental">تجريبي</string>
     <string name="pref_summary_lock_screen">إظهار شاشة تأمين الخاصة بتطبيق Retro music</string>
-    <string name="slide_unlock">قم بالتمرير لإلغاء القفل</string>
     <string name="primary_color_desc">لون السمة الرئيسية، اللون الافتراضي هو الأبيض.</string>
-    <string name="media_route_menu_title">بث إلى جهاز</string>
     <string name="tiny">دقيق</string>
     <!-- SAF -->
     <!-- SAF guide -->
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 5c76880e3..2941e0678 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -23,13 +23,11 @@
     <string name="action_grant">Grant</string>
     <string name="action_grid_size">Velikost mřížky</string>
     <string name="action_grid_size_land">Velikost spodní mřížky</string>
-    <string name="action_new_playlist">Nový seznam skladeb...</string>
     <string name="action_next">Další</string>
     <string name="action_play">Přehrát</string>
     <string name="action_play_next">Přehrát další</string>
     <string name="action_play_pause">Přehrát/Pozastavit</string>
     <string name="action_previous">Předchozí</string>
-    <string name="action_re_download_artist_image">Aktualizace obrázku interpreta</string>
     <string name="action_remove_from_favorites">"Odstranit z oblíbených "</string>
     <string name="action_remove_from_playing_queue">"Odstranit z fronty "</string>
     <string name="action_remove_from_playlist">Odstranit ze seznamu skladeb</string>
@@ -41,10 +39,7 @@
     <string name="action_set_as_start_directory">Nastavit jako počáteční adresář</string>
     <string name="action_settings">"Nastavení"</string>
     <string name="action_share">Sdílet</string>
-    <string name="action_show_lyrics">Ukázat text</string>
-    <string name="action_shuffle_album">Náhodný výběr alba</string>
     <string name="action_shuffle_all">Náhodný výběr všech skladeb</string>
-    <string name="action_shuffle_artist">Náhodný výběr umělce</string>
     <string name="action_shuffle_playlist">Náhodný výběr playlistu</string>
     <string name="action_sleep_timer">Časovač vypnutí</string>
     <string name="action_tag_editor">Editor tagů</string>
@@ -53,7 +48,6 @@
     <string name="added_x_titles_to_playing_queue">Přidány %1$d tituly do fronty přehrávání.</string>
     <string name="album">Album</string>
     <string name="album_artist">Umělec alba</string>
-    <string name="album_desc">Album</string>
     <string name="album_or_artist_empty">Titul nebo umělec je prázdný.</string>
     <string name="albums">Albumy</string>
     <string name="always">Vždy</string>
@@ -65,22 +59,18 @@
     <string name="app_shortcut_top_tracks_long">@string/my_top_tracks</string>
     <string name="app_shortcut_top_tracks_short">Top Tracks</string>
     <string name="app_widget_big_name">Retro music - Big</string>
-    <string name="app_widget_big_name_2">Retro music - Big2</string>
     <string name="app_widget_classic_name">Retro music - Classic</string>
     <string name="app_widget_small_name">Retro music - Small</string>
     <string name="artist">Umělec</string>
-    <string name="artist_desc">Interpret</string>
     <string name="artists">Umělci</string>
     <string name="audio_focus_denied">Zaměření zvuku bylo zamítnuto.</string>
     <string name="biography">Bio</string>
-    <string name="biography_unavailable">Nelze naj\u00edt biografii um\u011blce.</string>
     <string name="black_theme_name">Velmi černá</string>
     <string name="cancel_current_timer">Zrušit aktuální časovač</string>
     <string name="changelog">Přehled změn</string>
     <string name="clear_action">Vyčistit</string>
     <string name="clear_playlist_title">Vyčistit seznam skladeb</string>
     <string name="clear_playlist_x"><![CDATA[Vymazat seznam skladeb <b>%1$s</b>? Akci nelze vr\u00e1tit zp\u011bt!]]></string>
-    <string name="colored_footers">Barevné zápatí</string>
     <string name="colors">Barvy</string>
     <string name="could_not_create_playlist">Nelze vytvo\u0159it playlist.</string>
     <string name="could_not_download_album_cover">"Nelze st\u00e1hnout odpov\u00eddaj\u00edc\u00ed obal alba."</string>
@@ -88,24 +78,18 @@
     <string name="create_action">Vytvořit</string>
     <string name="created_playlist_x">"Vytvořený seznam skladeb "</string>
     <string name="currently_listening_to_x_by_x">Aktuálně posloucháš %1$s od %2$s.</string>
-    <string name="date">Datum</string>
-    <string name="delete_action">Smazat</string>
     <string name="delete_playlist_title">Smazat seznam skladeb</string>
     <string name="delete_playlist_x"><![CDATA[Smazat seznam skladeb <b>%1$s</b>?]]></string>
     <string name="delete_playlists_title">Smazat seznamy skladeb</string>
-    <string name="delete_song_title">Smazat skladbu</string>
     <string name="delete_song_x"><![CDATA[Smazat píseň <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Smazat skladby</string>
     <string name="delete_x_playlists"><![CDATA[Smazat <b>%1$d</b> seznamů skladeb?]]></string>
     <string name="delete_x_songs"><![CDATA[Smazat <b>%1$d</b> písní?]]></string>
     <string name="deleted_x_songs">%1$d skladby byly smazány.</string>
     <string name="donate">Darovat</string>
     <string name="donate_summary">Pokud si myslíte, že si zasloužím odměnu za svou práci, můžete mi nechat pár dolarů.</string>
     <string name="download_from_last_fm">Stáhnout z Last.fm</string>
-    <string name="duration">Délka</string>
     <string name="empty">Prázdný</string>
     <string name="equalizer">Equalizer</string>
-    <string name="failed_to_save_playlist">Nepodařilo se uložit seznam skladeb (%s).</string>
     <string name="favorites">Oblíbené</string>
     <string name="flat">Flat</string>
     <string name="folders">Složky</string>
@@ -113,11 +97,7 @@
     <string name="history">Historie</string>
     <string name="home">Domov</string>
     <string name="inserted_x_songs_into_playlist_x">Do playlistu %2$s byly vloženy %1$d skladby.</string>
-    <string name="inspired_designs_by">Inspirace pro design</string>
-    <string name="join_community">Připojit ke komunitě Google Plus</string>
-    <string name="join_community_summary">Pokud potřebujete pomoc nebo máte nějaké dotazy, komunita hudby Retro v Google Plus je dobrým místem.</string>
     <string name="label_bit_rate">Datový tok</string>
-    <string name="label_details">Podrobnosti</string>
     <string name="label_file_format">Formát</string>
     <string name="label_file_name">Název souboru</string>
     <string name="label_file_path">Umístění souboru</string>
@@ -131,7 +111,6 @@
     <string name="listing_files">Výpis souborů</string>
     <string name="loading_products">Načítání produktů...</string>
     <string name="lyrics">Text</string>
-    <string name="more">Víc</string>
     <string name="my_top_tracks">Moje top skladby</string>
     <string name="never">Nikdy</string>
     <string name="new_playlist_title">"Nový seznam skladeb "</string>
@@ -140,7 +119,6 @@
     <string name="no_artists">žádní umělci</string>
     <string name="no_audio_ID">"Přehrajte nejprve píseň a zkuste to znovu."</string>
     <string name="no_equalizer">Nebyl nalezen žádný ekvalizér.</string>
-    <string name="no_files">Žádné soubory</string>
     <string name="no_playlists">Žádné playlisty</string>
     <string name="no_results">Žádné výsledky</string>
     <string name="no_songs">Žádné písně</string>
@@ -154,16 +132,13 @@
     <string name="permission_external_storage_denied">Povolení přístupu k externímu úložišti bylo zamítnuto.</string>
     <string name="permissions_denied">Oprávnění byla odepřena.</string>
     <string name="pick_from_local_storage">Vyberte z místního úložiště</string>
-    <string name="play">Přehrát</string>
     <string name="playlist_empty_text">Prázdny seznam skladeb</string>
     <string name="playlist_name_empty">Název playlistu</string>
     <string name="playlists">Seznamy skladeb</string>
     <string name="pref_header_audio">Zvuk</string>
     <string name="pref_header_images">Obrázky</string>
     <string name="pref_header_lockscreen">Obrazovka uzamčení</string>
-    <string name="pref_header_now_playing_screen">Vzhled</string>
     <string name="pref_only_lollipop">"K dispozici pouze na Lollipop."</string>
-    <string name="pref_only_nougat_mr1">"K dispozici pouze pro Nougat 7.1."</string>
     <string name="pref_summary_album_art_on_lockscreen">Používá současný obal alba písní jako tapetu zámku.</string>
     <string name="pref_summary_audio_ducking">Oznámení, navigace atd.</string>
     <string name="pref_summary_blurred_album_art">Blur obal alba na uzamčení obrazovky. Může způsobit problémy s aplikacemi třetích stran a widgety.</string>
@@ -171,7 +146,6 @@
     <string name="pref_summary_colored_app_shortcuts">Vybarvit zkratky aplikací v barvě odstínu. Pokaždé, když změníte barvu, přepněte toto nastavení, aby se projevil efekt</string>
     <string name="pref_summary_colored_navigation_bar">Vybarvit navigační lištu v primární barvě.</string>
     <string name="pref_summary_colored_notification">"Vybarv\u00ed ozn\u00e1men\u00ed v \u017eiv\u00e9 barv\u011b krytu alba."</string>
-    <string name="pref_summary_exclude_songs">Vyloučit skladby, které jsou kratší než 30 sekund.</string>
     <string name="pref_summary_gapless_playback">"Může způsobit problémy s přehráváním u některých zařízení."</string>
     <string name="pref_summary_ignore_media_store_artwork">Může zvýšit kvalitu obalu alba, ale způsobí pomalejší načítání snímků. Tuto možnost povolte pouze v případě potíží s uměleckými díly s nízkým rozlišením.</string>
     <string name="pref_summary_round_corners">Rohové okraje oken, alba atd.</string>
@@ -183,7 +157,6 @@
     <string name="pref_title_colored_app">Adaptivní barva</string>
     <string name="dark_theme_name">Tmavá</string>
     <string name="pref_title_colored_notification">Barevné notifikace</string>
-    <string name="pref_title_exclude_songs">Vyloučit skladby</string>
     <string name="pref_title_gapless_playback">Přehrávání bez mezery</string>
     <string name="pref_title_general_theme">Hlavní téma</string>
     <string name="pref_title_ignore_media_store_artwork">Ignorovat obaly v zařízení</string>
@@ -200,13 +173,11 @@
     <string name="remove_song_x_from_playlist"><![CDATA[Odstranit skladbu <b>%1$s</b> ze seznamu skladeb?]]></string>
     <string name="remove_songs_from_playlist_title">Smazat skladby ze seznamu skladeb</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[Odstranit <b>%1$s</b> skladby ze seznamu skladeb?]]></string>
-    <string name="rename_action">Přejmenovat</string>
     <string name="rename_playlist_title">Přejmenovat seznam skladeb</string>
     <string name="restored_previous_purchases">Předchozí nákupy byly obnoveny.</string>
     <string name="save_playlist_title">Uložit jako soubor</string>
     <string name="saved_playlist_to">Seznam skladeb uložený do %s.</string>
     <string name="saving_changes">Uložení změn</string>
-    <string name="saving_to_file">Uložení do souboru ...</string>
     <string name="scanned_files">Naskenované %1$d z %2$d souborů.</string>
     <string name="search_hint">Prohledat knihovnu...</string>
     <string name="shuffle">Náhodně</string>
@@ -220,15 +191,11 @@
     <string name="support_development">Podpora vývoje</string>
     <string name="thank_you">Děkujeme!</string>
     <string name="the_audio_file">Audio soubor</string>
-    <string name="title">Titul</string>
-    <string name="title_desc">Titul</string>
     <string name="track_hint">"Skladba (2 pro stopu 2 ​​nebo 3004 pro čtvrtou stopu z CD3)"</string>
     <string name="translate">Překlad</string>
-    <string name="translate_summary">Pomozte přeložit Retro music do vašeho rodného jazyka.</string>
     <string name="unplayable_file">Tuto p\u00edse\u0148 se nepoda\u0159ilo p\u0159ehr\u00e1t.</string>
     <string name="up_next">Up next</string>
     <string name="update_image">Aktualizovat obrázek</string>
-    <string name="updated_artist_image">Obrázek umělce byl aktualizován.</string>
     <string name="updating">Aktualizace...</string>
     <string name="version">Verze</string>
     <string name="web_search">Webové vyhledávání</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index aca27397b..5c15e858b 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -1,430 +1,305 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <resources>
-  <string name="accent_color">Akzentfarbe</string>
-  <string name="accent_color_desc">Die standartfarbe des Akzentthemas ist grün.</string>
-  <string name="action_about">Über</string>
-  <string name="action_add_to_favorites">Zu Favoriten hinzufügen</string>
-  <string name="action_add_to_playing_queue">Zur Warteschlange hinzufügen</string>
-  <string name="action_add_to_playlist">Zu Playlist hinzufügen</string>
-  <string name="action_clear_playing_queue">Warteschlange leeren</string>
-  <string name="action_clear_playlist">Lösche Playlist</string>
-  <string name="action_cycle_repeat">Wiederholungsmodus</string>
-  <string name="action_delete">Löschen</string>
-  <string name="action_delete_from_device">Vom Gerät löschen</string>
-  <string name="action_details">Details</string>
-  <string name="action_go_to_album">Gehe zum Album</string>
-  <string name="action_go_to_artist">Gehe zum Künstler</string>
-  <string name="action_go_to_start_directory">zum Startverzeichnis gehen</string>
-  <string name="action_grant">Gewähren</string>
-  <string name="action_grid_size">Rastergröße</string>
-  <string name="action_grid_size_land">Gittergröße (Querformat)</string>
-  <string name="action_new_playlist">Neue Playlist...</string>
-  <string name="action_next">Nächste</string>
-  <string name="action_play">Abspielen</string>
-  <string name="action_play_next">Als nächstes spielen</string>
-  <string name="action_play_pause">Abspielen/Pausieren</string>
-  <string name="action_previous">Zurück</string>
-  <string name="action_re_download_artist_image">Künstler-Bild aktualisieren</string>
-  <string name="action_remove_from_favorites">Von Favoriten entfernen</string>
-  <string name="action_remove_from_playing_queue">Von der Warteschlange entfernen</string>
-  <string name="action_remove_from_playlist">Von Playlist entfernen</string>
-  <string name="action_rename">Umbenennen</string>
-  <string name="action_save_playing_queue">Warteschlange speichern</string>
-  <string name="action_scan">Durchsuchen</string>
-  <string name="action_search">Suchen</string>
-  <string name="action_set">Einstellen</string>
-  <string name="action_set_as_ringtone">Als Klingelton setzen</string>
-  <string name="action_set_as_start_directory">Als Start-Verzeichnis festlegen</string>
-  <string name="action_settings">"Einstellungen"</string>
-  <string name="action_share">Teilen</string>
-  <string name="action_show_lyrics">Liedtext zeigen</string>
-  <string name="action_shuffle_album">Album zufällig wiedergegeben</string>
-  <string name="action_shuffle_all">Alle zufällig wiedergeben</string>
-  <string name="action_shuffle_artist">Alle Künstler zufällig wiedergeben</string>
-  <string name="action_shuffle_playlist">Playlistinhalt zufällig wiedergeben</string>
-  <string name="action_sleep_timer">Schlaf-Timer</string>
-  <string name="action_tag_editor">Tag Editor</string>
-  <string name="action_toggle_favorite">Favoriten umschalten</string>
-  <string name="action_toggle_shuffle">Shuffle-Modus umschalten</string>
-  <string name="add_action">Hinzufügen</string>
-  <string name="add_photo">Foto hinzufügen</string>
-  <string name="add_playlist_title">"Zu Playlist hinzufügen"</string>
-  <string name="added_title_to_playing_queue">"1 Titel wurde zur Warteschlange hinzugefügt"</string>
-  <string name="added_x_titles_to_playing_queue">%1$d Titel wurden zur Warteschlange hinzugefügt</string>
-  <string name="album">Album</string>
-  <string name="album_artist">Album Künstler</string>
-  <string name="album_desc">Album Beschreibung</string>
-  <string name="album_or_artist_empty">Der Titel oder der Künstler ist leer.</string>
-  <string name="albums">Alben</string>
-  <!-- Android Auto -->
-  <string name="albums_label">Alben</string>
-  <string name="always">Immer</string>
-  <string name="app_share">Hey, probier diesen coolen Musik Player aus: https://play.google.com/store/apps/details?id=%s</string>
-  <!-- App Shortcuts -->
-  <string name="app_shortcut_last_added_long">@string/last_added</string>
-  <string name="app_shortcut_last_added_short">@string/last_added</string>
-  <string name="app_shortcut_shuffle_all_long">@string/action_shuffle_all</string>
-  <string name="app_shortcut_shuffle_all_short">Zufällig</string>
-  <string name="app_shortcut_top_tracks_long">@string/my_top_tracks</string>
-  <string name="app_shortcut_top_tracks_short">Top Lieder</string>
-  <string name="app_summary">Eine Hybridanwendung zwischen Materialdesign und iOS</string>
-  <string name="app_widget_big_name">Retro music - Groß</string>
-  <string name="app_widget_big_name_2">Retro music - Groß 2</string>
-  <string name="app_widget_card_name">Retro music - Karte</string>
-  <string name="app_widget_classic_name">Retro music - Klassisch</string>
-  <string name="app_widget_small_name">Retro music - Klein</string>
-  <string name="artist">Künstler</string>
-  <string name="artist_desc">Informationen zum Künstler</string>
-  <string name="artists">Künstler</string>
-  <string name="artists_label">Künstler</string>
-  <string name="at_least_one_category_must_be_enabled">Mindestens eine Kategorie muss aktiviert sein</string>
-  <string name="audio_focus_denied">Audio Fokus abgelehnt</string>
-  <string name="audio_settings_summary">Sound und Equalizer Einstellungen ändern</string>
-  <string name="bass_boost_strength">Bass Boost Stärke</string>
-  <string name="biography">Biografie</string>
-  <string name="biography_unavailable">Konnte K\u00fcnstler-Biografie nicht finden</string>
-  <string name="black_theme_name">Schwarz</string>
-  <string name="blacklist">Schwarze Liste</string>
-  <string name="blur">Weichgezeichnet</string>
-  <string name="blur_card">Verschwommene Karte</string>
-  <string name="buy_retromusic_pro">Kaufe RetroMusic Pro</string>
-  <string name="cancel_current_timer">Aktuellen Timer stoppen</string>
-  <string name="card">Karte</string>
-  <string name="changelog">Änderungsprotokoll</string>
-  <string name="changelog_summary">Das Änderungsprotokoll wird in Telegram geführt</string>
-  <string name="clear_action">Leeren</string>
-  <string name="clear_blacklist">Schwarze Liste leeren</string>
-  <string name="clear_playlist_title">Playlist löschen</string>
-  <string name="clear_playlist_x"><![CDATA[Die <b>%1$s</b> Playlist leeren? Dies kann nicht r\u00fcckg\u00e4ngig gemacht werden!]]></string>
-  <string name="color">Farbe</string>
-  <string name="color_theme_name">Farbe</string>
-  <string name="colored_footers">Farbige Fußzeilen</string>
-  <string name="colors">Farben</string>
-  <string name="could_not_create_playlist">Playlist konnte nicht erstellt werden</string>
-  <string name="could_not_download_album_cover">"Konnte kein passendes Albumcover herunterladen"</string>
-  <string name="could_not_restore_purchase">"Konnte die Einkäufe nicht wiederhergestellen. "</string>
-  <string name="could_not_scan_files">Kann %d Dateien nicht scannen</string>
-  <string name="create_action">Erstellen</string>
-  <string name="created_playlist_x">Playlist %1$s wurde erstellt</string>
-  <string name="currently_listening_to_x_by_x">Aktuell läuft %1$s von %2$s</string>
-  <string name="custom">Maßgeschneidert</string>
-  <string name="dark_theme_name">Irgendwie dunkel</string>
-  <string name="date">Datum</string>
-  <string name="default_hint">Kein Liedtext</string>
-  <string name="delete_action">Löschen</string>
-  <string name="delete_playlist_title">Playlist löschen</string>
-  <string name="delete_playlist_x"><![CDATA[Playlist<b>%1$s</b> löschen?]]></string>
-  <string name="delete_playlists_title">Playlist\'s löschen</string>
-  <string name="delete_song_title">Lied löschen</string>
-  <string name="delete_song_x"><![CDATA[Lied <b>%1$s</b> löschen?]]></string>
-  <string name="delete_songs_title">Lieder löschen</string>
-  <string name="delete_x_playlists"><![CDATA[Playlist\'s <b>%1$d</b> löschen?]]></string>
-  <string name="delete_x_songs"><![CDATA[Lieder <b>%1$d</b> löschen?]]></string>
-  <string name="deleted_x_songs">%1$d Lieder wurden gelöscht</string>
-  <string name="deleting_songs">Lieder löschen</string>
-  <string name="do_you_want_to_clear_the_blacklist">Schwarze Liste löschen?</string>
-  <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Möchtest du <b>%1$s</b> von der Schwarzen Liste löschen?]]></string>
-  <string name="donate">Spenden</string>
-  <string name="donate_summary">Wenn Sie denken, ich hätte einen Lohn für meine Arbeit verdient, können Sie mir hier etwas spenden</string>
-  <string name="donation_header">Kauf mir ein</string>
-  <string name="download_from_last_fm">Von Last.fm herunterladen</string>
-  <string name="duration">Dauer</string>
-  <string name="edit">Bearbeiten</string>
-  <string name="edit_categories">Kategorien bearbeiten</string>
-  <string name="edit_tags">Tags bearbeiten</string>
-  <string name="empty">Leer</string>
-  <string name="equalizer">Equalizer</string>
-  <string name="error_loading_lyrics_from_network">Fehler beim Laden aus dem Netzwerk</string>
-  <string name="experimental">Experimentell</string>
-  <string name="failed_to_save_playlist">Speichern der Playlist fehlgeschlagen (%s)</string>
-  <string name="favorites">Favoriten</string>
-  <string name="flat">Flach</string>
-  <string name="folders">Ordner</string>
-  <string name="for_you">Für dich</string>
-  <string name="full">Voll</string>
-  <string name="general_settings_summary">Allgemeine Farbe ändern</string>
-  <string name="general_settings_title">Aussehen und Gefühl</string>
-  <string name="genre">Genre</string>
-  <string name="genres">Genres</string>
-  <string name="gradient">Übergangsfarben</string>
-  <string name="grid_size_1">1</string>
-  <string name="grid_size_2">2</string>
-  <string name="grid_size_3">3</string>
-  <string name="grid_size_4">4</string>
-  <string name="grid_size_5">5</string>
-  <string name="grid_size_6">6</string>
-  <string name="grid_size_7">7</string>
-  <string name="grid_size_8">8</string>
-  <string name="history">Verlauf</string>
-  <string name="history_label">Verlauf</string>
-  <string name="holiday">Ferien</string>
-  <string name="home">Home</string>
-  <string name="inserted_x_songs_into_playlist_x">%1$d Lieder wurden zur Playlist %2$s hinzugefügt</string>
-  <string name="inspired_designs_by">Designs inspiriert von</string>
-  <string name="join_community">Tritt der Google Plus Community bei</string>
-  <string name="join_community_summary">Wenn du Hilfe benötigst oder Fragen hast, ist die Retro Music Community auf Google Plus genau richtig für dich und deine Frage</string>
-  <string name="label_bit_rate">Bitrate</string>
-  <string name="label_details">Details</string>
-  <string name="label_file_format">Format</string>
-  <string name="label_file_name">Dateiname</string>
-  <string name="label_file_path">Dateipfad</string>
-  <string name="label_file_size">Größe</string>
-  <string name="label_sampling_rate">Abtastrate</string>
-  <string name="label_track_length">Länge</string>
-  <string name="language_contributors">Übersetzer</string>
-  <string name="last_added">Zuletzt hinzugefügt</string>
-  <string name="lets_play_something">Lass uns etwas spielen</string>
-  <string name="library">Bibliothek</string>
-  <string name="library_categories">Bibliothekskategorien</string>
-  <string name="licenses">Lizenzen</string>
-  <string name="light_theme_name">Weiß</string>
-  <string name="listing_files">Gelistete Dateien</string>
-  <string name="loading">Lade...</string>
-  <string name="loading_products">Lade Produkte...</string>
-  <string name="lyrics">Songtexte</string>
-  <string name="media_route_menu_title">Wiedergabegerät</string>
-  <string name="more">Mehr</string>
-  <string name="my_name">Mein Name</string>
-  <string name="my_playlists">Meine Playlist</string>
-  <string name="my_top_tracks">Meine Top Lieder</string>
-  <string name="never">Nie</string>
-  <string name="new_playlist_title">Neue Playlist</string>
-  <string name="new_start_directory">%s ist das neue Startverzeichnis</string>
-  <string name="no_albums">Keine Alben</string>
-  <string name="no_artists">Keine Künstler</string>
-  <string name="no_audio_ID">"Spiele zuerst ein Leid und versuche es dann erneut"</string>
-  <string name="no_equalizer">Kein Equalizer gefunden</string>
-  <string name="no_files">Keine Dateien</string>
-  <string name="no_genres">Keine Genres</string>
-  <string name="no_lyrics_found">Keine Liedtexte gefunden</string>
-  <string name="no_playlists">Keine Playlist\'s</string>
-  <string name="no_purchase_found">"Kein Kauf gefunden "</string>
-  <string name="no_results">Keine Ergebnisse</string>
-  <string name="no_songs">Keine Lieder</string>
-  <string name="normal">Normal</string>
-  <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> ist nicht im Medienspeicher aufgeführt]]></string>
-  <string name="nothing_to_scan">Nichts zu scannen</string>
-  <string name="notification">Benachrichtigung</string>
-  <string name="notification_settings_summary">Benachrichtigungsstil anpassen</string>
-  <string name="now_playing">Aktuelle Wiedergabe</string>
-  <string name="now_playing_queue">Warteschlange</string>
-  <string name="only_on_wifi">Nur im WLAN</string>
-  <string name="others">Anderes</string>
-  <string name="past_three_months">Letzte 3 Monate</string>
-  <string name="paypal">PayPal.me</string>
-  <string name="paypal_summary">PayPal.me ist eine einfache Möglichkeit, uns Geld zu spenden. Wenn Sie nur eine Debit- oder Kreditkarte verbunden haben, beträgt die Gebühr in den USA 2,9% der Spende plus 0,30 USD, ansonsten fallen keine Gebühren an.<a href="https://www.paypal.com/us/selfhelp/article/What-are-the-fees-for-PayPal-accounts-FAQ690">more</a></string>
-  <string name="permission_external_storage_denied">Berechtigung zum Zugriff auf externen Speicher verweigert</string>
-  <string name="permissions_denied">Berechtigung verweigert</string>
-  <string name="personalize">Personalisieren</string>
-  <string name="personalize_settings_summary">\"Aktuelle Wiedergabe\" UI anpassen</string>
-  <string name="pick_from_local_storage">Wählen Sie aus dem lokalen Speicher</string>
-  <string name="plain">Einfach</string>
-  <string name="play">Abspielen</string>
-  <string name="play_all">Alle wiedergeben</string>
-  <string name="playing_notification_description">Die Wiedergabebenachrichtigung enthält Aktionen zum Abspielen / Pausieren usw.</string>
-  <string name="playing_notification_name">Wiedergabebenachrichtigung</string>
-  <string name="playlist_empty_text">Leere Playlist</string>
-  <string name="playlist_is_empty">Playlist ist leer</string>
-  <string name="playlist_name_empty">Playlist Name</string>
-  <string name="playlists">Playlist\'s</string>
-  <string name="playlists_label">Playlists</string>
-  <string name="pref_header_audio">Audio</string>
-  <string name="pref_header_general">Allgemein</string>
-  <string name="pref_header_images">Bilder</string>
-  <string name="pref_header_lockscreen">Sperrbildschirm</string>
-  <string name="pref_header_now_playing_screen">Jetzt spielt</string>
-  <string name="pref_header_playlists">Playlists</string>
-  <string name="pref_only_lollipop">"Nur auf Lollipop verfügbar"</string>
-  <string name="pref_only_nougat_mr1">"Nur auf Nougat 7.1 verfügbar"</string>
-  <string name="pref_summary_about">Leute, die beim Projekt geholfen haben</string>
-  <string name="pref_summary_album_art_on_lockscreen">Benutzt das aktuelle Albumcover des Liedes als Sperrbildschirm-Hintergrund</string>
-  <string name="pref_summary_audio_ducking">Benachrichtigungen, Navigation usw.</string>
-  <string name="pref_summary_blurred_album_art">Verunschärft das Albumcover auf dem Sperrbildschirm. Kann Probleme mit Drittanbieter-Apps und Widgets verursachen</string>
-  <string name="pref_summary_carousel_effect">Ein Karussell artiger Effekt wird auf die Albumcover angewendet</string>
-  <string name="pref_summary_circular_album_effect">Im  \"Aktuellen Wiedergabe\" Bildschirm ein rundes Album-Cover bevorzugen (Geht nicht mit allen Erscheinungsbildern)</string>
-  <string name="pref_summary_classic_notification">Nutze das klassische Benachrichtigung\'s Design</string>
-  <string name="pref_summary_colored_app">Hintergrund und Bedienelemente ändern ihre Farbe der Albumgrafik entsprechend</string>
-  <string name="pref_summary_colored_app_shortcuts">Färbt die App-Shortcuts in der Akzentfarbe. Jedes Mal, wenn du die Farbe geändert hast, lege diesen Schalter um, um den Effekt anzuwenden</string>
-  <string name="pref_summary_colored_navigation_bar">Färbt die Navigationsleiste in der primären Farbe</string>
-  <string name="pref_summary_colored_notification">"F\u00e4rbt die Benachrichtigung in der prim\u00e4ren Farbe des Albumcovers"</string>
-  <string name="pref_summary_day_dream">Zeigt Songdetails auf Day Dream, wenn Musik gespielt wird</string>
-  <string name="pref_summary_dominant_color">Die dominanteste Farbe wird von dem Album- oder Künstlerbild ausgewählt</string>
-  <string name="pref_summary_exclude_songs">Titel unter 30 Sekunden ausschliessen</string>
-  <string name="pref_summary_gapless_playback">"Kann Wiedergabeprobleme auf manchen Geräten verursachen"</string>
-  <string name="pref_summary_ignore_media_store_artwork">Verbessert die Qualität des Albumcovers, kann aber längere Bild-Ladezeiten verursachen. Nur aktivieren, wenn Probleme mit schlechter Auflösung bestehen</string>
-  <string name="pref_summary_language_en">Englisch als App-Sprache erzwingen (andere Sprachen folgen)</string>
-  <string name="pref_summary_library_categories">Konfigurieren Sie die Sichtbarkeit und Reihenfolge von Bibliothekskategorien</string>
-  <string name="pref_summary_lock_screen">Zeigt Sperrbildschirm-Steuerelemente für Retro Music</string>
-  <string name="pref_summary_lock_screen_app">Zeige vollständige Steuerelemente auf dem Sperrbildschirm an</string>
-  <string name="pref_summary_open_source_licences">Lizenz Details für Open Source Software</string>
-  <string name="pref_summary_round_corners">Abgerundete Ecken für z.B. Albumgrafiken</string>
-  <string name="pref_summary_tab_titles">Tab-Namen am unteren Rand anzeigen/ausblenden</string>
-  <string name="pref_summary_toggle_bottom_bar_titles">Deaktiviere Titel aus der unteren Navigationsleiste</string>
-  <string name="pref_summary_toggle_full_screen">Aktivieren Sie dies für den Immersiv-Modus</string>
-  <string name="pref_summary_toggle_genre">Du möchtest das Genre nicht angezeigt bekommen? Blende es aus</string>
-  <string name="pref_summary_toggle_headset">Abspielen beim Anschließen der Kopfhörer</string>
-  <string name="pref_summary_toggle_navigation_bar">Nur die Navigationsleiste ausblenden</string>
-  <string name="pref_summary_toggle_status_bar">Nur die Statusleiste ausblenden</string>
-  <string name="pref_summary_toggle_volume">Wenn auf dem \"Jetzt spielt\" Bildschirm noch Platz ist, aktiviere den Lautstärkeregler</string>
-  <string name="pref_title_album_art_on_lockscreen">Albumcover anzeigen</string>
-  <string name="pref_title_app_shortcuts">Farbige Appverknüpfungen</string>
-  <string name="pref_title_audio_ducking">Verringert die Lautstärke kurz bei Benachrichtigungen und der Gleichen</string>
-  <string name="pref_title_auto_download_artist_images">Künstler-Bild automatisch herunterladen</string>
-  <string name="pref_title_blurred_album_art">Albumcover weichzeichnen</string>
-  <string name="pref_title_classic_notification">Klassisches Benachrichtigung\'s Design</string>
-  <string name="pref_title_colored_app">Automatische Farben</string>
-  <string name="pref_title_colored_notification">Farbige Benachrichtigungen</string>
-  <string name="pref_title_day_dream">Day Dream</string>
-  <string name="pref_title_exclude_songs">Schliesse Titel aus</string>
-  <string name="pref_title_external_storage_access">Zugriff auf externen Speicher gewähren</string>
-  <string name="pref_title_gapless_playback">Pausen/lückenlose Wiedergabe</string>
-  <string name="pref_title_general_theme">Allgemeines Thema</string>
-  <string name="pref_title_gradient_color">Wähle eine Farbe</string>
-  <string name="pref_title_ignore_media_store_artwork">Ignoriere die Medienspeicher Cover</string>
-  <string name="pref_title_last_added_interval">Zeitspanne für die \"Zuletzt hinzugefügt\"-Playlist</string>
-  <string name="pref_title_lock_screen">Vollbild-Steuerelemente</string>
-  <string name="pref_title_lock_screen_app">Retro Sperrbildschirm</string>
-  <string name="pref_title_lyrics_options">Liedtext Optionen</string>
-  <string name="pref_title_navigation_bar">Farbige Navigationsleiste</string>
-  <string name="pref_title_now_playing_screen_appearance">Aussehen</string>
-  <string name="pref_title_open_source_licences">Open Source Lizenzen</string>
-  <string name="pref_title_round_corners">Abgerundete Ecken</string>
-  <string name="pref_title_toggle_bottom_bar_titles">Deaktiviere Titel</string>
-  <string name="pref_title_toggle_carousel_effect">Karussell-Effekt</string>
-  <string name="pref_title_toggle_circular_album_effect">Rundes Album</string>
-  <string name="pref_title_toggle_dominant_color">Dominierende Farbe</string>
-  <string name="pref_title_toggle_full_screen">Vollbild-App</string>
-  <string name="pref_title_toggle_genre">Genre ausblenden</string>
-  <string name="pref_title_toggle_language_en">Englisch</string>
-  <string name="pref_title_toggle_navigation_bar">Navigationsleiste</string>
-  <string name="pref_title_toggle_status_bar">Statusleiste</string>
-  <string name="pref_title_toggle_tab_titles">Tab-Namen</string>
-  <string name="pref_title_toggle_toggle_headset">Automatisches Abspielen</string>
-  <string name="pref_title_toggle_volume">Lautstärke Regler</string>
-  <string name="pref_title_user_info">Benutzerinfo\'s</string>
-  <string name="primary_color">Primäre Farbe</string>
-  <string name="primary_color_desc">Die primäre Themenfarbe ist standardmäßig weiß</string>
-  <string name="purchase">Kaufe</string>
-  <string name="queue">Warteschlange</string>
-  <string name="queue_label">Warteschlange</string>
-  <string name="rate_app">App bewerten</string>
-  <string name="rate_on_google_play_summary">Du liebst diese App? Lass und das im Google Play Store wissen, damit wir dir auch in Zukunft eine gute Nutzererfahrung bieten können</string>
-  <string name="recent_activity">Letzte Aktivität</string>
-  <string name="recent_albums">Neue Albums</string>
-  <string name="recent_artists">Neue Künstler</string>
-  <string name="remove_action">Entfernen</string>
-  <string name="remove_cover">Cover entfernen</string>
-  <string name="remove_from_blacklist">Von der Schwarzen Liste entfernen</string>
-  <string name="remove_song_from_playlist_title">Lied von der Playlist entfernen</string>
-  <string name="remove_song_x_from_playlist"><![CDATA[<b>%1$s</b> von der Playlist entfernen?]]></string>
-  <string name="remove_songs_from_playlist_title">Lieder aus der Playlist entfernen</string>
-  <string name="remove_x_songs_from_playlist"><![CDATA[Entferne <b>%1$d</b> Lieder von der Playlist?]]></string>
-  <string name="rename_action">Umbenennen</string>
-  <string name="rename_playlist_title">Playlist umbenennen</string>
-  <string name="reset_action">Zurücksetzen</string>
-  <string name="reset_artist_image">Künstlerbild zurücksetzen</string>
-  <string name="restore">Wiederherstellen</string>
-  <string name="restored_previous_purchase_please_restart">"Vorherigen Einkauf wiederhergestellt. Bitte starten Sie die App neu damit sie all unsere Features problemlos wieder nutzen können. "</string>
-  <string name="restored_previous_purchases">Vorherige Käufe wiederhergestellt</string>
-  <string name="restoring_purchase">"Stellen Einkäufe wieder her. "</string>
-  <string name="retro">Retro</string>
-  <string name="retro_equalizer">Retro Equalizer</string>
-  <string name="saf_delete_failed">Datei löschen fehlgeschlagen: %s</string>
-  <!-- SAF -->
-  <string name="saf_error_uri">Kann keine SAF URI erhalten</string>
-  <string name="saf_guide_slide1_description">Öffne die Navigationsleiste</string>
-  <string name="saf_guide_slide1_description_before_o">Aktivieren Sie \"SD-Karte anzeigen\" im Überlaufmenü</string>
-  <!-- SAF guide -->
-  <string name="saf_guide_slide1_title">%s benötigt SD-Kartenzugriff</string>
-  <string name="saf_guide_slide2_description">Du musst das Stammverzeichnis deiner SD-Karte auswählen</string>
-  <string name="saf_guide_slide2_title">Wähle deine SD-Karte in der Navigationsleiste aus</string>
-  <string name="saf_guide_slide3_description">Öffne keine Unterordner</string>
-  <string name="saf_guide_slide3_title">Tippen Sie auf die Schaltfläche \"Auswählen\" am unteren Bildschirmrand</string>
-  <string name="saf_pick_file">Dateizugriff erforderlich. Wähle %s</string>
-  <string name="saf_pick_sdcard">SD-Kartenzugriff erforderlich. Bitte wählen Sie das Stammverzeichnis der SD-Karte</string>
-  <string name="saf_write_failed">Datei schreiben fehlgeschlagen: %s</string>
-  <string name="save_playlist_title">Als Datei speichern</string>
-  <string name="saved_playlist_to">Playlist gespeichert in %s</string>
-  <string name="saving_changes">Änderungen speichern</string>
-  <string name="saving_tags">Tags speichern</string>
-  <string name="saving_to_file">Speichere in Datei...</string>
-  <string name="scanned_files">%1$d von %2$d Dateien Gescannt</string>
-  <string name="search_hint">Suche in der Bibliothek...</string>
-  <string name="see_all">Alles sehen</string>
-  <string name="select_preset">Wähle eine Voreinstellung</string>
-  <string name="set_artist_image">Künstlerbild setzten</string>
-  <string name="shuffle">Zufällig</string>
-  <string name="simple">Einfach</string>
-  <string name="sleep_timer_canceled">Schlaf-Timer abgebrochen</string>
-  <string name="sleep_timer_set">Schlaf-Timer für %d Minuten von jetzt an eingestellt.</string>
-  <string name="slide_unlock">Wische zum Entsperren</string>
-  <string name="solid">Solide</string>
-  <string name="song">Lied</string>
-  <string name="song_duration">Lieddauer</string>
-  <string name="songs">Lieder</string>
-  <string name="sort_order">Sortierreihenfolge</string>
-  <string name="speech_not_supported">Entschuldigung! Dein Gerät unterstützt leider keine Spracheingabe</string>
-  <string name="speech_prompt">Durchsuche Bibliothek</string>
-  <string name="suggestions">Vorschläge</string>
-  <string name="summary_material_design_city_wallpaper">Material Design Stadt Hintergrund von www.techjuice.pk Website</string>
-  <string name="summary_material_design_icons">Für alle Icons, die wir von diesen Websites www.flaticon.com oder www.materialdesignicons.com verwendet haben</string>
-  <string name="summary_user_info">Nur zum Anzeigen deines Namens auf dem Homebildschirm</string>
-  <string name="support_development">Unterstütze die Entwicklung</string>
-  <string name="support_development_summary">Wenn du Retro Music magst überlege dir doch etwas zu spenden als Unterstützung für meine Arbeit</string>
-  <!-- Message displayed when tag editing fails -->
-  <string name="tag_edit_error">Beim Bearbeiten der Tags ist ein Fehler aufgetreten.</string>
-  <string name="tag_editor_check_permission">Nach Berechtigungen suchen</string>
-  <string name="tag_editor_document_tree_message">Wählen Sie das externe Speicherverzeichnis</string>
-  <string name="tag_editor_document_tree_permission_failed">Es sieht so aus als hätten wir keine Berechtigung zum Bearbeiten der Dateien. Überprüfen Sie das Verzeichnis in der Dateiauswahl</string>
-  <string name="tag_error_kitkat">Beim Bearbeiten der Tags ist ein Fehler aufgetreten. Ist die Datei auf einer SD-Karte gespeichert? Wenn dies der Fall ist, hat Google die Bearbeitung von Tags für diese Datei unmöglich gemacht</string>
-  <string name="tag_error_lollipop">Beim Bearbeiten der Tags ist ein Fehler aufgetreten. Wenn die Datei auf einer SD-Karte gespeichert ist, ist Retro Music möglicherweise nicht berechtigt, darauf zuzugreifen</string>
-  <string name="tag_retrieve_error">Beim Abrufen der Tags ist ein Fehler aufgetreten</string>
-  <string name="text">Text</string>
-  <string name="thank_you">Vielen Dank</string>
-  <string name="the_audio_file">Die Audio-Datei</string>
-  <string name="this_month">Diesen Monat</string>
-  <string name="this_week">Diese Woche</string>
-  <string name="this_year">Dieses Jahr</string>
-  <string name="tiny">Sehr klein</string>
-  <string name="title">Titel</string>
-  <string name="title_dashboard">Dashboard</string>
-  <string name="title_desc">Titel Beschreibung</string>
-  <string name="title_good_afternoon">Guten Nachmittag</string>
-  <string name="title_good_day">Schönen Tag</string>
-  <string name="title_good_evening">Guten Abend</string>
-  <string name="title_good_morning">Guten Morgen</string>
-  <string name="title_good_night">Gute Nacht</string>
-  <string name="title_home">Home</string>
-  <string name="title_material_design_city_wallpaper">Stadt Hintergrundbild</string>
-  <string name="title_material_design_icons">Symbole</string>
-  <string name="title_notifications">Benachrichtigungen</string>
-  <string name="title_user_info">Wie heißt du?</string>
-  <string name="today">Heute</string>
-  <string name="toggle_lyrics_size">Textgröße umschalten</string>
-  <string name="tool_tip_see_all">Alle Lieder anzeigen</string>
-  <string name="top_albums">Die besten Alben</string>
-  <string name="top_artists">Die besten Künstler</string>
-  <string name="top_tracks">Top Lieder</string>
-  <string name="top_tracks_label">Top Lieder</string>
-  <string name="track_hint">"Track (2 für Track 2 oder 3004 für CD3 Track 4)"</string>
-  <string name="track_list">Titelnummer</string>
-  <string name="translate">Übersetzen</string>
-  <string name="translate_summary">Hilf Retro Music in deine Muttersprache zu übersetzen</string>
-  <string name="unplayable_file">Konnte Titel nicht abspielen</string>
-  <string name="up_next">Als nächstes</string>
-  <string name="update">Aktualisierung</string>
-  <string name="update_image">Bild aktualisieren</string>
-  <string name="updated_artist_image">Künstler-Bild wurde aktualisiert</string>
-  <string name="updating">Aktualisiere...</string>
-  <string name="user_profile_summary">Banner und Profilbild ändern</string>
-  <string name="version">Version</string>
-  <string name="virtualizer_strength">Virtualisierungsstärke</string>
-  <string name="volume_control">Lautstärkeregelung</string>
-  <string name="web_search">Internet-Suche</string>
-  <string name="what_do_you_want_to_share">Was möchtest du Teilen?</string>
-  <string name="window">Fenster</string>
-  <string name="x_has_been_set_as_ringtone">Setze %1$s als Klingelton</string>
-  <string name="x_selected">%1$d ausgewählt</string>
-  <string name="year">Jahr</string>
-  <string name="you_have_to_select_at_least_one_category">Du musst mindestens eine Kategorie auswählen</string>
+    <string name="accent_color">Akzentfarbe</string>
+    <string name="accent_color_desc">Die standartfarbe des Akzentthemas ist grün.</string>
+    <string name="action_about">Über</string>
+    <string name="action_add_to_favorites">Zu Favoriten hinzufügen</string>
+    <string name="action_add_to_playing_queue">Zur Warteschlange hinzufügen</string>
+    <string name="action_add_to_playlist">Zu Playlist hinzufügen</string>
+    <string name="action_clear_playing_queue">Warteschlange leeren</string>
+    <string name="action_clear_playlist">Lösche Playlist</string>
+    <string name="action_delete">Löschen</string>
+    <string name="action_delete_from_device">Vom Gerät löschen</string>
+    <string name="action_details">Details</string>
+    <string name="action_go_to_album">Gehe zum Album</string>
+    <string name="action_go_to_artist">Gehe zum Künstler</string>
+    <string name="action_go_to_start_directory">zum Startverzeichnis gehen</string>
+    <string name="action_grant">Gewähren</string>
+    <string name="action_grid_size">Rastergröße</string>
+    <string name="action_grid_size_land">Gittergröße (Querformat)</string>
+    <string name="action_next">Nächste</string>
+    <string name="action_play">Abspielen</string>
+    <string name="action_play_next">Als nächstes spielen</string>
+    <string name="action_play_pause">Abspielen/Pausieren</string>
+    <string name="action_previous">Zurück</string>
+    <string name="action_remove_from_favorites">Von Favoriten entfernen</string>
+    <string name="action_remove_from_playing_queue">Von der Warteschlange entfernen</string>
+    <string name="action_remove_from_playlist">Von Playlist entfernen</string>
+    <string name="action_rename">Umbenennen</string>
+    <string name="action_save_playing_queue">Warteschlange speichern</string>
+    <string name="action_scan">Durchsuchen</string>
+    <string name="action_search">Suchen</string>
+    <string name="action_set">Einstellen</string>
+    <string name="action_set_as_ringtone">Als Klingelton setzen</string>
+    <string name="action_set_as_start_directory">Als Start-Verzeichnis festlegen</string>
+    <string name="action_settings">"Einstellungen"</string>
+    <string name="action_share">Teilen</string>
+    <string name="action_shuffle_all">Alle zufällig wiedergeben</string>
+    <string name="action_shuffle_playlist">Playlistinhalt zufällig wiedergeben</string>
+    <string name="action_sleep_timer">Schlaf-Timer</string>
+    <string name="action_tag_editor">Tag Editor</string>
+    <string name="add_action">Hinzufügen</string>
+    <string name="add_photo">Foto hinzufügen</string>
+    <string name="add_playlist_title">"Zu Playlist hinzufügen"</string>
+    <string name="added_title_to_playing_queue">"1 Titel wurde zur Warteschlange hinzugefügt"</string>
+    <string name="added_x_titles_to_playing_queue">%1$d Titel wurden zur Warteschlange hinzugefügt</string>
+    <string name="album">Album</string>
+    <string name="album_artist">Album Künstler</string>
+    <string name="album_or_artist_empty">Der Titel oder der Künstler ist leer.</string>
+    <string name="albums">Alben</string>
+    <!-- Android Auto -->
+    <string name="always">Immer</string>
+    <string name="app_share">Hey, probier diesen coolen Musik Player aus: https://play.google.com/store/apps/details?id=%s</string>
+    <!-- App Shortcuts -->
+    <string name="app_shortcut_last_added_long">@string/last_added</string>
+    <string name="app_shortcut_last_added_short">@string/last_added</string>
+    <string name="app_shortcut_shuffle_all_long">@string/action_shuffle_all</string>
+    <string name="app_shortcut_shuffle_all_short">Zufällig</string>
+    <string name="app_shortcut_top_tracks_long">@string/my_top_tracks</string>
+    <string name="app_shortcut_top_tracks_short">Top Lieder</string>
+    <string name="app_widget_big_name">Retro music - Groß</string>
+    <string name="app_widget_card_name">Retro music - Karte</string>
+    <string name="app_widget_classic_name">Retro music - Klassisch</string>
+    <string name="app_widget_small_name">Retro music - Klein</string>
+    <string name="artist">Künstler</string>
+    <string name="artists">Künstler</string>
+    <string name="audio_focus_denied">Audio Fokus abgelehnt</string>
+    <string name="audio_settings_summary">Sound und Equalizer Einstellungen ändern</string>
+    <string name="biography">Biografie</string>
+    <string name="black_theme_name">Schwarz</string>
+    <string name="blacklist">Schwarze Liste</string>
+    <string name="blur">Weichgezeichnet</string>
+    <string name="blur_card">Verschwommene Karte</string>
+    <string name="buy_retromusic_pro">Kaufe RetroMusic Pro</string>
+    <string name="cancel_current_timer">Aktuellen Timer stoppen</string>
+    <string name="card">Karte</string>
+    <string name="changelog">Änderungsprotokoll</string>
+    <string name="changelog_summary">Das Änderungsprotokoll wird in Telegram geführt</string>
+    <string name="clear_action">Leeren</string>
+    <string name="clear_blacklist">Schwarze Liste leeren</string>
+    <string name="clear_playlist_title">Playlist löschen</string>
+    <string name="clear_playlist_x"><![CDATA[Die <b>%1$s</b> Playlist leeren? Dies kann nicht r\u00fcckg\u00e4ngig gemacht werden!]]></string>
+    <string name="color">Farbe</string>
+    <string name="color_theme_name">Farbe</string>
+    <string name="colors">Farben</string>
+    <string name="could_not_create_playlist">Playlist konnte nicht erstellt werden</string>
+    <string name="could_not_download_album_cover">"Konnte kein passendes Albumcover herunterladen"</string>
+    <string name="could_not_restore_purchase">"Konnte die Einkäufe nicht wiederhergestellen. "</string>
+    <string name="could_not_scan_files">Kann %d Dateien nicht scannen</string>
+    <string name="create_action">Erstellen</string>
+    <string name="created_playlist_x">Playlist %1$s wurde erstellt</string>
+    <string name="currently_listening_to_x_by_x">Aktuell läuft %1$s von %2$s</string>
+    <string name="dark_theme_name">Irgendwie dunkel</string>
+    <string name="default_hint">Kein Liedtext</string>
+    <string name="delete_playlist_title">Playlist löschen</string>
+    <string name="delete_playlist_x"><![CDATA[Playlist<b>%1$s</b> löschen?]]></string>
+    <string name="delete_playlists_title">Playlist\'s löschen</string>
+    <string name="delete_song_x"><![CDATA[Lied <b>%1$s</b> löschen?]]></string>
+    <string name="delete_x_playlists"><![CDATA[Playlist\'s <b>%1$d</b> löschen?]]></string>
+    <string name="delete_x_songs"><![CDATA[Lieder <b>%1$d</b> löschen?]]></string>
+    <string name="deleted_x_songs">%1$d Lieder wurden gelöscht</string>
+    <string name="do_you_want_to_clear_the_blacklist">Schwarze Liste löschen?</string>
+    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Möchtest du <b>%1$s</b> von der Schwarzen Liste löschen?]]></string>
+    <string name="donate">Spenden</string>
+    <string name="donate_summary">Wenn Sie denken, ich hätte einen Lohn für meine Arbeit verdient, können Sie mir hier etwas spenden</string>
+    <string name="donation_header">Kauf mir ein</string>
+    <string name="download_from_last_fm">Von Last.fm herunterladen</string>
+    <string name="empty">Leer</string>
+    <string name="equalizer">Equalizer</string>
+    <string name="favorites">Favoriten</string>
+    <string name="flat">Flach</string>
+    <string name="folders">Ordner</string>
+    <string name="for_you">Für dich</string>
+    <string name="full">Voll</string>
+    <string name="general_settings_summary">Allgemeine Farbe ändern</string>
+    <string name="general_settings_title">Aussehen und Gefühl</string>
+    <string name="genre">Genre</string>
+    <string name="genres">Genres</string>
+    <string name="grid_size_1">1</string>
+    <string name="grid_size_2">2</string>
+    <string name="grid_size_3">3</string>
+    <string name="grid_size_4">4</string>
+    <string name="grid_size_5">5</string>
+    <string name="grid_size_6">6</string>
+    <string name="grid_size_7">7</string>
+    <string name="grid_size_8">8</string>
+    <string name="history">Verlauf</string>
+    <string name="home">Home</string>
+    <string name="inserted_x_songs_into_playlist_x">%1$d Lieder wurden zur Playlist %2$s hinzugefügt</string>
+    <string name="label_bit_rate">Bitrate</string>
+    <string name="label_file_format">Format</string>
+    <string name="label_file_name">Dateiname</string>
+    <string name="label_file_path">Dateipfad</string>
+    <string name="label_file_size">Größe</string>
+    <string name="label_sampling_rate">Abtastrate</string>
+    <string name="label_track_length">Länge</string>
+    <string name="last_added">Zuletzt hinzugefügt</string>
+    <string name="lets_play_something">Lass uns etwas spielen</string>
+    <string name="library">Bibliothek</string>
+    <string name="licenses">Lizenzen</string>
+    <string name="light_theme_name">Weiß</string>
+    <string name="listing_files">Gelistete Dateien</string>
+    <string name="loading_products">Lade Produkte...</string>
+    <string name="lyrics">Songtexte</string>
+    <string name="my_name">Mein Name</string>
+    <string name="my_top_tracks">Meine Top Lieder</string>
+    <string name="never">Nie</string>
+    <string name="new_playlist_title">Neue Playlist</string>
+    <string name="new_start_directory">%s ist das neue Startverzeichnis</string>
+    <string name="no_albums">Keine Alben</string>
+    <string name="no_artists">Keine Künstler</string>
+    <string name="no_audio_ID">"Spiele zuerst ein Leid und versuche es dann erneut"</string>
+    <string name="no_equalizer">Kein Equalizer gefunden</string>
+    <string name="no_genres">Keine Genres</string>
+    <string name="no_lyrics_found">Keine Liedtexte gefunden</string>
+    <string name="no_playlists">Keine Playlist\'s</string>
+    <string name="no_purchase_found">"Kein Kauf gefunden "</string>
+    <string name="no_results">Keine Ergebnisse</string>
+    <string name="no_songs">Keine Lieder</string>
+    <string name="normal">Normal</string>
+    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> ist nicht im Medienspeicher aufgeführt]]></string>
+    <string name="nothing_to_scan">Nichts zu scannen</string>
+    <string name="notification">Benachrichtigung</string>
+    <string name="notification_settings_summary">Benachrichtigungsstil anpassen</string>
+    <string name="now_playing">Aktuelle Wiedergabe</string>
+    <string name="now_playing_queue">Warteschlange</string>
+    <string name="only_on_wifi">Nur im WLAN</string>
+    <string name="others">Anderes</string>
+    <string name="past_three_months">Letzte 3 Monate</string>
+    <string name="paypal">PayPal.me</string>
+    <string name="paypal_summary">PayPal.me ist eine einfache Möglichkeit, uns Geld zu spenden. Wenn Sie nur eine Debit- oder Kreditkarte verbunden haben, beträgt die Gebühr in den USA 2,9% der Spende plus 0,30 USD, ansonsten fallen keine Gebühren an.<a href="https://www.paypal.com/us/selfhelp/article/What-are-the-fees-for-PayPal-accounts-FAQ690">more</a></string>
+    <string name="permission_external_storage_denied">Berechtigung zum Zugriff auf externen Speicher verweigert</string>
+    <string name="permissions_denied">Berechtigung verweigert</string>
+    <string name="personalize">Personalisieren</string>
+    <string name="personalize_settings_summary">\"Aktuelle Wiedergabe\" UI anpassen</string>
+    <string name="pick_from_local_storage">Wählen Sie aus dem lokalen Speicher</string>
+    <string name="plain">Einfach</string>
+    <string name="playing_notification_description">Die Wiedergabebenachrichtigung enthält Aktionen zum Abspielen / Pausieren usw.</string>
+    <string name="playing_notification_name">Wiedergabebenachrichtigung</string>
+    <string name="playlist_empty_text">Leere Playlist</string>
+    <string name="playlist_is_empty">Playlist ist leer</string>
+    <string name="playlist_name_empty">Playlist Name</string>
+    <string name="playlists">Playlist\'s</string>
+    <string name="pref_header_audio">Audio</string>
+    <string name="pref_header_general">Allgemein</string>
+    <string name="pref_header_images">Bilder</string>
+    <string name="pref_header_lockscreen">Sperrbildschirm</string>
+    <string name="pref_header_playlists">Playlists</string>
+    <string name="pref_only_lollipop">"Nur auf Lollipop verfügbar"</string>
+    <string name="pref_summary_album_art_on_lockscreen">Benutzt das aktuelle Albumcover des Liedes als Sperrbildschirm-Hintergrund</string>
+    <string name="pref_summary_audio_ducking">Benachrichtigungen, Navigation usw.</string>
+    <string name="pref_summary_blurred_album_art">Verunschärft das Albumcover auf dem Sperrbildschirm. Kann Probleme mit Drittanbieter-Apps und Widgets verursachen</string>
+    <string name="pref_summary_carousel_effect">Ein Karussell artiger Effekt wird auf die Albumcover angewendet</string>
+    <string name="pref_summary_classic_notification">Nutze das klassische Benachrichtigung\'s Design</string>
+    <string name="pref_summary_colored_app">Hintergrund und Bedienelemente ändern ihre Farbe der Albumgrafik entsprechend</string>
+    <string name="pref_summary_colored_app_shortcuts">Färbt die App-Shortcuts in der Akzentfarbe. Jedes Mal, wenn du die Farbe geändert hast, lege diesen Schalter um, um den Effekt anzuwenden</string>
+    <string name="pref_summary_colored_navigation_bar">Färbt die Navigationsleiste in der primären Farbe</string>
+    <string name="pref_summary_colored_notification">"F\u00e4rbt die Benachrichtigung in der prim\u00e4ren Farbe des Albumcovers"</string>
+    <string name="pref_summary_dominant_color">Die dominanteste Farbe wird von dem Album- oder Künstlerbild ausgewählt</string>
+    <string name="pref_summary_gapless_playback">"Kann Wiedergabeprobleme auf manchen Geräten verursachen"</string>
+    <string name="pref_summary_ignore_media_store_artwork">Verbessert die Qualität des Albumcovers, kann aber längere Bild-Ladezeiten verursachen. Nur aktivieren, wenn Probleme mit schlechter Auflösung bestehen</string>
+    <string name="pref_summary_lock_screen">Zeigt Sperrbildschirm-Steuerelemente für Retro Music</string>
+    <string name="pref_summary_open_source_licences">Lizenz Details für Open Source Software</string>
+    <string name="pref_summary_round_corners">Abgerundete Ecken für z.B. Albumgrafiken</string>
+    <string name="pref_summary_tab_titles">Tab-Namen am unteren Rand anzeigen/ausblenden</string>
+    <string name="pref_summary_toggle_full_screen">Aktivieren Sie dies für den Immersiv-Modus</string>
+    <string name="pref_summary_toggle_headset">Abspielen beim Anschließen der Kopfhörer</string>
+    <string name="pref_summary_toggle_volume">Wenn auf dem \"Jetzt spielt\" Bildschirm noch Platz ist, aktiviere den Lautstärkeregler</string>
+    <string name="pref_title_album_art_on_lockscreen">Albumcover anzeigen</string>
+    <string name="pref_title_app_shortcuts">Farbige Appverknüpfungen</string>
+    <string name="pref_title_audio_ducking">Verringert die Lautstärke kurz bei Benachrichtigungen und der Gleichen</string>
+    <string name="pref_title_auto_download_artist_images">Künstler-Bild automatisch herunterladen</string>
+    <string name="pref_title_blurred_album_art">Albumcover weichzeichnen</string>
+    <string name="pref_title_classic_notification">Klassisches Benachrichtigung\'s Design</string>
+    <string name="pref_title_colored_app">Automatische Farben</string>
+    <string name="pref_title_colored_notification">Farbige Benachrichtigungen</string>
+    <string name="pref_title_gapless_playback">Pausen/lückenlose Wiedergabe</string>
+    <string name="pref_title_general_theme">Allgemeines Thema</string>
+    <string name="pref_title_ignore_media_store_artwork">Ignoriere die Medienspeicher Cover</string>
+    <string name="pref_title_last_added_interval">Zeitspanne für die \"Zuletzt hinzugefügt\"-Playlist</string>
+    <string name="pref_title_lock_screen">Vollbild-Steuerelemente</string>
+    <string name="pref_title_navigation_bar">Farbige Navigationsleiste</string>
+    <string name="pref_title_now_playing_screen_appearance">Aussehen</string>
+    <string name="pref_title_open_source_licences">Open Source Lizenzen</string>
+    <string name="pref_title_round_corners">Abgerundete Ecken</string>
+    <string name="pref_title_toggle_carousel_effect">Karussell-Effekt</string>
+    <string name="pref_title_toggle_dominant_color">Dominierende Farbe</string>
+    <string name="pref_title_toggle_full_screen">Vollbild-App</string>
+    <string name="pref_title_toggle_tab_titles">Tab-Namen</string>
+    <string name="pref_title_toggle_toggle_headset">Automatisches Abspielen</string>
+    <string name="pref_title_toggle_volume">Lautstärke Regler</string>
+    <string name="pref_title_user_info">Benutzerinfo\'s</string>
+    <string name="primary_color">Primäre Farbe</string>
+    <string name="primary_color_desc">Die primäre Themenfarbe ist standardmäßig weiß</string>
+    <string name="purchase">Kaufe</string>
+    <string name="queue">Warteschlange</string>
+    <string name="rate_app">App bewerten</string>
+    <string name="rate_on_google_play_summary">Du liebst diese App? Lass und das im Google Play Store wissen, damit wir dir auch in Zukunft eine gute Nutzererfahrung bieten können</string>
+    <string name="recent_albums">Neue Albums</string>
+    <string name="recent_artists">Neue Künstler</string>
+    <string name="remove_action">Entfernen</string>
+    <string name="remove_cover">Cover entfernen</string>
+    <string name="remove_from_blacklist">Von der Schwarzen Liste entfernen</string>
+    <string name="remove_song_from_playlist_title">Lied von der Playlist entfernen</string>
+    <string name="remove_song_x_from_playlist"><![CDATA[<b>%1$s</b> von der Playlist entfernen?]]></string>
+    <string name="remove_songs_from_playlist_title">Lieder aus der Playlist entfernen</string>
+    <string name="remove_x_songs_from_playlist"><![CDATA[Entferne <b>%1$d</b> Lieder von der Playlist?]]></string>
+    <string name="rename_playlist_title">Playlist umbenennen</string>
+    <string name="reset_artist_image">Künstlerbild zurücksetzen</string>
+    <string name="restore">Wiederherstellen</string>
+    <string name="restored_previous_purchase_please_restart">"Vorherigen Einkauf wiederhergestellt. Bitte starten Sie die App neu damit sie all unsere Features problemlos wieder nutzen können. "</string>
+    <string name="restored_previous_purchases">Vorherige Käufe wiederhergestellt</string>
+    <string name="restoring_purchase">"Stellen Einkäufe wieder her. "</string>
+    <string name="retro_equalizer">Retro Equalizer</string>
+    <!-- SAF -->
+    <!-- SAF guide -->
+    <string name="save_playlist_title">Als Datei speichern</string>
+    <string name="saved_playlist_to">Playlist gespeichert in %s</string>
+    <string name="saving_changes">Änderungen speichern</string>
+    <string name="scanned_files">%1$d von %2$d Dateien Gescannt</string>
+    <string name="search_hint">Suche in der Bibliothek...</string>
+    <string name="set_artist_image">Künstlerbild setzten</string>
+    <string name="shuffle">Zufällig</string>
+    <string name="simple">Einfach</string>
+    <string name="sleep_timer_canceled">Schlaf-Timer abgebrochen</string>
+    <string name="sleep_timer_set">Schlaf-Timer für %d Minuten von jetzt an eingestellt.</string>
+    <string name="song">Lied</string>
+    <string name="song_duration">Lieddauer</string>
+    <string name="songs">Lieder</string>
+    <string name="sort_order">Sortierreihenfolge</string>
+    <string name="speech_not_supported">Entschuldigung! Dein Gerät unterstützt leider keine Spracheingabe</string>
+    <string name="speech_prompt">Durchsuche Bibliothek</string>
+    <string name="summary_user_info">Nur zum Anzeigen deines Namens auf dem Homebildschirm</string>
+    <string name="support_development">Unterstütze die Entwicklung</string>
+    <!-- Message displayed when tag editing fails -->
+    <string name="thank_you">Vielen Dank</string>
+    <string name="the_audio_file">Die Audio-Datei</string>
+    <string name="this_month">Diesen Monat</string>
+    <string name="this_week">Diese Woche</string>
+    <string name="this_year">Dieses Jahr</string>
+    <string name="tiny">Sehr klein</string>
+    <string name="title_dashboard">Dashboard</string>
+    <string name="title_good_afternoon">Guten Nachmittag</string>
+    <string name="title_good_day">Schönen Tag</string>
+    <string name="title_good_evening">Guten Abend</string>
+    <string name="title_good_morning">Guten Morgen</string>
+    <string name="title_good_night">Gute Nacht</string>
+    <string name="title_user_info">Wie heißt du?</string>
+    <string name="today">Heute</string>
+    <string name="top_albums">Die besten Alben</string>
+    <string name="top_artists">Die besten Künstler</string>
+    <string name="track_hint">"Track (2 für Track 2 oder 3004 für CD3 Track 4)"</string>
+    <string name="track_list">Titelnummer</string>
+    <string name="translate">Übersetzen</string>
+    <string name="unplayable_file">Konnte Titel nicht abspielen</string>
+    <string name="up_next">Als nächstes</string>
+    <string name="update_image">Bild aktualisieren</string>
+    <string name="updating">Aktualisiere...</string>
+    <string name="version">Version</string>
+    <string name="web_search">Internet-Suche</string>
+    <string name="what_do_you_want_to_share">Was möchtest du Teilen?</string>
+    <string name="window">Fenster</string>
+    <string name="x_has_been_set_as_ringtone">Setze %1$s als Klingelton</string>
+    <string name="x_selected">%1$d ausgewählt</string>
+    <string name="year">Jahr</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 34ea243e3..31fca98cd 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -18,13 +18,11 @@
     <string name="action_grant">Gewähren</string>
     <string name="action_grid_size">Gittergröße</string>
     <string name="action_grid_size_land">Gittergröße (Querformat)</string>
-    <string name="action_new_playlist">Neue Playlist...</string>
     <string name="action_next">Nächstes</string>
     <string name="action_play">Play</string>
     <string name="action_play_next">Spiel danach</string>
     <string name="action_play_pause">Play/Pause</string>
     <string name="action_previous">Vorheriges</string>
-    <string name="action_re_download_artist_image">Künstlerbild aktualisieren</string>
     <string name="action_remove_from_favorites">Aus Favoriten entfernen</string>
     <string name="action_remove_from_playing_queue">Von Wiedergabeliste entfernen</string>
     <string name="action_remove_from_playlist">Von Playlist entfernen</string>
@@ -37,10 +35,7 @@
     <string name="action_set_as_start_directory">Als Startverzeichnis verwenden</string>
     <string name="action_settings">"Einstellungen"</string>
     <string name="action_share">Teilen</string>
-    <string name="action_show_lyrics">Lyrics anzeigen</string>
-    <string name="action_shuffle_album">Album zufällig wiedergeben</string>
     <string name="action_shuffle_all">Alle zufällig wiedergeben</string>
-    <string name="action_shuffle_artist">Künstler zufällig wiedergeben</string>
     <string name="action_shuffle_playlist">Playlist zufällig wiedergeben</string>
     <string name="action_sleep_timer">Sleep-Timer</string>
     <string name="action_tag_editor">Tag-Editor</string>
@@ -51,26 +46,20 @@
     <string name="added_x_titles_to_playing_queue">%1$d Titel wurden zur Wiedergabeliste hinzugefügt.</string>
     <string name="album">Album</string>
     <string name="album_artist">Album Künstler</string>
-    <string name="album_desc">Albumbeschr.</string>
     <string name="album_or_artist_empty">Titel oder Künstler ist leer.</string>
     <string name="albums">Alben</string>
     <string name="always">Immer</string>
     <string name="app_share">Hey, schau dir diesen coolen Music Player an: https://play.google.com/store/apps/details?id=%s</string>
     <string name="app_shortcut_shuffle_all_short">Zufällig</string>
     <string name="app_shortcut_top_tracks_short">Top Songs</string>
-    <string name="app_summary">Ein Hybrid zwischen Material Design und iOS.</string>
     <string name="app_widget_big_name">Retro Music - Big</string>
-    <string name="app_widget_big_name_2">Retro Music - Big2</string>
     <string name="app_widget_card_name">Retro Musik - Karte</string>
     <string name="app_widget_classic_name">Retro Music - Classic</string>
     <string name="app_widget_small_name">Retro Music - Klein</string>
     <string name="artist">Künstler</string>
-    <string name="artist_desc">Interpreten Beschreibung</string>
     <string name="artists">Künstler</string>
     <string name="audio_focus_denied">Audio Fokus verweigert.</string>
-    <string name="bass_boost_strength">Bass Boost Stärke</string>
     <string name="biography">Biografie</string>
-    <string name="biography_unavailable">K\u00fcnstler Biografie konnte nicht gefunden werden.</string>
     <string name="black_theme_name">Sehr schwarz</string>
     <string name="blacklist">Blacklist</string>
     <string name="cancel_current_timer">Timer stoppen</string>
@@ -80,7 +69,6 @@
     <string name="clear_blacklist">Blacklist leeren</string>
     <string name="clear_playlist_title">Playlist leeren</string>
     <string name="clear_playlist_x"><![CDATA[Playlist <b>%1$s</b> leeren? Dies kann nicht r\u00fcckg\u00e4ngig gemacht werden!]]></string>
-    <string name="colored_footers">Farbge Fußzeile</string>
     <string name="colors">Farben</string>
     <string name="could_not_create_playlist">Playlist konnte nicht erstellt werden.</string>
     <string name="could_not_download_album_cover">"Passendes Album Cover konnte nicht gedownloadet werden."</string>
@@ -88,16 +76,11 @@
     <string name="create_action">Erstellen</string>
     <string name="created_playlist_x">Playlist %1$s erstellt.</string>
     <string name="currently_listening_to_x_by_x">Spielt zur Zeit %1$s von %2$s.</string>
-    <string name="custom">Benutzerdefiniert</string>
-    <string name="date">Datum</string>
     <string name="default_hint">keine Lyrics</string>
-    <string name="delete_action">Löschen</string>
     <string name="delete_playlist_title">Playlist löschen</string>
     <string name="delete_playlist_x"><![CDATA[Playlist <b>%1$s</b> löschen?]]></string>
     <string name="delete_playlists_title">Playlisten löschen</string>
-    <string name="delete_song_title">Song löschen</string>
     <string name="delete_song_x"><![CDATA[Song <b>%1$s</b> löschen?]]></string>
-    <string name="delete_songs_title">Songs löschen</string>
     <string name="delete_x_playlists"><![CDATA[<b>%1$d</b> Playlisten löschen?]]></string>
     <string name="delete_x_songs"><![CDATA[<b>%1$d</b> Songs löschen?]]></string>
     <string name="deleted_x_songs">%1$d Songs gelöscht.</string>
@@ -106,11 +89,8 @@
     <string name="donate">Spenden</string>
     <string name="donate_summary">Falls du denkst ich habe mir etwas für meine Arbeit verdient, kannst du hier gerne ein bisschen Geld hinterlassen.</string>
     <string name="download_from_last_fm">Von Last.fm downloaden</string>
-    <string name="duration">Dauer</string>
     <string name="empty">Leer</string>
     <string name="equalizer">Equalizer</string>
-    <string name="error_loading_lyrics_from_network">Fehler beim laden vom Netzwerk</string>
-    <string name="failed_to_save_playlist">Playlist konnte nicht gespeichert werden (%s).</string>
     <string name="favorites">Favoriten</string>
     <string name="flat">Flach</string>
     <string name="folders">Ordner</string>
@@ -126,12 +106,8 @@
     <string name="history">Verlauf</string>
     <string name="home">Home</string>
     <string name="inserted_x_songs_into_playlist_x">%1$d Song(s) in Playlist %2$s eingefügt.</string>
-    <string name="inspired_designs_by">Design inspiriert von</string>
-    <string name="join_community">Tritt der Google Plus Community bei</string>
-    <string name="join_community_summary">Falls du Hilfe brauchst oder Probleme hast, gehe auf die Google Plus Seite von Retro Music.</string>
     <string name="summary_user_info">Zeige nur deinen Namen auf dem Startbildschirm</string>
     <string name="label_bit_rate">Bitrate</string>
-    <string name="label_details">Details</string>
     <string name="label_file_format">Format</string>
     <string name="label_file_name">Dateiname</string>
     <string name="label_file_path">Dateipfad</string>
@@ -144,12 +120,9 @@
     <string name="licenses">Lizenzen</string>
     <string name="light_theme_name">Sehr weiß</string>
     <string name="listing_files">Gelistete Dateien</string>
-    <string name="loading">Laden...</string>
     <string name="loading_products">Produkte werden geladen...</string>
     <string name="lyrics">Lyrics</string>
-    <string name="more">Mehr</string>
     <string name="my_name">Mein Name</string>
-    <string name="my_playlists">Meine Playlist</string>
     <string name="my_top_tracks">Meine Top Lieder</string>
     <string name="never">Nie</string>
     <string name="new_playlist_title">Neue Playlist</string>
@@ -158,7 +131,6 @@
     <string name="no_artists">Keine Künstler</string>
     <string name="no_audio_ID">"Song abspielen und anschließend erneut versuchen."</string>
     <string name="no_equalizer">Keinen Equalizer gefunden.</string>
-    <string name="no_files">Keine Dateien</string>
     <string name="no_lyrics_found">Keine Lyrics gefunden</string>
     <string name="no_playlists">Keine Playlisten</string>
     <string name="no_results">Keine Ergebnisse</string>
@@ -174,7 +146,6 @@
     <string name="permission_external_storage_denied">Berechtigung für den Zugriff auf externen Speicher verweigert.</string>
     <string name="permissions_denied">Berechtigung verweigert.</string>
     <string name="pick_from_local_storage">Vom lokalen Speicher wählen</string>
-    <string name="play">Wiedergabe</string>
     <string name="playing_notification_description">Die Abspielbenachrichtigung bietet Play/Pause-Steuerung</string>
     <string name="playing_notification_name">Abspielbenachrichtigung</string>
     <string name="playlist_empty_text">Leere Playlist</string>
@@ -184,11 +155,8 @@
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_images">Bilder</string>
     <string name="pref_header_lockscreen">Sperrbildschirm</string>
-    <string name="pref_header_now_playing_screen">Aussehen</string>
     <string name="pref_header_playlists">Playlist</string>
     <string name="pref_only_lollipop">"Nur unter Android Lollipop verfügbar."</string>
-    <string name="pref_only_nougat_mr1">"Nur unter Android Nougat 7.1 verfügbar."</string>
-    <string name="pref_summary_about">Personen die bei diesem Projekt geholfen haben</string>
     <string name="pref_summary_album_art_on_lockscreen">Aktuelles Album-Cover als Sperrbildschrim verwenden.</string>
     <string name="pref_summary_audio_ducking">Benachrichtigungen, Benachrichtigung etc.</string>
     <string name="pref_summary_blurred_album_art">Verunschärft das Album-Cover des Sperrbildschirm. Kann Probleme mit anderen Apps und Widgets verursachen.</string>
@@ -197,10 +165,8 @@
     <string name="pref_summary_colored_app_shortcuts">Färbt die App-Verknüpfungen in der Akzentfarbe. Bitte bei Änderung der Akzentfarbe erneut einschalten.</string>
     <string name="pref_summary_colored_navigation_bar">Färbt die Navigationsleiste in der Primärfarbe.</string>
     <string name="pref_summary_colored_notification">"F\u00e4rbt die Benachrichtigung passend zum Albumcover"</string>
-    <string name="pref_summary_exclude_songs">Lieder unter 30s ausschließen</string>
     <string name="pref_summary_gapless_playback">"Kann bei manchen Geräten Probleme beim Playback verursachen."</string>
     <string name="pref_summary_ignore_media_store_artwork">Erhöt die Qualität des Album Covers aber verlangsamt die Ladezeit. Nur aktivieren, falls Probleme mit niedriger Auflösung entstehen.</string>
-    <string name="pref_summary_lock_screen_app">Zeige vollständige Musiksteuerung auf dem Sperrbildschirm</string>
     <string name="pref_summary_open_source_licences">Details zu den Lizensen der Open Source Software</string>
     <string name="pref_summary_round_corners">Abgerundete Ecken für den Bildschirm, Album Cover, etc.</string>
     <string name="pref_summary_toggle_full_screen">Schalte den immersiven Modus ein.</string>
@@ -213,18 +179,14 @@
     <string name="pref_title_colored_app">selbstanpassende Farbe</string>
     <string name="dark_theme_name">Dunkel</string>
     <string name="pref_title_colored_notification">Gefärbte Benachrichtigung</string>
-    <string name="pref_title_exclude_songs">Lieder ausschließen</string>
     <string name="pref_title_gapless_playback">Lückenlose Wiedergabe</string>
     <string name="pref_title_general_theme">Hauptthema</string>
-    <string name="pref_title_gradient_color">Farbe wählen</string>
     <string name="pref_title_ignore_media_store_artwork">Media Store Cover ignorieren</string>
     <string name="pref_title_last_added_interval">Zuletzt hinzugefügtes Playlist Intervall</string>
-    <string name="pref_title_lock_screen_app">Retro Sperrbildschirm</string>
     <string name="pref_title_navigation_bar">Gefärbte Navigationsleiste</string>
     <string name="pref_title_now_playing_screen_appearance">Erscheinungsbild</string>
     <string name="pref_title_open_source_licences">Open Source Lizenzen</string>
     <string name="pref_title_round_corners">abgerundet Ecken</string>
-    <string name="pref_title_toggle_bottom_bar_titles">Titel deaktivieren</string>
     <string name="pref_title_toggle_full_screen">Vollbild App</string>
     <string name="pref_title_toggle_volume">Lautstärkeregler</string>
     <string name="pref_title_user_info">Benutzerinformationen</string>
@@ -232,7 +194,6 @@
     <string name="queue">Warteschlange</string>
     <string name="rate_app">App bewerten</string>
     <string name="rate_on_google_play_summary">Hinterlasse eine positive Bewertung auf Google Play, wenn die Retro Music gefällt.</string>
-    <string name="recent_activity">Verlauf</string>
     <string name="remove_action">Entfernen</string>
     <string name="remove_cover">Cover entfernen</string>
     <string name="remove_from_blacklist">Von der Blacklist löschen</string>
@@ -240,17 +201,13 @@
     <string name="remove_song_x_from_playlist"><![CDATA[<b>%1$s</b> von der Playlist entfernen?]]></string>
     <string name="remove_songs_from_playlist_title">Songs von Playlist entfernen</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[<b>%1$d</b> Songs von der Playlist entfernen?]]></string>
-    <string name="rename_action">Umbenennen</string>
     <string name="rename_playlist_title">Playlist umbenennen</string>
     <string name="restored_previous_purchases">Käufe wiederhergestellt</string>
-    <string name="retro">Retro</string>
     <string name="save_playlist_title">Als Datei speichern</string>
     <string name="saved_playlist_to">Playlist gespeichert zu %s.</string>
     <string name="saving_changes">Änderungen speichern</string>
-    <string name="saving_to_file">Wird gespeichert.</string>
     <string name="scanned_files">%1$d von %2$d Dateien gescannt.</string>
     <string name="search_hint">Bibliothek durchsuchen...</string>
-    <string name="select_preset">Voreinstellungen auswählen</string>
     <string name="shuffle">Zufall</string>
     <string name="sleep_timer_canceled">Sleep-Timer abgebrochen</string>
     <string name="sleep_timer_set">Sleep-Timer wurde auf %d minuten eingestellt.</string>
@@ -266,19 +223,11 @@
     <string name="this_month">Diesen Monat</string>
     <string name="this_week">Diese Woche</string>
     <string name="this_year">Dieses Jahr</string>
-    <string name="title">Titel</string>
-    <string name="title_desc">Titelbeschreibung</string>
-    <string name="title_home">Home</string>
-    <string name="title_notifications">Benachrichtigungen</string>
     <string name="today">Heute</string>
-    <string name="top_tracks">Lieblings Titel</string>
     <string name="translate">Übersetzen</string>
-    <string name="translate_summary">Hilfe Retro Music in deine Muttersprache zu übersetzen.</string>
     <string name="unplayable_file">Song konnte nicht abgespielt werden.</string>
     <string name="up_next">Als Nächstes</string>
-    <string name="update">Update</string>
     <string name="update_image">Bild aktualisieren</string>
-    <string name="updated_artist_image">Künstler Bild aktualisiert.</string>
     <string name="updating">Aktualisieren...</string>
     <string name="version">Version</string>
     <string name="web_search">Internetsuche</string>
@@ -287,8 +236,6 @@
     <string name="x_has_been_set_as_ringtone">%1$s als Klingelton verwenden.</string>
     <string name="x_selected">%1$d ausgewählt</string>
     <string name="year">Jahr</string>
-    <string name="edit">ändern</string>
-    <string name="tool_tip_see_all">Alle Titel anzeigen</string>
     <string name="title_good_night">Gute Nacht</string>
     <string name="normal">Normal</string>
     <string name="pref_summary_lock_screen">Vollständige Musiksteuerung auf dem Sperrbildschirm einschalten.</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 7916cb509..28d23a673 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -18,13 +18,11 @@
     <string name="action_grant">Παραχώρηση</string>
     <string name="action_grid_size">Μέγεθος Πλέγματος</string>
     <string name="action_grid_size_land">Μέγεθος Πλέγματος (landscape mode)</string>
-    <string name="action_new_playlist">Νέα playlist...</string>
     <string name="action_next">Επόμενο</string>
     <string name="action_play">Αναπαραγωγή</string>
     <string name="action_play_next">Αναπαραγωγή επόμενου</string>
     <string name="action_play_pause">Παίξε/Παύση</string>
     <string name="action_previous">Προηγούμενο</string>
-    <string name="action_re_download_artist_image">Ενημέρωση εικόνας καλλιτέχνη</string>
     <string name="action_remove_from_favorites">Αφαίρεση από τα αγαπημένα</string>
     <string name="action_remove_from_playing_queue">Αφαίρεση από την ουρά αναπ/γής</string>
     <string name="action_remove_from_playlist">Αφαίρεση από playlist</string>
@@ -37,10 +35,7 @@
     <string name="action_set_as_start_directory">Ορισμός ως κατάλογο εκκίνησης</string>
     <string name="action_settings">"Ρυθμίσεις"</string>
     <string name="action_share">Μοιράσου</string>
-    <string name="action_show_lyrics">Εμφάνιση στίχων</string>
-    <string name="action_shuffle_album">Τυχαία αναπ/γη άλμπουμ</string>
     <string name="action_shuffle_all">Τυχαία αναπ/γη όλων</string>
-    <string name="action_shuffle_artist">Τυχαία αναπ/γη καλλιτέχνη</string>
     <string name="action_shuffle_playlist">Τυχαία αναπ/γη playlist</string>
     <string name="action_sleep_timer">Χρονοδιακόπτης Ύπνου</string>
     <string name="action_tag_editor">Επεξεργασία Ετικετών</string>
@@ -51,7 +46,6 @@
     <string name="added_x_titles_to_playing_queue">Προστέθηκαν %1$d κομμάτια στην ουρά αναπ/γης.</string>
     <string name="album">Άλμπουμ</string>
     <string name="album_artist">Καλλιτέχνης Άλμπουμ</string>
-    <string name="album_desc">Περιγραφή Άλμπουμ</string>
     <string name="album_or_artist_empty">"Ο τίτλος ή το όνομα του καλλιτέχνη είναι κενό
 "</string>
     <string name="albums">Άλμπουμ</string>
@@ -65,19 +59,14 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="app_shortcut_shuffle_all_short">Τυχαία αναπαραγωγή</string>
     <string name="app_shortcut_top_tracks_long">@string/my_top_tracks</string>
     <string name="app_shortcut_top_tracks_short">Κορυφαία Κομμάτια</string>
-    <string name="app_summary">Μια Υβριδική εφαρμογή σχεδιασμένη με στυλ Material Design αλλά και iOS.</string>
     <string name="app_widget_big_name">Retro Music - Μεγάλο</string>
-    <string name="app_widget_big_name_2">Retro Music - Μεγάλο2</string>
     <string name="app_widget_card_name">Retro Music - Κάρτα</string>
     <string name="app_widget_classic_name">Retro Music - Κλασσικό</string>
     <string name="app_widget_small_name">Retro Music - Μικρό</string>
     <string name="artist">Καλλιτέχνης</string>
-    <string name="artist_desc">Περιγραφή Καλλιτέχνη</string>
     <string name="artists">Καλλιτέχνες</string>
     <string name="audio_focus_denied">Η εστίαση ήχου απορρίφθηκε.</string>
-    <string name="bass_boost_strength">Ισχύς Bass Boost</string>
     <string name="biography">Βιογραφία</string>
-    <string name="biography_unavailable">\u0394\u03b5\u03bd \u03b2\u03c1\u03ad\u03b8\u03b7\u03ba\u03b5 \u03b7 \u03b2\u03b9\u03bf\u03b3\u03c1\u03b1\u03c6\u03af\u03b1 \u03c4\u03bf\u03c5 \u03ba\u03b1\u03bb\u03bb\u03b9\u03c4\u03ad\u03c7\u03bd\u03b7</string>
     <string name="black_theme_name">Απλά Μαύρο</string>
     <string name="blacklist">Blacklist</string>
     <string name="cancel_current_timer">Ακύρωση τρέχων χρονοδιακόπτη</string>
@@ -87,7 +76,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="clear_blacklist">Εκκαθάριση blacklist</string>
     <string name="clear_playlist_title">Εκκαθάριση playlist</string>
     <string name="clear_playlist_x"><![CDATA[\u0395\u03ba\u03ba\u03b1\u03b8\u03ac\u03c1\u03b9\u03c3\u03b7 \u03c4\u03b7\u03c2 playlist <b>%1$s</b>? \u0394\u03b5\u03bd \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9 \u03b1\u03bd\u03b1\u03af\u03c1\u03b5\u03c3\u03b7!]]></string>
-    <string name="colored_footers">Χρωματιστά footers</string>
     <string name="colors">Χρώματα</string>
     <string name="could_not_create_playlist">\u0391\u03b4\u03c5\u03bd\u03b1\u03bc\u03af\u03b1 \u03b4\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03af\u03b1\u03c2 playlist.</string>
     <string name="could_not_download_album_cover">"\u0391\u03b4\u03c5\u03bd\u03b1\u03bc\u03af\u03b1 \u03bb\u03ae\u03c8\u03b7\u03c2 \u03c4\u03b1\u03b9\u03c1\u03b9\u03b1\u03c3\u03c4\u03bf\u03cd \u03b5\u03be\u03c9\u03c6\u03cd\u03bb\u03bb\u03bf\u03c5 \u03ac\u03bb\u03bc\u03c0\u03bf\u03c5\u03bc."</string>
@@ -95,16 +83,11 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="create_action">Δημιουργία</string>
     <string name="created_playlist_x">Δημιουργήθηκε η playlist %1$s.</string>
     <string name="currently_listening_to_x_by_x">Παίζει το %1$s από τους %2$s.</string>
-    <string name="custom">Εξατομίκευση</string>
-    <string name="date">Ημερομηνία</string>
     <string name="default_hint">Δεν βρέθηκαν στίχοι.</string>
-    <string name="delete_action">Διαγραφή</string>
     <string name="delete_playlist_title">Διαγραφή playlist</string>
     <string name="delete_playlist_x"><![CDATA[Διαγραφή της playlist <b>%1$s</b>?]]></string>
     <string name="delete_playlists_title">Διαγραφή αυτών των playlist</string>
-    <string name="delete_song_title">Διαγραφή κομματιού</string>
     <string name="delete_song_x"><![CDATA[Διαγραφή του κομματιού <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Διαγραφή κομματιών</string>
     <string name="delete_x_playlists"><![CDATA[Διαγραφή <b>%1$d</b> playlist?]]></string>
     <string name="delete_x_songs"><![CDATA[Διαγραφή <b>%1$d</b> κομματιών?]]></string>
     <string name="deleted_x_songs">Διαγράφηκαν %1$d κομμάτια.</string>
@@ -113,11 +96,8 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="donate">Δώρισε</string>
     <string name="donate_summary">"Αν σου άρεσε η εφαρμογή μπορείς να δωρίσεις εδώ. "</string>
     <string name="download_from_last_fm">Λήψη από Last.fm</string>
-    <string name="duration">Διάρκεια</string>
     <string name="empty">Κενό</string>
     <string name="equalizer">Ισοσταθμιστής</string>
-    <string name="error_loading_lyrics_from_network">Σφάλμα φόρτωσης από το δίκτυο</string>
-    <string name="failed_to_save_playlist">Αδυναμία αποθήκευσης playlist (%s).</string>
     <string name="favorites">Αγαπημένα</string>
     <string name="flat">Επίπεδο</string>
     <string name="folders">Φάκελοι</string>
@@ -133,15 +113,9 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="history">Ιστορικό</string>
     <string name="home">Αρχική</string>
     <string name="full">Πλήρες</string>
-    <string name="pref_title_day_dream">Day dream</string>
-    <string name="pref_summary_day_dream">Εμφάνιση λεπτομερειών κομματιού στο dream , όταν παίζει μουσική</string>
     <string name="inserted_x_songs_into_playlist_x">Προστέθηκαν %1$d κομμάτια στη playlist %2$s.</string>
-    <string name="inspired_designs_by">Σχέδια εμπνευσμένα από</string>
-    <string name="join_community">Συμμετοχή στην κοινότητα Google Plus</string>
-    <string name="join_community_summary">Εαν χρειάζεστε βοήθεια ή έχετε απορίες, η κοινότητα Retro Music στο Google Plus είναι ενα καλό μέρος να επισκεφτείτε.</string>
     <string name="summary_user_info">Δείξτε το όνομά σας στην οθόνη κλειδώματος</string>
     <string name="label_bit_rate">Bitrate</string>
-    <string name="label_details">Λεπτομέρειες</string>
     <string name="label_file_format">Μορφή</string>
     <string name="label_file_name">Όνομα Αρχείου</string>
     <string name="label_file_path">Διαδρομή Αρχείου</string>
@@ -154,12 +128,9 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="licenses">Άδειες</string>
     <string name="light_theme_name">Ξεκάθαρα Λευκό</string>
     <string name="listing_files">Καταγραφή αρχείων</string>
-    <string name="loading">Φόρτωση...</string>
     <string name="loading_products">Φόρτωση προϊόντων...</string>
     <string name="lyrics">Στίχοι</string>
-    <string name="more">Περισσότερα</string>
     <string name="my_name">Το Όνομά μου</string>
-    <string name="my_playlists">H Playlist μου</string>
     <string name="my_top_tracks">Τα Κορυφαία Κομμάτια μου</string>
     <string name="never">Ποτέ</string>
     <string name="new_playlist_title">Νέα playlist</string>
@@ -168,7 +139,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="no_artists">Κανένας καλλιτέχνης</string>
     <string name="no_audio_ID">"Παίξτε ενα κομμάτι πρώτα, και ξαναπροσπαθήστε."</string>
     <string name="no_equalizer">Δεν βρέθηκε ισοσταθμιστής.</string>
-    <string name="no_files">Κανένα αρχείο</string>
     <string name="no_lyrics_found">Δεν βρέθηκαν στίχοι</string>
     <string name="no_playlists">Δεν βρέθηκαν playlists</string>
     <string name="no_results">Κανένα αποτέλεσμα</string>
@@ -184,7 +154,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="permission_external_storage_denied">Η άδεια για προσπέλαση του external storage δεν παραχωρήθηκε.</string>
     <string name="permissions_denied">Οι άδειες δεν παραχωρήθηκαν.</string>
     <string name="pick_from_local_storage">Επιλογή από Χώρο Αποθήκευσης</string>
-    <string name="play">Αναπαραγωγή</string>
     <string name="playing_notification_description">Η ειδοποίηση αναπαραγωγής προσφέρει κουμπιά για play/pause, κλπ.</string>
     <string name="playing_notification_name">Ειδοποίηση Αναπαραγωγής</string>
     <string name="playlist_empty_text">Κενή playlist</string>
@@ -194,11 +163,8 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="pref_header_audio">Ήχος</string>
     <string name="pref_header_images">Εικόνες</string>
     <string name="pref_header_lockscreen">Οθόνη Κλειδώματος</string>
-    <string name="pref_header_now_playing_screen">Παίζει Τώρα</string>
     <string name="pref_header_playlists">Playlists</string>
     <string name="pref_only_lollipop">"Διαθέσιμο μόνο στο Android Lollipop."</string>
-    <string name="pref_only_nougat_mr1">"Διαθέσιμο μόνο στο Android Nougat 7.1."</string>
-    <string name="pref_summary_about">Άτομα που βοήθησαν στο project</string>
     <string name="pref_summary_album_art_on_lockscreen">Χρησιμοποιεί το εξώφυλλο του τρέχων κομματιού ως φόντο οθόνης κλειδώματος.</string>
     <string name="pref_summary_audio_ducking">Ειδοποιήσεις, πλοήγηση, κλπ.</string>
     <string name="pref_summary_blurred_album_art">Θολώνει το εξώφυλλο άλμπουμ στην οθόνη κλειδώματος. Μπορεί να προκαλέσει προβλήματα με εφαρμογές και widgets.</string>
@@ -207,13 +173,10 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="pref_summary_colored_app_shortcuts">Χρωματίζει τα app shortcuts με το επιλεγμένο χρώμα τονισμού.</string>
     <string name="pref_summary_colored_navigation_bar">Χρωματίζει το navigation bar με το κύριο χρώμα.</string>
     <string name="pref_summary_colored_notification">"\u03a7\u03c1\u03c9\u03bc\u03b1\u03c4\u03af\u03b6\u03b5\u03b9 \u03c4\u03b7\u03bd \u03b5\u03b9\u03b4\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03bc\u03b5 \u03c4\u03bf \u03b6\u03c9\u03bd\u03c4\u03b1\u03bd\u03cc \u03c7\u03c1\u03ce\u03bc\u03b1 \u03c4\u03bf\u03c5 \u03b5\u03be\u03c9\u03c6\u03cd\u03bb\u03bb\u03bf\u03c5 \u03ac\u03bb\u03bc\u03c0\u03bf\u03c5\u03bc."</string>
-    <string name="pref_summary_exclude_songs">Εξαίρεση κομματιών κάτω από 30 δευτ.</string>
     <string name="pref_summary_gapless_playback">"Μπορεί να προκαλέσει προβλήματα με την αναπαραγωγή σε κάποιες συσκευές."</string>
     <string name="pref_summary_ignore_media_store_artwork">Μπορεί να αυξήσει την ποιότητα των εξωφύλλων άλμπουμ, αλλά προκαλεί αργή φόρτωση εικόνων. Ενεργοποιήστε αυτή την επίλογη μόνο εαν αντιμετωπίζετε προβλήματα με εξώφυλλα χαμηλής ανάλυσης.</string>
-    <string name="pref_summary_lock_screen_app">Εμφάνιση διακοπτών ρύθμισης από την οθόνη κλειδώματος.</string>
     <string name="pref_summary_open_source_licences">Λεπτομέρειες άδειας για τη χρήση open source λογισμικού</string>
     <string name="pref_summary_round_corners">Στρογγυλεμένες άκρες για το παράθυρο, εξώφυλλα άλμπουμ, κλπ.</string>
-    <string name="pref_summary_toggle_bottom_bar_titles">Απενεργοποίηση τίτλων απο τη μπάρα πλοήγησης.</string>
     <string name="pref_summary_toggle_full_screen">Ενεργοποίηση της επιλογής για χρήση πλήρους οθόνης</string>
     <string name="pref_summary_toggle_volume">Εαν υπάρχει χώρος στην οθόνη αναπαραγωγής, ενεργοποιήστε τον πίνακα ελέγχου έντασης.</string>
     <string name="pref_title_album_art_on_lockscreen">Εμφάνιση εξωφύλλου άλμπουμ.</string>
@@ -225,19 +188,15 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="pref_title_colored_app">Προσαρμοστικό Χρώμα</string>
     <string name="dark_theme_name">Κάπως Σκούρο</string>
     <string name="pref_title_colored_notification">Χρωματιστή ειδοποίηση</string>
-    <string name="pref_title_exclude_songs">Εξαίρεση κομματιών</string>
     <string name="pref_title_gapless_playback">Αναπαραγωγή χωρίς κενά</string>
     <string name="pref_title_general_theme">Γενικό θέμα</string>
-    <string name="pref_title_gradient_color">Επιλέξτε χρώμα</string>
     <string name="pref_title_ignore_media_store_artwork">Παράληψη Media Store για εξώφυλλα</string>
     <string name="pref_title_last_added_interval">Χρονικό διάστημα playlist \"Προστέθηκε τελευταία\"</string>
     <string name="pref_title_lock_screen">Full screen Ρυθμίσεις</string>
-    <string name="pref_title_lock_screen_app">Retro Οθόνη Κλειδώματος</string>
     <string name="pref_title_navigation_bar">Χρωματιστό navigation bar</string>
     <string name="pref_title_now_playing_screen_appearance">Εμφάνιση</string>
     <string name="pref_title_open_source_licences">Άδειες λογισμικού open source</string>
     <string name="pref_title_round_corners">Στρογγυλεμένες Άκρες</string>
-    <string name="pref_title_toggle_bottom_bar_titles">Απενεργοποίηση τίτλων</string>
     <string name="pref_title_toggle_full_screen">Full screen εφαρμογή</string>
     <string name="pref_title_toggle_volume">Πίνακας Ελέγχου Έντασης</string>
     <string name="pref_title_user_info">Πληροφορίες Χρήστη</string>
@@ -245,7 +204,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="queue">Ουρά</string>
     <string name="rate_app">Βαθμολόγησε την εφαρμογή</string>
     <string name="rate_on_google_play_summary">Σας αρέσει αυτό το app; Γράψτε μας τις εντυπώσεις σας στο Google Play για να σας παρέχουμε μια καλύτερη εμπειρία</string>
-    <string name="recent_activity">Πρόσφατη Δραστηριότητα</string>
     <string name="remove_action">Αφαίρεση</string>
     <string name="remove_cover">Αφαίρεση Εξώφυλλου</string>
     <string name="remove_from_blacklist">Αφαίρεση από τη blacklist</string>
@@ -253,18 +211,14 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="remove_song_x_from_playlist"><![CDATA[Αφαίρεση του κομματιού <b>%1$s</b> από τη playlist?]]></string>
     <string name="remove_songs_from_playlist_title">Αφαίρεσε τα κομμάτια από την playlist</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[Αφαίρεση <b>%1$d</b> κομματιών από τη playlist?]]></string>
-    <string name="rename_action">Μετονομασία</string>
     <string name="rename_playlist_title">Μετονόμασε την playlist</string>
     <string name="restored_previous_purchases">Επαναφορά προηγούμενων αγορών επιτυχής.</string>
-    <string name="retro">Retro</string>
     <string name="retro_equalizer">Retro Ισοσταθμιστής</string>
     <string name="save_playlist_title">Αποθήκευσε ως αρχείο</string>
     <string name="saved_playlist_to">Η Playlist αποθηκεύτηκε στο %s.</string>
     <string name="saving_changes">Αποθηκευόνται οι αλλαγές...</string>
-    <string name="saving_to_file">Αποθήκευση στο αρχείο...</string>
     <string name="scanned_files">Σαρώθηκαν %1$d από %2$d αρχεία.</string>
     <string name="search_hint">Αναζήτηση της βιβλιοθήκης σας...</string>
-    <string name="select_preset">Επέλεξε Preset</string>
     <string name="shuffle">Τυχαία Αναπαραγωγή</string>
     <string name="sleep_timer_canceled">Χρονοδιακόπτης ύπνου ακυρώθηκε.</string>
     <string name="sleep_timer_set">Ο χρονοδιακόπτης ύπνου ορίστικε για %d λεπτά από τώρα.</string>
@@ -274,36 +228,22 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="sort_order">Σειρά Διάταξης</string>
     <string name="speech_not_supported">Ουπς! Η συσκευή σου δεν υποστηρίζει εισαγωγή φωνής</string>
     <string name="speech_prompt">Αναζητήστε στην Βιβλιοθήκη</string>
-    <string name="summary_material_design_city_wallpaper">Ταπετσαρίες Πόλης από τον ιστότοπο www.techjuice.pk</string>
-    <string name="summary_material_design_icons">Όλα τα είκονίδια που χρησιμοποιήσαμε βρίσκονται στους ιστότοπους www.flaticon.com ή www.materialdesignicons.com</string>
     <string name="support_development">Υποστήριξη ανάπτυξης της εφαρμογής</string>
     <string name="thank_you">Σας ευχαριστούμε!</string>
     <string name="the_audio_file">Το αρχείο ήχου</string>
     <string name="this_month">Αυτό το μήνα</string>
     <string name="this_week">Αυτή την εβδομάδα</string>
     <string name="this_year">Αυτό το χρόνο</string>
-    <string name="title">Τίτλος</string>
     <string name="title_dashboard">Ταμπλό</string>
-    <string name="title_desc">Περιγραφή Τίτλου</string>
-    <string name="title_home">Αρχική</string>
-    <string name="title_material_design_city_wallpaper">Ταπετσαρία Πόλης</string>
-    <string name="title_material_design_icons">Εικονίδια</string>
-    <string name="title_notifications">Ειδοποιήσεις</string>
     <string name="today">Σήμερα</string>
-    <string name="top_tracks">Κορυφαία Κομμάτια</string>
     <string name="track_hint">"Κομμάτι (2 για κομμάτι 2, ή 3004 για CD3 κομμάτι 4)"</string>
     <string name="track_list">Αριθμός Κομματιού</string>
     <string name="translate">Μετάφραση</string>
-    <string name="translate_summary">Βοηθήστε μας να μεταφράσουμε το Retro Music και στη δική σας γλώσσα.</string>
     <string name="unplayable_file">\u0394\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03ad\u03c3\u03b1\u03bc\u03b5 \u03bd\u03b1 \u03c0\u03b1\u03af\u03be\u03bf\u03c5\u03bc\u03b5 \u03b1\u03c5\u03c4\u03cc \u03c4\u03bf \u03ba\u03bf\u03bc\u03bc\u03ac\u03c4\u03b9.</string>
     <string name="up_next">Αμέσως επόμενο</string>
-    <string name="update">Ενημέρωση</string>
     <string name="update_image">Ενημέρωση εικόνας</string>
-    <string name="updated_artist_image">Εικόνα καλλιτέχνη ενημερώθηκε.</string>
     <string name="updating">Ενημέρωση σε εξέλιξη...</string>
     <string name="version">Έκδοση</string>
-    <string name="virtualizer_strength">Ισχύς Virtualizer</string>
-    <string name="volume_control">Έλεγχος Έντασης</string>
     <string name="web_search">Αναζήτηση στον ιστό</string>
     <string name="what_do_you_want_to_share">Τι θα θέλατε να μοιραστείτε;</string>
     <string name="title_user_info">Ποιό είναι το όνομά σας;</string>
@@ -312,37 +252,23 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="year">Χρονιά</string>
     <string name="reset_artist_image">Επαναφορά εικόνας καλλιτέχνη</string>
     <string name="set_artist_image">Ορισμός εικόνας καλλιτέχνη</string>
-    <string name="edit">Επεξεργασία</string>
     <string name="donation_header">Αγορασέ μου ένα</string>
     <string name="plain">Απλό</string>
-    <string name="tool_tip_see_all">Τυχαία αναπαραγωγή όλων των τραγουδιών</string>
-    <string name="toggle_lyrics_size">Αλλαγή μεγέθους στίχων</string>
     <string name="title_good_night">Καληνύχτα</string>
     <string name="title_good_evening">Καλό Απόγευμα</string>
     <string name="title_good_afternoon">Καλό Μεσημέρι</string>
     <string name="title_good_morning">Καλημέρα</string>
     <string name="title_good_day">Καλημέρα</string>
-    <string name="language_contributors">Συνεισφέροντες μεταφραστές</string>
     <string name="simple">Απλό</string>
     <string name="pref_summary_toggle_headset">Όταν συνδεθούν ηχεία/ακουστικά , αρχίζει η αναπαραγωγή</string>
     <string name="pref_title_toggle_toggle_headset">Αυτόματη αναπαραγωγή</string>
     <string name="pref_summary_tab_titles">Ενεργοποίηση/ Απενεργοποίηση τίτλων από την κάτω μπάρα</string>
     <string name="pref_title_toggle_tab_titles">Τίτλοι καρτελών</string>
-    <string name="pref_summary_language_en">Επέβαλε αλλαγή γλώσσας σε Αγγλικά (σε δοκιμαστικό στάδιο για την επιλογή πολλαπλών γλωσσών)</string>
-    <string name="pref_title_toggle_language_en">Αγγλικά</string>
-    <string name="play_all">Αναπαραγωγή όλων</string>
     <string name="normal">Κανονικό</string>
-    <string name="experimental">Πειραματικό</string>
     <string name="pref_summary_lock_screen">Ενεργοποίηση διακοπτών ρύθμισης στην οθόνη κλειδώματος.</string>
-    <string name="slide_unlock">Σύρε για ξεκλείδωμα</string>
     <string name="primary_color_desc">Το βασικό χρώμα του θέματος, η προεπιλογή είναι το άσπρο.</string>
     <!-- SAF -->
     <!-- SAF guide -->
-    <string name="saf_guide_slide1_description">Άνοιξε το συρτάρι πλοήγησης</string>
-    <string name="saf_guide_slide2_title">Διάλεξε την κάρτα SD σου στο συρτάρι πλοήγησης</string>
-    <string name="deleting_songs">Διαγραφή τραγουδιών...</string>
-    <string name="pref_summary_toggle_genre">Δεν θέλω να φαίνεται το είδος, κρύψ\'το</string>
     <!-- Message displayed when tag editing fails -->
-    <string name="tag_editor_check_permission">Επαληθεύοντας τις άδειες...</string>
     <!-- Android Auto -->
 </resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index face23da4..fa933cc6f 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -8,7 +8,6 @@
     <string name="action_add_to_playlist">"Añadir a playlist "</string>
     <string name="action_clear_playing_queue">Borrar lista de reproducción</string>
     <string name="action_clear_playlist">Limpiar lista de reproducción</string>
-    <string name="action_cycle_repeat">Modo de repetición de ciclo</string>
     <string name="action_delete">Borrar</string>
     <string name="action_delete_from_device">Eliminar del dispositivo</string>
     <string name="action_details">Detalles</string>
@@ -18,13 +17,11 @@
     <string name="action_grant">Conceder</string>
     <string name="action_grid_size">Tamaño de cuadrícula</string>
     <string name="action_grid_size_land">Tamaño de cuadrícula (horizontal)</string>
-    <string name="action_new_playlist">Nueva playlist...</string>
     <string name="action_next">"Siguiente "</string>
     <string name="action_play">Reproducir</string>
     <string name="action_play_next">Reproducir siguiente</string>
     <string name="action_play_pause">Reproducir/Pausar</string>
     <string name="action_previous">"Anterior "</string>
-    <string name="action_re_download_artist_image">Actualizar imagen del artista</string>
     <string name="action_remove_from_favorites">"Quitar de favoritos "</string>
     <string name="action_remove_from_playing_queue">Quitar de la lista de reproducción</string>
     <string name="action_remove_from_playlist">Quitar de la lista de reproducción</string>
@@ -37,15 +34,10 @@
     <string name="action_set_as_start_directory">Establecer como directorio de inicio</string>
     <string name="action_settings">"Ajustes "</string>
     <string name="action_share">"Compartir "</string>
-    <string name="action_show_lyrics">Mostrar letra de la canción</string>
-    <string name="action_shuffle_album">Shuffle</string>
     <string name="action_shuffle_all">Mezclar todo</string>
-    <string name="action_shuffle_artist">Mezclar artista</string>
     <string name="action_shuffle_playlist">Lista de reproducción aleatoria</string>
     <string name="action_sleep_timer">Temporizador</string>
     <string name="action_tag_editor">Editor de etiquetas</string>
-    <string name="action_toggle_favorite">Alternar favorito</string>
-    <string name="action_toggle_shuffle">Alternar el modo aleatorio</string>
     <string name="add_action">Agregar</string>
     <string name="add_photo">Agregar\nfotografía</string>
     <string name="add_playlist_title">"Añadir a la lista"</string>
@@ -53,11 +45,9 @@
     <string name="added_x_titles_to_playing_queue">%1$d canciones añadidas a la cola de reproducción.</string>
     <string name="album">"Álbum "</string>
     <string name="album_artist">"Álbum de artista "</string>
-    <string name="album_desc">Descripción del álbum</string>
     <string name="album_or_artist_empty">El título o el artista está vacío.</string>
     <string name="albums">"Álbumes "</string>
     <!-- Android Auto -->
-    <string name="albums_label">Álbumes</string>
     <string name="always">Siempre</string>
     <string name="app_share">Echa un vistazo a este reproductor de música: https://play.google.com/store/apps/details?id=%s</string>
     <string name="app_shortcut_last_added_long">\@string/last_added</string>
@@ -67,21 +57,14 @@
     <string name="app_shortcut_shuffle_all_short">Aleatorio</string>
     <string name="app_shortcut_top_tracks_long">\@string/my_top_tracks</string>
     <string name="app_shortcut_top_tracks_short">Más Reproducidas</string>
-    <string name="app_summary">Una aplicación que combina lo mejor del diseño de iOS y Android.</string>
     <string name="app_widget_big_name">Retro Music - Grande</string>
-    <string name="app_widget_big_name_2">Retro Music - Grande 2</string>
     <string name="app_widget_card_name">Retro Music - Tarjeta</string>
     <string name="app_widget_classic_name">Retro Music - Clásico</string>
     <string name="app_widget_small_name">Retro Music - Pequeño</string>
     <string name="artist">Artista</string>
-    <string name="artist_desc">Artista desc.</string>
     <string name="artists">Artistas</string>
-    <string name="artists_label">Artistas</string>
-    <string name="at_least_one_category_must_be_enabled">Al menos una categoría debe estar habilitada.</string>
     <string name="audio_focus_denied">"Ecualizador denegado "</string>
-    <string name="bass_boost_strength">Reforzar graves</string>
     <string name="biography">"Biografía "</string>
-    <string name="biography_unavailable">No ha sido posible encontrar la biograf\u00eda de este artista.</string>
     <string name="black_theme_name">Negro</string>
     <string name="blacklist">Lista negra</string>
     <string name="blur">Desenfocar</string>
@@ -97,7 +80,6 @@
     <string name="clear_playlist_x"><![CDATA[\u00bfEliminar la lista <b>%1$s</b>? \u00a1Esto no se puede revertir!]]></string>
     <string name="color">Color</string>
     <string name="color_theme_name">Color</string>
-    <string name="colored_footers">Pies de página coloreados</string>
     <string name="colors">Colores</string>
     <string name="could_not_create_playlist">No se pudo crear la lista de reproducci\u00f3n.</string>
     <string name="could_not_download_album_cover">"No se pudo descargar una car\u00e1tula del \u00e1lbum correspondiente."</string>
@@ -106,36 +88,23 @@
     <string name="create_action">Crear</string>
     <string name="created_playlist_x">La lista de reproducción %1$s ha sido creada.</string>
     <string name="currently_listening_to_x_by_x">Escuchando %1$s de %2$s</string>
-    <string name="custom">Personalizar</string>
     <string name="dark_theme_name">Oscuro</string>
-    <string name="date">Fecha</string>
     <string name="default_hint">No hay letra disponible</string>
-    <string name="delete_action">Eliminar</string>
     <string name="delete_playlist_title">Eliminar lista de reproducción</string>
     <string name="delete_playlist_x"><![CDATA[¿Eliminar la lista de reproducción <b>%1$s</b>?]]></string>
     <string name="delete_playlists_title">"Eliminar listas de reproducción "</string>
-    <string name="delete_song_title">"Eliminar canción "</string>
     <string name="delete_song_x"><![CDATA[¿Eliminar la canción<b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Eliminar canciones</string>
     <string name="delete_x_playlists"><![CDATA[¿Eliminar listas de reproducción <b>%1$d</b>?]]></string>
     <string name="delete_x_songs"><![CDATA[¿Eliminar canciones <b>%1$d</b>?]]></string>
     <string name="deleted_x_songs">Canciones %1$d se han eliminado</string>
-    <string name="deleting_songs">Borrando canciones</string>
     <string name="do_you_want_to_clear_the_blacklist">¿Quieres limpiar la lista negra?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[¿Quieres borrar <b>%1$s</b> de la lista negra?]]></string>
     <string name="donate">Donar</string>
     <string name="donate_summary">Si crees que merezco ser recompensado por mi trabajo, puedes dejarme un poco de dinero aquí.</string>
     <string name="donation_header">Cómprame una</string>
     <string name="download_from_last_fm">Descarga de Last.fm</string>
-    <string name="duration">Duración</string>
-    <string name="edit">Editar</string>
-    <string name="edit_categories">Editar categorías</string>
-    <string name="edit_tags">Editar etiquetas</string>
     <string name="empty">Vacío</string>
     <string name="equalizer">Ecualizador</string>
-    <string name="error_loading_lyrics_from_network">Error cargando recurso desde la red</string>
-    <string name="experimental">Experimental</string>
-    <string name="failed_to_save_playlist">Error al guardar la lista de reproducción (%s).</string>
     <string name="favorites">Favoritos</string>
     <string name="flat">Plano</string>
     <string name="folders">Carpetas</string>
@@ -151,36 +120,24 @@
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
     <string name="history">Historial</string>
-    <string name="history_label">Historial</string>
-    <string name="holiday">Vacaciones</string>
     <string name="home">Inicio</string>
     <string name="inserted_x_songs_into_playlist_x">%1$d canciones han sido insertadas en la playlist %2$s.</string>
-    <string name="inspired_designs_by">Diseños inspirados por</string>
-    <string name="join_community">Únete a la comunidad de Google Plus</string>
-    <string name="join_community_summary">Si necesitas ayuda o tiene una pregunta, la comunidad de Retro Music en Google+ es un buen lugar para ir.</string>
     <string name="label_bit_rate">Tasa de bits</string>
-    <string name="label_details">"Detalles "</string>
     <string name="label_file_format">"Formato "</string>
     <string name="label_file_name">"Nombre del archivo "</string>
     <string name="label_file_path">Ubicación de archivo</string>
     <string name="label_file_size">Tamaño</string>
     <string name="label_sampling_rate">Frecuencia de muestreo</string>
     <string name="label_track_length">Duración</string>
-    <string name="language_contributors">Traductores</string>
     <string name="last_added">Agregados últimamente</string>
     <string name="lets_play_something">Vamos a poner algo</string>
     <string name="library">Biblioteca</string>
-    <string name="library_categories">Categorías de biblioteca</string>
     <string name="licenses">Licencias</string>
     <string name="light_theme_name">Blanco</string>
     <string name="listing_files">Listado de archivos</string>
-    <string name="loading">Cargando...</string>
     <string name="loading_products">Cargando productos...</string>
     <string name="lyrics">Letra</string>
-    <string name="media_route_menu_title">Dispositivo de difusión</string>
-    <string name="more">Más</string>
     <string name="my_name">Mi Nombre</string>
-    <string name="my_playlists">Mi lista de reproducción</string>
     <string name="my_top_tracks">Mis pistas favoritas</string>
     <string name="never">Nunca</string>
     <string name="new_playlist_title">Nueva lista de reproducción</string>
@@ -189,7 +146,6 @@
     <string name="no_artists">No hay artistas</string>
     <string name="no_audio_ID">"Primero reproduce una canción, luego prueba otra vez."</string>
     <string name="no_equalizer">No se encontró ningún ecualizador.</string>
-    <string name="no_files">No hay archivos</string>
     <string name="no_genres">Sin genero</string>
     <string name="no_lyrics_found">No sé encontraron letras</string>
     <string name="no_playlists">No hay listas de reproducción</string>
@@ -210,24 +166,18 @@
     <string name="personalize">Personalizar</string>
     <string name="pick_from_local_storage">Elige del almacenamiento local</string>
     <string name="plain">Plano</string>
-    <string name="play">Reproducir</string>
-    <string name="play_all">Reproducir todo</string>
     <string name="playing_notification_description">La notificación de reproducción muestra controles para parar, reproducir, etc.</string>
     <string name="playing_notification_name">Notificación de reproducción</string>
     <string name="playlist_empty_text">Lista de Reproducción vacía</string>
     <string name="playlist_is_empty">La lista de reproducción está vacía</string>
     <string name="playlist_name_empty">Nombre de Lista de reproducción</string>
     <string name="playlists">Playlists</string>
-    <string name="playlists_label">Listas de reproducción</string>
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_general">"General "</string>
     <string name="pref_header_images">Imágenes</string>
     <string name="pref_header_lockscreen">Pantalla de Bloqueo</string>
-    <string name="pref_header_now_playing_screen">Reproduciendo ahora</string>
     <string name="pref_header_playlists">Listas de reproducción</string>
     <string name="pref_only_lollipop">"Solo disponible para Lollipop."</string>
-    <string name="pref_only_nougat_mr1">"Solo disponible en Nougat 7.1."</string>
-    <string name="pref_summary_about">Personas que ayudaron en el proyecto</string>
     <string name="pref_summary_album_art_on_lockscreen">Utiliza la carátula actual del álbum de canciones como fondo de pantalla de bloqueo.</string>
     <string name="pref_summary_audio_ducking">Notificaciones, navegación, etc.</string>
     <string name="pref_summary_blurred_album_art">Desenfocar la cubierta del álbum en la pantalla de bloqueo. Puede causar problemas con aplicaciones y widgets de terceros</string>
@@ -237,24 +187,15 @@
     <string name="pref_summary_colored_app_shortcuts">Colorea los atajos de la app en el color de énfasis. Cada vez que cambies el color, por favor activa esto para que haga efecto.</string>
     <string name="pref_summary_colored_navigation_bar">Color de la barra de navegación en color primario.</string>
     <string name="pref_summary_colored_notification">"Colorea la notificaci\u00f3n en el color vibrante de la car\u00e1tula del \u00e1lbum."</string>
-    <string name="pref_summary_day_dream">Mostrar detalles de canciones cuando la música esté reproduciéndose</string>
     <string name="pref_summary_dominant_color">El color dominante se elegirá de la imagen del álbum o artista</string>
-    <string name="pref_summary_exclude_songs">Excluir canciones de menos de 30 segundos.</string>
     <string name="pref_summary_gapless_playback">"Puede causar problemas de reproducción en algunos dispositivos."</string>
     <string name="pref_summary_ignore_media_store_artwork">Puede aumentar la calidad de la portada del álbum, pero causa tiempos de carga lenta de la imagen. Activar únicamente si tienes problemas con carátulas de baja resolución.</string>
-    <string name="pref_summary_language_en">Forzar idioma de la aplicación al inglés ( para probar la opción de múltiples idiomas)</string>
-    <string name="pref_summary_library_categories">Configurar la visibilidad y el orden de las categorías de la biblioteca.</string>
     <string name="pref_summary_lock_screen">Mostrar controles en la pantalla de bloqueo para Retro Music</string>
-    <string name="pref_summary_lock_screen_app">Mostrar controles completos desde la pantalla de bloqueo</string>
     <string name="pref_summary_open_source_licences">Detalles de licencia para software libre</string>
     <string name="pref_summary_round_corners">Esquinas redondeadas para la aplicación, las ilustraciones de los álbumes, etc.</string>
     <string name="pref_summary_tab_titles">Habilitar/deshabilitar títulos de las pestañas inferiores</string>
-    <string name="pref_summary_toggle_bottom_bar_titles">Deshabilitar títulos de la barra de navegación inferior</string>
     <string name="pref_summary_toggle_full_screen">Activar esto para modo inmersivo</string>
-    <string name="pref_summary_toggle_genre">No quiero mostrar género</string>
     <string name="pref_summary_toggle_headset">Reproducir cuando se conecten los audífonos</string>
-    <string name="pref_summary_toggle_navigation_bar">Ocultar solo la barra de navegación</string>
-    <string name="pref_summary_toggle_status_bar">Ocultar solo la barra de estado</string>
     <string name="pref_summary_toggle_volume">Activar controles de volumen si hay espacio en la pantalla de reproduccióm</string>
     <string name="pref_title_album_art_on_lockscreen">Mostrar carátula del álbum</string>
     <string name="pref_title_app_shortcuts">Atajo de aplicación coloreada</string>
@@ -264,29 +205,18 @@
     <string name="pref_title_classic_notification">Diseño de notificación clásico</string>
     <string name="pref_title_colored_app">Color adaptativo</string>
     <string name="pref_title_colored_notification">Notificación coloreada</string>
-    <string name="pref_title_day_dream">Ensueño</string>
-    <string name="pref_title_exclude_songs">Excluir canciones</string>
-    <string name="pref_title_external_storage_access">Permitir acceso al almacenamiento externo</string>
     <string name="pref_title_gapless_playback">"Reproducción sin interrupciones "</string>
     <string name="pref_title_general_theme">Tema general</string>
-    <string name="pref_title_gradient_color">Elige un color</string>
     <string name="pref_title_ignore_media_store_artwork">Ignorar carátulas de la biblioteca de medios</string>
     <string name="pref_title_last_added_interval">Último intervalo de listas agregado</string>
     <string name="pref_title_lock_screen">Controles de pantalla completa</string>
-    <string name="pref_title_lock_screen_app">Bloqueo de pantalla de Retro</string>
-    <string name="pref_title_lyrics_options">Opciones de letra</string>
     <string name="pref_title_navigation_bar">Barra de navegación coloreada</string>
     <string name="pref_title_now_playing_screen_appearance">Apariencia</string>
     <string name="pref_title_open_source_licences">Licencias de código abierto</string>
     <string name="pref_title_round_corners">Esquinas redondeadas</string>
-    <string name="pref_title_toggle_bottom_bar_titles">Desactivar títulos</string>
     <string name="pref_title_toggle_carousel_effect">Efecto carrusel</string>
     <string name="pref_title_toggle_dominant_color">Color dominante</string>
     <string name="pref_title_toggle_full_screen">App en pantalla completa</string>
-    <string name="pref_title_toggle_genre">Ocultar género</string>
-    <string name="pref_title_toggle_language_en">Idioma inglés</string>
-    <string name="pref_title_toggle_navigation_bar">Barra de navegación</string>
-    <string name="pref_title_toggle_status_bar">Barra de estado</string>
     <string name="pref_title_toggle_tab_titles">Títulos de pestañas</string>
     <string name="pref_title_toggle_toggle_headset">Reproducción automática</string>
     <string name="pref_title_toggle_volume">Controles de volumen</string>
@@ -294,10 +224,8 @@
     <string name="primary_color">Color primario</string>
     <string name="primary_color_desc">El color del tema principal, blanco por defecto.</string>
     <string name="queue">Cola de reproducción</string>
-    <string name="queue_label">Cola</string>
     <string name="rate_app">¡Puntúa la app!</string>
     <string name="rate_on_google_play_summary">Si te encanta esta aplicación, haznos saber en Google Play Store para ofrecer una mejor experiencia</string>
-    <string name="recent_activity">Actividad reciente</string>
     <string name="remove_action">Quitar</string>
     <string name="remove_cover">Remover carátula</string>
     <string name="remove_from_blacklist">Remover de la lista negra</string>
@@ -305,105 +233,57 @@
     <string name="remove_song_x_from_playlist"><![CDATA[¿Quitar canción <b>%1$s</b> de la lista?]]></string>
     <string name="remove_songs_from_playlist_title">Quitar canciones de la lista</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[¿Eliminar canciones <b>%1$d</b> de la lista?]]></string>
-    <string name="rename_action">Renombrar</string>
     <string name="rename_playlist_title">Renombrar lista</string>
-    <string name="reset_action">Reiniciar</string>
     <string name="reset_artist_image">Restablecer imagen del artista</string>
     <string name="restored_previous_purchases">Compras previas restauradas.</string>
-    <string name="retro">Retro</string>
     <string name="retro_equalizer">Retri Ecualizador</string>
-    <string name="saf_delete_failed">Error al eliminar el archivo: %s</string>
     <!-- SAF -->
-    <string name="saf_error_uri">No se puede obtener el URI de SAF</string>
-    <string name="saf_guide_slide1_description">Abrir el panel de navegación</string>
-    <string name="saf_guide_slide1_description_before_o">Habilita \'Mostrar tarjeta SD\' en el menú desplegable</string>
     <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s necesita acceso a la tarjeta SD</string>
-    <string name="saf_guide_slide2_description">Debes seleccionar el directorio raíz de tu tarjeta SD</string>
-    <string name="saf_guide_slide2_title">Selecciona tu tarjeta SD en el panel de navegación</string>
-    <string name="saf_guide_slide3_description">No abrir ninguna subcarpeta</string>
-    <string name="saf_guide_slide3_title">Toca el botón \'seleccionar\' en la parte inferior de la pantalla</string>
-    <string name="saf_pick_file">Se requiere acceso a archivos. Elige %s</string>
-    <string name="saf_pick_sdcard">Se requiere acceso a la tarjeta SD. Elija el directorio raíz de la tarjeta SD</string>
-    <string name="saf_write_failed">Error de escritura de archivo: %s</string>
     <string name="save_playlist_title">Guardar como archivo</string>
     <string name="saved_playlist_to">Guardar lista de reproducción en %s.</string>
     <string name="saving_changes">Guardando cambios</string>
-    <string name="saving_tags">Guardando etiquetas</string>
-    <string name="saving_to_file">Guardando en el archivo...</string>
     <string name="scanned_files">Escaneado %1$d de %2$d archivos.</string>
     <string name="search_hint">Busca en tu biblioteca...</string>
-    <string name="see_all">Ver todo</string>
-    <string name="select_preset">Seleccionar preestablecido</string>
     <string name="set_artist_image">Establecer imagen del artista</string>
     <string name="shuffle">Aleatorio</string>
     <string name="simple">Simple</string>
     <string name="sleep_timer_canceled">Temporizador cancelado.</string>
     <string name="sleep_timer_set">Temporizador de apagado activado para dentro de %d</string>
-    <string name="slide_unlock">Desliza para desbloquear</string>
-    <string name="solid">Sólido</string>
     <string name="song">Canción</string>
     <string name="song_duration">Duración de la canción</string>
     <string name="songs">"Canciones "</string>
     <string name="sort_order">Orden de clasificación</string>
     <string name="speech_not_supported">Lo siento, tu dispositivo no soporta las órdenes por voz.</string>
     <string name="speech_prompt">Busca en tu biblioteca</string>
-    <string name="summary_material_design_city_wallpaper">Imágenes de ciudad Material Design de www.techjuice.pk</string>
-    <string name="summary_material_design_icons">Todos los iconos que usamos provienen de www.flaticon.com o materialdesignicons.com</string>
     <string name="summary_user_info">Solo muestra tu nombre en la pantalla de inicio</string>
     <string name="support_development">Soporte del desarrollador</string>
-    <string name="support_development_summary">Si disfrutas usando Retro Music Player, considera la donación como apoyo para mi trabajo.</string>
     <!-- Message displayed when tag editing fails -->
-    <string name="tag_edit_error">Se produjo un error al editar las etiquetas.</string>
-    <string name="tag_editor_check_permission">Comprobando los permisos</string>
-    <string name="tag_editor_document_tree_message">Selecciona el directorio de almacenamiento externo</string>
-    <string name="tag_editor_document_tree_permission_failed">Parece que no tenemos permiso para editar los archivos. Verifica dos veces el directorio en el selector de archivos.</string>
-    <string name="tag_error_kitkat">Se produjo un error al editar las etiquetas. ¿El archivo está almacenado en una tarjeta SD? Si es así, Google ha hecho que la edición de etiquetas sea imposible para este archivo.</string>
-    <string name="tag_error_lollipop">Se produjo un error al editar las etiquetas. Si el archivo está almacenado en una tarjeta SD, es posible que Retro Music no tenga permiso para acceder a él.</string>
-    <string name="tag_retrieve_error">Se produjo un error al recuperar las etiquetas.</string>
-    <string name="text">Texto</string>
     <string name="thank_you">¡Gracias!</string>
     <string name="the_audio_file">El archivo de audio</string>
     <string name="this_month">Este mes</string>
     <string name="this_week">Esta semana</string>
     <string name="this_year">Este año</string>
     <string name="tiny">Pequeño</string>
-    <string name="title">Título</string>
     <string name="title_dashboard">Interfaz</string>
-    <string name="title_desc">Título descendiente</string>
     <string name="title_good_afternoon">¡Buenas tardes!</string>
     <string name="title_good_day">¡Buen día!</string>
     <string name="title_good_evening">¡Buenas tardes!</string>
     <string name="title_good_morning">¡Buenos días!</string>
     <string name="title_good_night">¡Buenas noches!</string>
-    <string name="title_home">Inicio</string>
-    <string name="title_material_design_city_wallpaper">Wallpaper de ciudad</string>
-    <string name="title_material_design_icons">Íconos</string>
-    <string name="title_notifications">Notificaciones</string>
     <string name="title_user_info">¿Cuál es tu nombre?</string>
     <string name="today">Hoy</string>
-    <string name="toggle_lyrics_size">Cambiar tamaño de letra</string>
-    <string name="tool_tip_see_all">Ver todas las canciones</string>
-    <string name="top_tracks">Más reproducidas</string>
-    <string name="top_tracks_label">Las Mejores Canciones</string>
     <string name="track_hint">"Cancion (2 para la canción 2 o 3004 para el CD 3 canción 4)"</string>
     <string name="track_list">Número de pista</string>
     <string name="translate">Traducir</string>
-    <string name="translate_summary">Ayuda a traducir Retro Music a tu idioma.</string>
     <string name="unplayable_file">No es posible reproducir est\u00e1 canci\u00f3n.</string>
     <string name="up_next">A continuación</string>
-    <string name="update">Actualización</string>
     <string name="update_image">Actualizar imagen</string>
-    <string name="updated_artist_image">Imagen del artista actualizada.</string>
     <string name="updating">Actualizando...</string>
     <string name="version">Versión</string>
-    <string name="virtualizer_strength">Fuerza del virtualizador</string>
-    <string name="volume_control">Control de volumen</string>
     <string name="web_search">Búsqueda web</string>
     <string name="what_do_you_want_to_share">¿Qué quieres compartir?</string>
     <string name="window">Ventana</string>
     <string name="x_has_been_set_as_ringtone">Establecer %1$s como nuevo tono de llamada.</string>
     <string name="x_selected">%1$d seleccionado</string>
     <string name="year">Año</string>
-    <string name="you_have_to_select_at_least_one_category">Debes seleccionar al menos una categoría</string>
 </resources>
diff --git a/app/src/main/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml
index bb776e648..d3feb76b3 100644
--- a/app/src/main/res/values-es-rUS/strings.xml
+++ b/app/src/main/res/values-es-rUS/strings.xml
@@ -8,7 +8,6 @@
     <string name="action_add_to_playlist">Agregar a lista de reproducción</string>
     <string name="action_clear_playing_queue">Borrar cola de reproducción</string>
     <string name="action_clear_playlist">Limpiar lista de reproducción</string>
-    <string name="action_cycle_repeat">Modo de repetición cíclica</string>
     <string name="action_delete">Eliminar</string>
     <string name="action_delete_from_device">Eliminar del dispositivo</string>
     <string name="action_details">Detalles</string>
@@ -18,13 +17,11 @@
     <string name="action_grant">Permitir</string>
     <string name="action_grid_size">Tamaño de cuadrícula</string>
     <string name="action_grid_size_land">Tamaño de cuadrícula (horizontal)</string>
-    <string name="action_new_playlist">Nueva lista de reproducción...</string>
     <string name="action_next">Siguiente</string>
     <string name="action_play">Reproducir</string>
     <string name="action_play_next">Reproducir siguiente</string>
     <string name="action_play_pause">Reproducir/Pausar</string>
     <string name="action_previous">Anterior</string>
-    <string name="action_re_download_artist_image">Actualizar imagen del artista</string>
     <string name="action_remove_from_favorites">Borrar de favoritos</string>
     <string name="action_remove_from_playing_queue">Borrar de la cola de reproducción</string>
     <string name="action_remove_from_playlist">Borrar de la lista de reproducción</string>
@@ -37,15 +34,10 @@
     <string name="action_set_as_start_directory">Establecer como directorio de inicio</string>
     <string name="action_settings">"Ajustes"</string>
     <string name="action_share">Compartir</string>
-    <string name="action_show_lyrics">Mostrar letras</string>
-    <string name="action_shuffle_album">Reproducción aleatoria del álbum</string>
     <string name="action_shuffle_all">Todo Aleatorio</string>
-    <string name="action_shuffle_artist">Reproducción aleatoria de artista</string>
     <string name="action_shuffle_playlist">Reproducción aleatoria de listas</string>
     <string name="action_sleep_timer">Temporizador de apagado</string>
     <string name="action_tag_editor">Editor de etiquetas</string>
-    <string name="action_toggle_favorite">Cambiar a favoritos</string>
-    <string name="action_toggle_shuffle">Cambiar a modo aleatorio</string>
     <string name="add_action">Agregar</string>
     <string name="add_photo">Agregar \nfoto</string>
     <string name="add_playlist_title">"Agregar a la lista de reproducción"</string>
@@ -53,11 +45,9 @@
     <string name="added_x_titles_to_playing_queue">Se agregaron %1$d canciones a la cola de reproducción</string>
     <string name="album">Álbum</string>
     <string name="album_artist">Artista del álbum</string>
-    <string name="album_desc">Álbum desc.</string>
     <string name="album_or_artist_empty">El título o artista está vacío</string>
     <string name="albums">Álbumes</string>
     <!-- Android Auto -->
-    <string name="albums_label">Álbumes</string>
     <string name="always">Siempre</string>
     <string name="app_share">Echa un vistazo a este reproductor de música en: https://play.google.com/store/apps/details?id=%s</string>
     <!-- App Shortcuts -->
@@ -67,22 +57,15 @@
     <string name="app_shortcut_shuffle_all_short">Aleatorio</string>
     <string name="app_shortcut_top_tracks_long">Más Reproducidas</string>
     <string name="app_shortcut_top_tracks_short">Más Reproducidas</string>
-    <string name="app_summary">Una aplicación que combina lo mejor de iOS y Material Design.</string>
     <string name="app_widget_big_name">Retro Music - Grande</string>
-    <string name="app_widget_big_name_2">Retro Music - Grande 2</string>
     <string name="app_widget_card_name">Retro Music - Tarjeta</string>
     <string name="app_widget_classic_name">Retro Music - Clásico</string>
     <string name="app_widget_small_name">Retro Music - Pequeño</string>
     <string name="artist">Artista</string>
-    <string name="artist_desc">Artista desc.</string>
     <string name="artists">Artistas</string>
-    <string name="artists_label">Artista</string>
-    <string name="at_least_one_category_must_be_enabled">Al menos una categoría debe estar activada</string>
     <string name="audio_focus_denied">Enfoque de audio denegado</string>
     <string name="audio_settings_summary">Modificar los ajustes de sonido y los controles del ecualizador</string>
-    <string name="bass_boost_strength">Refuerzo de Graves</string>
     <string name="biography">Biografía</string>
-    <string name="biography_unavailable">No se encontr\u00f3 la biograf\u00eda del artista</string>
     <string name="black_theme_name">Negro</string>
     <string name="blacklist">Lista negra</string>
     <string name="blur">Desenfoque</string>
@@ -98,7 +81,6 @@
     <string name="clear_playlist_x"><![CDATA[\u00bfLimpiar la lista de reproducci\u00f3n <b>%1$s</b>? \u00a1Esto no se puede deshacer!]]></string>
     <string name="color">Color</string>
     <string name="color_theme_name">Color</string>
-    <string name="colored_footers">Pies de página coloreados</string>
     <string name="colors">Colores</string>
     <string name="could_not_create_playlist">No se pudo crear la lista de reproducci\u00f3n</string>
     <string name="could_not_download_album_cover">"No se puede descargar una portada de \u00e1lbum coincidente"</string>
@@ -107,36 +89,23 @@
     <string name="create_action">Crear</string>
     <string name="created_playlist_x">Se creó la lista reproducción %1$s</string>
     <string name="currently_listening_to_x_by_x">Estás escuchando %1$s de %2$s</string>
-    <string name="custom">Personalizado</string>
     <string name="dark_theme_name">Oscuro</string>
-    <string name="date">Fecha</string>
     <string name="default_hint">No hay letras</string>
-    <string name="delete_action">Eliminar</string>
     <string name="delete_playlist_title">Eliminar lista de reproducción</string>
     <string name="delete_playlist_x"><![CDATA[¿Eliminar la lista de reproducción <b>%1$s</b>?]]></string>
     <string name="delete_playlists_title">Eliminar listas de reproducción</string>
-    <string name="delete_song_title">Eliminar canción</string>
     <string name="delete_song_x"><![CDATA[¿Eliminar la canción <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Eliminar canciones</string>
     <string name="delete_x_playlists"><![CDATA[¿Eliminar <b>%1$d</b> listas de reproducción?]]></string>
     <string name="delete_x_songs"><![CDATA[¿Eliminar <b>%1$d</b> canciones?]]></string>
     <string name="deleted_x_songs">Se eliminaron %1$d canciones</string>
-    <string name="deleting_songs">Eliminando canciones</string>
     <string name="do_you_want_to_clear_the_blacklist">¿Deseas limpiar la lista negra?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[¿Deseas eliminar <b>%1$s</b> de la lista negra?]]></string>
     <string name="donate">Donar</string>
     <string name="donate_summary">Si consideras que merezco ser pagado por mi trabajo, puedes dejarme un par de dólares aquí</string>
     <string name="donation_header">Cómprame una</string>
     <string name="download_from_last_fm">Descargar de Last.fm</string>
-    <string name="duration">Duración</string>
-    <string name="edit">Editar</string>
-    <string name="edit_categories">Editar categorías</string>
-    <string name="edit_tags">Editar etiquetas</string>
     <string name="empty">Vacío</string>
     <string name="equalizer">Ecualizador</string>
-    <string name="error_loading_lyrics_from_network">Error al cargar desde la red</string>
-    <string name="experimental">Experimental</string>
-    <string name="failed_to_save_playlist">Error al guardar la lista de reproducción (%s)</string>
     <string name="favorites">Favoritos</string>
     <string name="flat">Plano</string>
     <string name="folders">Carpetas</string>
@@ -146,7 +115,6 @@
     <string name="general_settings_title">Apariencia</string>
     <string name="genre">Género</string>
     <string name="genres">Géneros</string>
-    <string name="gradient">Gradiente</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -156,36 +124,24 @@
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
     <string name="history">Historial</string>
-    <string name="history_label">Historial</string>
-    <string name="holiday">Feriado</string>
     <string name="home">Inicio</string>
     <string name="inserted_x_songs_into_playlist_x">Añadiste %1$d canciones a la lista de reproducción %2$s</string>
-    <string name="inspired_designs_by">Diseños inspirados por</string>
-    <string name="join_community">Ingresa a la comunidad de Google+</string>
-    <string name="join_community_summary">Si necesitas ayuda o tienes preguntas, la comunidad de Retro Music en Google+ es un buen lugar a donde ir</string>
     <string name="label_bit_rate">Velocidad de bits</string>
-    <string name="label_details">Detalles</string>
     <string name="label_file_format">Formato</string>
     <string name="label_file_name">Nombre del archivo</string>
     <string name="label_file_path">Ruta del archivo</string>
     <string name="label_file_size">Tamaño</string>
     <string name="label_sampling_rate">Tasa de muestreo</string>
     <string name="label_track_length">Duración</string>
-    <string name="language_contributors">Traductores</string>
     <string name="last_added">Agregados recientemente</string>
     <string name="lets_play_something">Vamos a reproducir algo</string>
     <string name="library">Biblioteca</string>
-    <string name="library_categories">Categorías de biblioteca</string>
     <string name="licenses">Licencias</string>
     <string name="light_theme_name">Blanco</string>
     <string name="listing_files">Listado de archivos</string>
-    <string name="loading">Cargando...</string>
     <string name="loading_products">Cargando productos...</string>
     <string name="lyrics">Letras</string>
-    <string name="media_route_menu_title">Dispositivo de emisión</string>
-    <string name="more">Más</string>
     <string name="my_name">Mi nombre</string>
-    <string name="my_playlists">Mi lista de reproducción</string>
     <string name="my_top_tracks">Mis canciones más reproducidas</string>
     <string name="never">Nunca</string>
     <string name="new_playlist_title">Nueva lista de reproducción</string>
@@ -194,7 +150,6 @@
     <string name="no_artists">No hay artistas</string>
     <string name="no_audio_ID">"Reproduce una canción primero e intenta de nuevo"</string>
     <string name="no_equalizer">No se encontró ningún ecualizador</string>
-    <string name="no_files">Sin archivos</string>
     <string name="no_genres">Sin géneros</string>
     <string name="no_lyrics_found">No se encontraron letras</string>
     <string name="no_playlists">No hay listas de reproducción</string>
@@ -219,52 +174,36 @@
     <string name="personalize_settings_summary">Personalizar la ventana de reproducción actual y la interfaz de usuario</string>
     <string name="pick_from_local_storage">Seleccionar del almacenamiento interno</string>
     <string name="plain">Sencillo</string>
-    <string name="play">Reproducir</string>
-    <string name="play_all">Reproducir todo</string>
     <string name="playing_notification_description">La notificación de reproducción proporciona acciones para reproducir/pausar etc</string>
     <string name="playing_notification_name">Notificación de reproducción</string>
     <string name="playlist_empty_text">Lista de reproducción vacía</string>
     <string name="playlist_is_empty">La lista de reproducción está vacía</string>
     <string name="playlist_name_empty">Nombre de la lista de reproducción</string>
     <string name="playlists">Listas</string>
-    <string name="playlists_label">Listas</string>
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_general">General</string>
     <string name="pref_header_images">Imágenes</string>
     <string name="pref_header_lockscreen">Pantalla de bloqueo</string>
-    <string name="pref_header_now_playing_screen">Reproduciendo</string>
     <string name="pref_header_playlists">Listas de reproducción</string>
     <string name="pref_only_lollipop">"Sólo disponible en Lollipop"</string>
-    <string name="pref_only_nougat_mr1">"Sólo disponible en Nougat 7.1"</string>
-    <string name="pref_summary_about">Personas que han ayudado a este proyecto</string>
     <string name="pref_summary_album_art_on_lockscreen">Utiliza la portada del álbum que se reproduce como fondo de pantalla de bloqueo</string>
     <string name="pref_summary_audio_ducking">Notificaciones, navegación, etc</string>
     <string name="pref_summary_blurred_album_art">Desenfoca la portada del álbum en la pantalla de bloqueo. Puede causar problemas con aplicaciones y widgets de terceros</string>
     <string name="pref_summary_carousel_effect">Efecto carrusel en la portada del álbum en pantalla</string>
-    <string name="pref_summary_circular_album_effect">Muestra la portada del álbum circular en la pantalla de reproducción. Solo disponible en algunos temas</string>
     <string name="pref_summary_classic_notification">Utiliza el diseño de notificación clásico</string>
     <string name="pref_summary_colored_app">El color del fondo y del botón de control cambia de acuerdo con la portada del álbum en la pantalla de reproducción</string>
     <string name="pref_summary_colored_app_shortcuts">Colorea los accesos directos de la aplicación en el color de énfasis. Cada vez que cambies de color, por favor activa esta opción</string>
     <string name="pref_summary_colored_navigation_bar">Colorea la barra de navegación con el color principal</string>
     <string name="pref_summary_colored_notification">"Colorea la notificaci\u00f3n con el color vibrante de la portada del \u00e1lbum"</string>
-    <string name="pref_summary_day_dream">Muestra los detalles de la canción en Dream cuando la música está sonando</string>
     <string name="pref_summary_dominant_color">El color dominante se elegirá de la imagen del álbum o artista</string>
-    <string name="pref_summary_exclude_songs">Excluir canciones que duren menos de 30 segundos</string>
     <string name="pref_summary_gapless_playback">"Puede causar problemas de reproducción en algunos dispositivos"</string>
     <string name="pref_summary_ignore_media_store_artwork">Puede aumentar la calidad de la portada del álbum, pero a veces puede tardar en cargar. Solo actívalo si tienes problemas con portadas de baja resolución</string>
-    <string name="pref_summary_language_en">Fuerza el idioma de la aplicación a inglés (para probar la opción de múltiples idiomas)</string>
-    <string name="pref_summary_library_categories">Configura la visibilidad y el orden de las categorías de la biblioteca</string>
     <string name="pref_summary_lock_screen">Habilitar controles en la pantalla de bloqueo para Retro music</string>
-    <string name="pref_summary_lock_screen_app">Mostrar controles completos en la pantalla de bloqueo</string>
     <string name="pref_summary_open_source_licences">Detalles de la licencia para software de código abierto</string>
     <string name="pref_summary_round_corners">Redondea esquinas en la ventana principal, portada de álbum, etc</string>
     <string name="pref_summary_tab_titles">Mostrar/Ocultar títulos de pestañas inferiores</string>
-    <string name="pref_summary_toggle_bottom_bar_titles">Desactiva títulos de la barra de navegación inferior</string>
     <string name="pref_summary_toggle_full_screen">Habilitar esto para el modo inmersivo</string>
-    <string name="pref_summary_toggle_genre">Ocultar la sección géneros</string>
     <string name="pref_summary_toggle_headset">Empezar a reproducir cuando se conecten los auriculares</string>
-    <string name="pref_summary_toggle_navigation_bar">Ocultar solo la barra de navegación</string>
-    <string name="pref_summary_toggle_status_bar">Ocultar solo la barra de estado</string>
     <string name="pref_summary_toggle_volume">Si tienes espacio en la pantalla de reproducción, activa los controles de volumen</string>
     <string name="pref_title_album_art_on_lockscreen">Mostrar portada del álbum</string>
     <string name="pref_title_app_shortcuts">Accesos directos coloreados</string>
@@ -274,30 +213,18 @@
     <string name="pref_title_classic_notification">Diseño clásico de notificación</string>
     <string name="pref_title_colored_app">Color adaptativo</string>
     <string name="pref_title_colored_notification">Notificación coloreada</string>
-    <string name="pref_title_day_dream">Ensueño</string>
-    <string name="pref_title_exclude_songs">Excluir canciones</string>
-    <string name="pref_title_external_storage_access">Da acceso al almacenamiento externo</string>
     <string name="pref_title_gapless_playback">Reproducción sin pausas</string>
     <string name="pref_title_general_theme">Tema general</string>
-    <string name="pref_title_gradient_color">Elegir color</string>
     <string name="pref_title_ignore_media_store_artwork">Ignorar las portadas de la biblioteca de medios</string>
     <string name="pref_title_last_added_interval">Última lista de reproducción agregada</string>
     <string name="pref_title_lock_screen">Controles a pantalla completa</string>
-    <string name="pref_title_lock_screen_app">Bloqueo de pantalla de Retro</string>
-    <string name="pref_title_lyrics_options">Opciones de letra</string>
     <string name="pref_title_navigation_bar">Barra de navegación coloreada</string>
     <string name="pref_title_now_playing_screen_appearance">Apariencia</string>
     <string name="pref_title_open_source_licences">Licencias de código abierto</string>
     <string name="pref_title_round_corners">Esquinas redondeadas</string>
-    <string name="pref_title_toggle_bottom_bar_titles">Inhabilitar títulos</string>
     <string name="pref_title_toggle_carousel_effect">Efecto Carrusel</string>
-    <string name="pref_title_toggle_circular_album_effect">Portada de álbum circular</string>
     <string name="pref_title_toggle_dominant_color">Color dominante</string>
     <string name="pref_title_toggle_full_screen">App a pantalla completa</string>
-    <string name="pref_title_toggle_genre">Ocultar géneros</string>
-    <string name="pref_title_toggle_language_en">Idioma inglés</string>
-    <string name="pref_title_toggle_navigation_bar">Barra de navegación</string>
-    <string name="pref_title_toggle_status_bar">Barra de estado</string>
     <string name="pref_title_toggle_tab_titles">Títulos de pestañas</string>
     <string name="pref_title_toggle_toggle_headset">Reproducción automática</string>
     <string name="pref_title_toggle_volume">Controles de volumen</string>
@@ -306,10 +233,8 @@
     <string name="primary_color_desc">Tema de color principal, blanco por defecto</string>
     <string name="purchase">Comprar</string>
     <string name="queue">Cola</string>
-    <string name="queue_label">Cola</string>
     <string name="rate_app">Calificar app</string>
     <string name="rate_on_google_play_summary">Deja una calificación positiva en Google Play si te gusta Retro Music</string>
-    <string name="recent_activity">Actividad reciente</string>
     <string name="recent_albums">Álbumes recientes</string>
     <string name="recent_artists">Artistas recientes</string>
     <string name="remove_action">Eliminar</string>
@@ -319,112 +244,62 @@
     <string name="remove_song_x_from_playlist"><![CDATA[¿Eliminar la canción </b>%1$s<b> de la lista de reproducción?]]></string>
     <string name="remove_songs_from_playlist_title">Eliminar canciones de la lista de reproducción</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[¿Eliminar </b>%1$d<b> canciones de la lista de reproducción?]]></string>
-    <string name="rename_action">Renombrar</string>
     <string name="rename_playlist_title">Renombrar lista de reproducción</string>
-    <string name="reset_action">Restablecer</string>
     <string name="reset_artist_image">Restablecer imagen de artista</string>
     <string name="restore">Restaurar</string>
     <string name="restored_previous_purchase_please_restart">Compras previas restauradas. Por favor, reinicia la aplicación para hacer uso de todas las funciones.</string>
     <string name="restored_previous_purchases">Compras anteriores restauradas</string>
     <string name="restoring_purchase">Restaurando compra...</string>
-    <string name="retro">Retro</string>
     <string name="retro_equalizer">Ecualizador Retro</string>
-    <string name="saf_delete_failed">Error al eliminar el archivo: %s</string>
     <!-- SAF -->
-    <string name="saf_error_uri">No se puede obtener SAF URI</string>
-    <string name="saf_guide_slide1_description">Abrir panel de navegación</string>
-    <string name="saf_guide_slide1_description_before_o">Habilita \'Mostrar tarjeta SD\' en el menú desplegable</string>
     <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s necesita acceso a la tarjeta SD</string>
-    <string name="saf_guide_slide2_description">Debes seleccionar el directorio raíz de tu tarjeta SD</string>
-    <string name="saf_guide_slide2_title">Selecciona tu tarjeta SD en el panel de navegación</string>
-    <string name="saf_guide_slide3_description">No abrir ninguna subcarpeta</string>
-    <string name="saf_guide_slide3_title">Toca el botón \'seleccionar\' en la parte inferior de la pantalla</string>
-    <string name="saf_pick_file">Se requiere acceso a archivos. Elige %s</string>
-    <string name="saf_pick_sdcard">Se requiere acceso a la tarjeta SD. Elige el directorio raíz de la tarjeta SD</string>
-    <string name="saf_write_failed">Error de escritura del archivo: %s</string>
     <string name="save_playlist_title">Guardar como archivo</string>
     <string name="saved_playlist_to">Lista de reproducción guardada en %s</string>
     <string name="saving_changes">Guardando cambios</string>
-    <string name="saving_tags">Guardando etiquetas</string>
-    <string name="saving_to_file">Guardando en archivo...</string>
     <string name="scanned_files">%1$d de %2$d archivos escaneados</string>
     <string name="search_hint">Buscar en la biblioteca...</string>
-    <string name="see_all">Ver todo</string>
-    <string name="select_preset">Seleccionar predeterminado</string>
     <string name="set_artist_image">Establecer imagen de artista</string>
     <string name="shuffle">Aleatorio</string>
     <string name="simple">Simple</string>
     <string name="sleep_timer_canceled">Temporizador cancelado</string>
     <string name="sleep_timer_set">La música se detendrá dentro de %d minuto(s) a partir de ahora</string>
-    <string name="slide_unlock">Desliza para desbloquear</string>
-    <string name="solid">Sólido</string>
     <string name="song">Canción</string>
     <string name="song_duration">Duración de la canción</string>
     <string name="songs">Canciones</string>
     <string name="sort_order">Orden de clasificación</string>
     <string name="speech_not_supported">¡Lo siento! Tu dispositivo no admite la entrada de voz</string>
     <string name="speech_prompt">Buscar en tu biblioteca</string>
-    <string name="suggestions">Recomendaciones</string>
-    <string name="summary_material_design_city_wallpaper">Fondos de Pantalla de Ciudades Material Design tomados del website www.techjuice.pk</string>
-    <string name="summary_material_design_icons">Todos los iconos que utilizamos están en los siguientes sitios web: www.flaticon.com o materialdesignicons.com</string>
     <string name="summary_user_info">Muestra tu nombre en la pantalla de inicio</string>
     <string name="support_development">Apoyar el desarrollo</string>
-    <string name="support_development_summary">Si te gusta usar Retro Music Player, considera una donación como apoyo a mi trabajo</string>
     <!-- Message displayed when tag editing fails -->
-    <string name="tag_edit_error">Se produjo un error al editar las etiquetas</string>
-    <string name="tag_editor_check_permission">Comprobando los permisos</string>
-    <string name="tag_editor_document_tree_message">Selecciona el directorio de almacenamiento externo</string>
-    <string name="tag_editor_document_tree_permission_failed">Parece que no tenemos permiso para editar los archivos. Comprueba el directorio en el selector de archivos</string>
-    <string name="tag_error_kitkat">Se produjo un error al editar las etiquetas. ¿El archivo está almacenado en una tarjeta SD? Si es así, Google ha hecho que la edición de etiquetas sea imposible para este archivo</string>
-    <string name="tag_error_lollipop">Se produjo un error al editar las etiquetas. Si el archivo está almacenado en una tarjeta SD, es posible que Retro Music no tenga permiso para acceder a él</string>
-    <string name="tag_retrieve_error">Se produjo un error al recuperar las etiquetas</string>
-    <string name="text">Texto</string>
     <string name="thank_you">¡Gracias!</string>
     <string name="the_audio_file">El archivo de audio</string>
     <string name="this_month">Este mes</string>
     <string name="this_week">Esta semana</string>
     <string name="this_year">Este año</string>
     <string name="tiny">Pequeño</string>
-    <string name="title">Título</string>
     <string name="title_dashboard">Interfaz</string>
-    <string name="title_desc">Título desc.</string>
     <string name="title_good_afternoon">Buenas tardes</string>
     <string name="title_good_day">Buen día</string>
     <string name="title_good_evening">Buenas tardes</string>
     <string name="title_good_morning">Buenos días</string>
     <string name="title_good_night">Buenas noches</string>
-    <string name="title_home">Inicio</string>
-    <string name="title_material_design_city_wallpaper">Wallpaper de ciudades</string>
-    <string name="title_material_design_icons">Iconos</string>
-    <string name="title_notifications">Notificaciones</string>
     <string name="title_user_info">¿Cuál es tu nombre?</string>
     <string name="today">Hoy</string>
-    <string name="toggle_lyrics_size">Cambiar tamaño de las letras</string>
-    <string name="tool_tip_see_all">Ver todas las canciones</string>
     <string name="top_albums">Álbumes más reproducidos</string>
     <string name="top_artists">Artistas más reproducidos</string>
-    <string name="top_tracks">Más reproducidas</string>
-    <string name="top_tracks_label">Más Reproducidas</string>
     <string name="track_hint">"Pista (2 para pista 2 o 3004 para CD3 pista 4)"</string>
     <string name="track_list">Número de pista</string>
     <string name="translate">Traducir</string>
-    <string name="translate_summary">Ayuda a traducir Retro Music a tu idioma</string>
     <string name="unplayable_file">No se pudo reproducir esta canci\u00f3n</string>
     <string name="up_next">A continuación</string>
-    <string name="update">Actualizar</string>
     <string name="update_image">Actualizar imagen</string>
-    <string name="updated_artist_image">Imagen del artista actualizada</string>
     <string name="updating">Actualizando...</string>
-    <string name="user_profile_summary">Cambiar la imagen de perfil y la imagen de portada</string>
     <string name="version">Versión</string>
-    <string name="virtualizer_strength">Nivel de virtualización</string>
-    <string name="volume_control">Control de volumen</string>
     <string name="web_search">Buscar en Internet</string>
     <string name="what_do_you_want_to_share">¿Qué es lo que deseas compartir?</string>
     <string name="window">Ventana</string>
     <string name="x_has_been_set_as_ringtone">Establecer %1$s como tono de llamada</string>
     <string name="x_selected">%1$d seleccionado(s)</string>
     <string name="year">Año</string>
-    <string name="you_have_to_select_at_least_one_category">Debes seleccionar al menos una categoría</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 533e3bc68..2fd08be3d 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -8,7 +8,6 @@
     <string name="action_add_to_playlist">Añadir a la lista...</string>
     <string name="action_clear_playing_queue">Limpiar cola de reproducción</string>
     <string name="action_clear_playlist">Limpiar lista de reproducción</string>
-    <string name="action_cycle_repeat">Reproducir infinitamente</string>
     <string name="action_delete">Eliminar</string>
     <string name="action_delete_from_device">Eliminar del dispositivo</string>
     <string name="action_details">Detalles</string>
@@ -18,13 +17,11 @@
     <string name="action_grant">Permitir</string>
     <string name="action_grid_size">Tamaño de cuadrícula</string>
     <string name="action_grid_size_land">Tamaño de cuadrícula (Horizontal)</string>
-    <string name="action_new_playlist">Nueva lista de reproducción...</string>
     <string name="action_next">Siguiente</string>
     <string name="action_play">Reproducir</string>
     <string name="action_play_next">Reproducir siguiente</string>
     <string name="action_play_pause">Reproducir/Pausar</string>
     <string name="action_previous">Anterior</string>
-    <string name="action_re_download_artist_image">Cambiar imagen del artista</string>
     <string name="action_remove_from_favorites">Eliminar de favoritos</string>
     <string name="action_remove_from_playing_queue">Borrar de la cola de reproducción</string>
     <string name="action_remove_from_playlist">Borrar de la lista de reproducción</string>
@@ -37,15 +34,10 @@
     <string name="action_set_as_start_directory">Establecer como directorio de inicio</string>
     <string name="action_settings">"Ajustes"</string>
     <string name="action_share">Compartir</string>
-    <string name="action_show_lyrics">Mostrar letras</string>
-    <string name="action_shuffle_album">Reproducción aleatoria del álbum</string>
     <string name="action_shuffle_all">Todo Aleatorio</string>
-    <string name="action_shuffle_artist">Reproducción aleatoria de artista</string>
     <string name="action_shuffle_playlist">Reproducción aleatoria de la lista</string>
     <string name="action_sleep_timer">Temporizador de apagado</string>
     <string name="action_tag_editor">Editor de etiquetas</string>
-    <string name="action_toggle_favorite">Cambiar a favoritos</string>
-    <string name="action_toggle_shuffle">Cambiar a modo aleatorio</string>
     <string name="add_action">Agregar</string>
     <string name="add_photo">Agregar \nfoto</string>
     <string name="add_playlist_title">"Agregar a la lista de reproducción"</string>
@@ -53,11 +45,9 @@
     <string name="added_x_titles_to_playing_queue">Se agregaron %1$d canciones a la cola de reproducción</string>
     <string name="album">Álbum</string>
     <string name="album_artist">Artista del álbum</string>
-    <string name="album_desc">Album desconocido</string>
     <string name="album_or_artist_empty">El título o el artista está vacío</string>
     <string name="albums">"Álbumes "</string>
     <!-- Android Auto -->
-    <string name="albums_label">Álbumes</string>
     <string name="always">Siempre</string>
     <string name="app_share">¡Hey! Mira este genial reproductor de música en: https://play.google.com/store/apps/details?id=%s</string>
     <!-- App Shortcuts -->
@@ -67,22 +57,15 @@
     <string name="app_shortcut_shuffle_all_short">Aleatorio</string>
     <string name="app_shortcut_top_tracks_long">Más reproducidas</string>
     <string name="app_shortcut_top_tracks_short">Más Reproducidas</string>
-    <string name="app_summary">Una aplicación que combina lo mejor del diseño de iOS y Material design.</string>
     <string name="app_widget_big_name">Retro Music - Grande</string>
-    <string name="app_widget_big_name_2">Retro Music - Grande2</string>
     <string name="app_widget_card_name">Retro Music - Tarjeta</string>
     <string name="app_widget_classic_name">Retro Music - Clasico</string>
     <string name="app_widget_small_name">Retro Music - Pequeño</string>
     <string name="artist">Artista</string>
-    <string name="artist_desc">Artista desconocido</string>
     <string name="artists">Artistas</string>
-    <string name="artists_label">Artistas</string>
-    <string name="at_least_one_category_must_be_enabled">Al menos una categoría debe estar activada</string>
     <string name="audio_focus_denied">Canción sin etiquetas</string>
     <string name="audio_settings_summary">Modificar los ajustes de sonido y controles del ecualizador</string>
-    <string name="bass_boost_strength">"Potenciar bajos "</string>
     <string name="biography">Biografía</string>
-    <string name="biography_unavailable">No se encontr\u00f3 la biograf\u00eda del artista</string>
     <string name="black_theme_name">Negro</string>
     <string name="blacklist">Lista negra</string>
     <string name="blur">Desenfoque</string>
@@ -98,7 +81,6 @@
     <string name="clear_playlist_x"><![CDATA[\u00bfLimpiar la lista de reproducci\u00f3n <b>%1$s</b>? \u00a1Esto no se puede deshacer!]]></string>
     <string name="color">Color</string>
     <string name="color_theme_name">Color</string>
-    <string name="colored_footers">Pie de página coloreados</string>
     <string name="colors">Colores</string>
     <string name="could_not_create_playlist">No se pudo crear la lista de reproducci\u00f3n</string>
     <string name="could_not_download_album_cover">"No se pudo descargar una portada de \u00e1lbum que coincida"</string>
@@ -107,36 +89,23 @@
     <string name="create_action">Crear</string>
     <string name="created_playlist_x">Se creó la lista reproducción %1$s</string>
     <string name="currently_listening_to_x_by_x">Estás escuchando %1$s de %2$s</string>
-    <string name="custom">Personalizado</string>
     <string name="dark_theme_name">Oscuro</string>
-    <string name="date">Fecha</string>
     <string name="default_hint">No hay letras</string>
-    <string name="delete_action">Eliminar</string>
     <string name="delete_playlist_title">Eliminar lista de reproducción</string>
     <string name="delete_playlist_x"><![CDATA[¿Eliminar la lista de reproducción <b>%1$s</b>?]]></string>
     <string name="delete_playlists_title">Eliminar lista de reproducción</string>
-    <string name="delete_song_title">Eliminar canción</string>
     <string name="delete_song_x"><![CDATA[¿Eliminar la canción <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Eliminar canciones</string>
     <string name="delete_x_playlists"><![CDATA[¿Eliminar <b>%1$d</b> listas de reproducción?]]></string>
     <string name="delete_x_songs"><![CDATA[¿Eliminar <b>%1$d</b> canciones?]]></string>
     <string name="deleted_x_songs">Se eliminaron %1$d canciones</string>
-    <string name="deleting_songs">Eliminando canciones</string>
     <string name="do_you_want_to_clear_the_blacklist">¿Quieres limpiar la lista negra?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[¿Deseas eliminar <b>%1$s</b> de la lista negra?]]></string>
     <string name="donate">Donar</string>
     <string name="donate_summary">Si consideras que merezco ser pagado por mi trabajo, puedes dejarme un par de dólares aquí</string>
     <string name="donation_header">Cómprame un</string>
     <string name="download_from_last_fm">Descargar desde Last.fm</string>
-    <string name="duration">Duración</string>
-    <string name="edit">Editar</string>
-    <string name="edit_categories">Editar categorías</string>
-    <string name="edit_tags">Editar etiquetas</string>
     <string name="empty">Vacío</string>
     <string name="equalizer">Ecualizador</string>
-    <string name="error_loading_lyrics_from_network">Error al cargar desde la red</string>
-    <string name="experimental">Experimental</string>
-    <string name="failed_to_save_playlist">Error al guardar la lista de reproducción (%s)</string>
     <string name="favorites">Favoritos</string>
     <string name="flat">Plano</string>
     <string name="folders">Carpetas</string>
@@ -146,7 +115,6 @@
     <string name="general_settings_title">Apariencia</string>
     <string name="genre">Género</string>
     <string name="genres">Géneros</string>
-    <string name="gradient">Gradiente</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -156,36 +124,24 @@
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
     <string name="history">Historial</string>
-    <string name="history_label">Historial</string>
-    <string name="holiday">Feriado</string>
     <string name="home">Inicio</string>
     <string name="inserted_x_songs_into_playlist_x">Añadiste %1$d canciones a la lista de reproducción %2$s</string>
-    <string name="inspired_designs_by">Diseños inspirados por</string>
-    <string name="join_community">Ingresa a la Comunidad de Google+</string>
-    <string name="join_community_summary">Si necesitas ayuda o tienes preguntas, la comunidad de Retro Music en Google+ es un buen lugar a donde ir</string>
     <string name="label_bit_rate">Tasa de bits</string>
-    <string name="label_details">Detalles</string>
     <string name="label_file_format">Formato</string>
     <string name="label_file_name">Nombre del archivo</string>
     <string name="label_file_path">Ruta del archivo</string>
     <string name="label_file_size">Tamaño</string>
     <string name="label_sampling_rate">Tasa de muestreo</string>
     <string name="label_track_length">Longitud</string>
-    <string name="language_contributors">Traductores</string>
     <string name="last_added">Agregados recientemente</string>
     <string name="lets_play_something">Vamos a reproducir algo</string>
     <string name="library">Biblioteca</string>
-    <string name="library_categories">Categorías de biblioteca</string>
     <string name="licenses">Licencias</string>
     <string name="light_theme_name">Blanco</string>
     <string name="listing_files">Listado de archivos</string>
-    <string name="loading">Cargando...</string>
     <string name="loading_products">Cargando productos...</string>
     <string name="lyrics">Letras</string>
-    <string name="media_route_menu_title">Proyectar dispositivo</string>
-    <string name="more">Más</string>
     <string name="my_name">Mi nombre</string>
-    <string name="my_playlists">Mi lista de reproducción</string>
     <string name="my_top_tracks">Mis canciones más reproducidas</string>
     <string name="never">Nunca</string>
     <string name="new_playlist_title">Nueva lista de reproducción</string>
@@ -194,7 +150,6 @@
     <string name="no_artists">No hay artistas</string>
     <string name="no_audio_ID">"Reproduce una canción primero e intenta de nuevo"</string>
     <string name="no_equalizer">No se encontro ningún ecualizador</string>
-    <string name="no_files">Sin archivos</string>
     <string name="no_genres">No hay géneros</string>
     <string name="no_lyrics_found">No se encontraron letras</string>
     <string name="no_playlists">No hay listas de reproducción</string>
@@ -219,52 +174,36 @@
     <string name="personalize_settings_summary">Personalizar la pantalla de reproducción actual y la interfaz de usuario</string>
     <string name="pick_from_local_storage">Seleccionar desde almacenamiento local</string>
     <string name="plain">Plano</string>
-    <string name="play">Reproducir</string>
-    <string name="play_all">Reproducir todo</string>
     <string name="playing_notification_description">La notificación de reproducción proporciona acciones para reproducir/pausar, etc</string>
     <string name="playing_notification_name">Notificación de reproducción</string>
     <string name="playlist_empty_text">Lista de reproducción vacía</string>
     <string name="playlist_is_empty">La lista de reproducción está vacía</string>
     <string name="playlist_name_empty">Nombre de lista de reproducción</string>
     <string name="playlists">Lista de reproducción</string>
-    <string name="playlists_label">Listas</string>
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_general">General</string>
     <string name="pref_header_images">Imágenes</string>
     <string name="pref_header_lockscreen">Pantalla de bloqueo</string>
-    <string name="pref_header_now_playing_screen">Reproduciendo</string>
     <string name="pref_header_playlists">Listas de reproducción</string>
     <string name="pref_only_lollipop">"Solo disponible en Lollipop"</string>
-    <string name="pref_only_nougat_mr1">"Solo disponible en Nougat 7.1"</string>
-    <string name="pref_summary_about">Personas que han ayudado a este proyecto</string>
     <string name="pref_summary_album_art_on_lockscreen">Utiliza la portada del álbum que se reproduce como fondo de pantalla de bloqueo</string>
     <string name="pref_summary_audio_ducking">Notificaciones, navegación, etc</string>
     <string name="pref_summary_blurred_album_art">Desenfoca la portada del álbum en la pantalla de bloqueo. Puede causar problemas con aplicaciones y widgets de terceros</string>
     <string name="pref_summary_carousel_effect">Efecto carrusel en la portada del álbum en pantalla</string>
-    <string name="pref_summary_circular_album_effect">Muestra la portada del álbum circular. Solo funciona para ciertos temas</string>
     <string name="pref_summary_classic_notification">Utiliza el diseño de notificación clásico</string>
     <string name="pref_summary_colored_app">El color del fondo y del botón de control cambia de acuerdo con la portada del álbum en la pantalla de reproducción</string>
     <string name="pref_summary_colored_app_shortcuts">Colorea los accesos directos de la aplicación en el color de énfasis. Cada vez que cambies de color, por favor activa esta opción</string>
     <string name="pref_summary_colored_navigation_bar">Colorea la barra de navegación con el color principal</string>
     <string name="pref_summary_colored_notification">"Colorea la notificaci\u00f3n con el color vibrante de la portada del \u00e1lbum"</string>
-    <string name="pref_summary_day_dream">Muestra los detalles de la canción en Dream cuando la música está sonando</string>
     <string name="pref_summary_dominant_color">El color dominante se elegirá de la imagen del álbum o artista</string>
-    <string name="pref_summary_exclude_songs">Excluir canciones que duren menos de 30 segundos</string>
     <string name="pref_summary_gapless_playback">"Puede causar problemas de reproducción en algunos dispositivos"</string>
     <string name="pref_summary_ignore_media_store_artwork">Puede aumentar la calidad de la portada del álbum, pero a veces puede tardar en cargar. Solo actívalo si tienes problemas con portadas de baja resolución</string>
-    <string name="pref_summary_language_en">Fuerza el idioma de la aplicación a inglés (para probar la opción de múltiples idiomas)</string>
-    <string name="pref_summary_library_categories">Configura la visibilidad y el orden de las categorías de la biblioteca</string>
     <string name="pref_summary_lock_screen">Habilitar controles en la pantalla de bloqueo para Retro music</string>
-    <string name="pref_summary_lock_screen_app">Mostrar controles completos en la pantalla de bloqueo</string>
     <string name="pref_summary_open_source_licences">Detalles de la licencia para software de código abierto</string>
     <string name="pref_summary_round_corners">Redondea esquinas en la ventana principal, portada de álbum, etc</string>
     <string name="pref_summary_tab_titles">Mostrar/ocultar títulos de las pestañas inferiores</string>
-    <string name="pref_summary_toggle_bottom_bar_titles">Desactiva títulos de la barra de navegación inferior</string>
     <string name="pref_summary_toggle_full_screen">Modo inmersivo</string>
-    <string name="pref_summary_toggle_genre">Ocultar la sección géneros</string>
     <string name="pref_summary_toggle_headset">Empezar a reproducir cuando se conecten los auriculares</string>
-    <string name="pref_summary_toggle_navigation_bar">Ocultar solo la barra de navegación</string>
-    <string name="pref_summary_toggle_status_bar">Ocultar solo la barra de estado</string>
     <string name="pref_summary_toggle_volume">Si tienes espacio en la pantalla de reproducción, activa los controles de volumen</string>
     <string name="pref_title_album_art_on_lockscreen">Mostrar portada del álbum</string>
     <string name="pref_title_app_shortcuts">Accesos directos coloreados</string>
@@ -274,30 +213,18 @@
     <string name="pref_title_classic_notification">Diseño clásico de notificación</string>
     <string name="pref_title_colored_app">Color adaptativo</string>
     <string name="pref_title_colored_notification">Notificación coloreada</string>
-    <string name="pref_title_day_dream">Ensueño</string>
-    <string name="pref_title_exclude_songs">Excluir canciones</string>
-    <string name="pref_title_external_storage_access">Conceder acceso al almacenamiento interno</string>
     <string name="pref_title_gapless_playback">Reproducción continua</string>
     <string name="pref_title_general_theme">Tema general</string>
-    <string name="pref_title_gradient_color">Elegir color</string>
     <string name="pref_title_ignore_media_store_artwork">Ignorar las portadas de la biblioteca de medios</string>
     <string name="pref_title_last_added_interval">Última lista de reproducción agregada</string>
     <string name="pref_title_lock_screen">Controles a pantalla completa</string>
-    <string name="pref_title_lock_screen_app">Bloqueo de pantalla de Retro</string>
-    <string name="pref_title_lyrics_options">Opciones de letra</string>
     <string name="pref_title_navigation_bar">Barra de navegación coloreada</string>
     <string name="pref_title_now_playing_screen_appearance">Apariencia</string>
     <string name="pref_title_open_source_licences">Licencias de código abierto</string>
     <string name="pref_title_round_corners">Esquinas redondeadas</string>
-    <string name="pref_title_toggle_bottom_bar_titles">Desactivar títulos</string>
     <string name="pref_title_toggle_carousel_effect">Efecto Carrusel</string>
-    <string name="pref_title_toggle_circular_album_effect">Portada de álbum circular</string>
     <string name="pref_title_toggle_dominant_color">Color dominante</string>
     <string name="pref_title_toggle_full_screen">App a pantalla completa</string>
-    <string name="pref_title_toggle_genre">Ocultar géneros</string>
-    <string name="pref_title_toggle_language_en">Idioma inglés</string>
-    <string name="pref_title_toggle_navigation_bar">Barra de navegación</string>
-    <string name="pref_title_toggle_status_bar">Barra de estado</string>
     <string name="pref_title_toggle_tab_titles">Títulos de las pestañas</string>
     <string name="pref_title_toggle_toggle_headset">Reproducción automática</string>
     <string name="pref_title_toggle_volume">Controles de volumen</string>
@@ -306,10 +233,8 @@
     <string name="primary_color_desc">Tema de color principal, blanco por defecto</string>
     <string name="purchase">Comprar</string>
     <string name="queue">Cola</string>
-    <string name="queue_label">Cola</string>
     <string name="rate_app">Calificar app</string>
     <string name="rate_on_google_play_summary">Deja una calificación positiva en Google Play si te gusta Retro Music</string>
-    <string name="recent_activity">Actividad reciente</string>
     <string name="recent_albums">Álbumes recientes</string>
     <string name="recent_artists">Artistas recientes</string>
     <string name="remove_action">Eliminar</string>
@@ -319,112 +244,62 @@
     <string name="remove_song_x_from_playlist"><![CDATA[¿Eliminar la canción <b>%1$s</b> de la lista de reproducción?]]></string>
     <string name="remove_songs_from_playlist_title">Eliminar canciones de la lista de reproducción</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[¿Eliminar <b>%1$d</b> canciones de la lista de reproducción?]]></string>
-    <string name="rename_action">Renombrar</string>
     <string name="rename_playlist_title">Renombrar lista de reproducción</string>
-    <string name="reset_action">Reiniciar</string>
     <string name="reset_artist_image">Restablecer imagen del artista</string>
     <string name="restore">Restaurar</string>
     <string name="restored_previous_purchase_please_restart">Compras previas restauradas. Por favor, reinicia la aplicación para hacer uso de todas las funciones.</string>
     <string name="restored_previous_purchases">Compras anteriores restauradas</string>
     <string name="restoring_purchase">Restaurando compra...</string>
-    <string name="retro">Retro</string>
     <string name="retro_equalizer">Ecualizador Retro</string>
-    <string name="saf_delete_failed">Error al eliminar el archivo: %s</string>
     <!-- SAF -->
-    <string name="saf_error_uri">No se puede obtener SAF URI</string>
-    <string name="saf_guide_slide1_description">Abrir panel de navegación</string>
-    <string name="saf_guide_slide1_description_before_o">Habilita \'Mostrar tarjeta SD\' en el menú desplegable</string>
     <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s necesita acceso a tarjeta SD</string>
-    <string name="saf_guide_slide2_description">Debes seleccionar el directorio raíz de tu tarjeta SD</string>
-    <string name="saf_guide_slide2_title">Selecciona tu tarjeta SD en el panel de navegación</string>
-    <string name="saf_guide_slide3_description">No abrir ninguna subcarpeta</string>
-    <string name="saf_guide_slide3_title">Toca el botón \'seleccionar\' en la parte inferior de la pantalla</string>
-    <string name="saf_pick_file">Se requiere acceso a archivo. Elige %s</string>
-    <string name="saf_pick_sdcard">Se requiere acceso a tarjeta SD, Por favor, escoge directorio raíz o tarjeta SD</string>
-    <string name="saf_write_failed">Error en escritura de archivo: %s</string>
     <string name="save_playlist_title">Guardar como archivo</string>
     <string name="saved_playlist_to">Lista de reproducción guardada a %s</string>
     <string name="saving_changes">Guardando cambios</string>
-    <string name="saving_tags">Guardando etiquetas</string>
-    <string name="saving_to_file">Guardando en archivo...</string>
     <string name="scanned_files">Escaneado %1$d de %2$d archivos</string>
     <string name="search_hint">Buscar en tu biblioteca ...</string>
-    <string name="see_all">Ver todo</string>
-    <string name="select_preset">Seleccionar preestablecido</string>
     <string name="set_artist_image">Establecer la imagen del artista</string>
     <string name="shuffle">Aleatorio</string>
     <string name="simple">Sencillo</string>
     <string name="sleep_timer_canceled">Temporizador cancelado</string>
     <string name="sleep_timer_set">La música se detendrá dentro de %d minuto(s) a partir de ahora</string>
-    <string name="slide_unlock">Desliza para desbloquear</string>
-    <string name="solid">Sólido</string>
     <string name="song">Canción</string>
     <string name="song_duration">Duración de la canción</string>
     <string name="songs">Canciones</string>
     <string name="sort_order">Ordenar por</string>
     <string name="speech_not_supported">¡Lo siento! Tu dispositivo no admite la entrada de voz</string>
     <string name="speech_prompt">Buscar en tu biblioteca</string>
-    <string name="suggestions">Recomendaciones</string>
-    <string name="summary_material_design_city_wallpaper">Fondos de Pantalla de Ciudades Material Design tomados del website www.techjuice.pk</string>
-    <string name="summary_material_design_icons">Todos los iconos que usamos provienen de los sitios web www.flaticon.com o www.materialdesignicons.com</string>
     <string name="summary_user_info">Muestra tu nombre en la pantalla de inicio</string>
     <string name="support_development">Apoyar el desarrollo</string>
-    <string name="support_development_summary">Si te gusta usar Retro Music Player, considera una donación como apoyo a mi trabajo</string>
     <!-- Message displayed when tag editing fails -->
-    <string name="tag_edit_error">Ha ocurrido un error al editar etiquetas</string>
-    <string name="tag_editor_check_permission">Comprobando permisos</string>
-    <string name="tag_editor_document_tree_message">Selecciona el directorio de almacenamiento externo</string>
-    <string name="tag_editor_document_tree_permission_failed">Parece que no tenemos permiso para editar los archivos. Comprueba el directorio en el selector de archivos</string>
-    <string name="tag_error_kitkat">Se ha producido un error al editar las etiquetas. ¿El archivo está almacenado en una tarjeta SD? Si es así, Google ha hecho imposible la edición de etiquetas para este archivo</string>
-    <string name="tag_error_lollipop">Se ha producido un error al editar las etiquetas. Si el archivo se almacena en una tarjeta SD, es posible que Retro Music no tenga permiso para acceder a él</string>
-    <string name="tag_retrieve_error">Se ha producido un error al recuperar las etiquetas.</string>
-    <string name="text">Texto</string>
     <string name="thank_you">¡Gracias!</string>
     <string name="the_audio_file">El archivo de audio</string>
     <string name="this_month">Este mes</string>
     <string name="this_week">Esta semana</string>
     <string name="this_year">Este año</string>
     <string name="tiny">Pequeño</string>
-    <string name="title">Título</string>
     <string name="title_dashboard">Interfaz</string>
-    <string name="title_desc">Título desconocido</string>
     <string name="title_good_afternoon">¡Buenas tardes!</string>
     <string name="title_good_day">¡Buen día!</string>
     <string name="title_good_evening">¡Buenas noches!</string>
     <string name="title_good_morning">¡Buenos días!</string>
     <string name="title_good_night">¡Buenas noches!</string>
-    <string name="title_home">Inicio</string>
-    <string name="title_material_design_city_wallpaper">Wallpapers de ciudades</string>
-    <string name="title_material_design_icons">Iconos</string>
-    <string name="title_notifications">Notificaciones</string>
     <string name="title_user_info">¿Cuál es tu nombre?</string>
     <string name="today">Hoy</string>
-    <string name="toggle_lyrics_size">Cambiar tamaño de letras</string>
-    <string name="tool_tip_see_all">Ver todas las canciones</string>
     <string name="top_albums">Álbumes más reproducidos</string>
     <string name="top_artists">Artistas más reproducidos</string>
-    <string name="top_tracks">Mas reproducidas</string>
-    <string name="top_tracks_label">Más Reproducidas</string>
     <string name="track_hint">"Desde el número de serie en el álbum"</string>
     <string name="track_list">Número de pista</string>
     <string name="translate">Traducir</string>
-    <string name="translate_summary">Ayuda a traducir Retro Music a tu idioma</string>
     <string name="unplayable_file">No se pudo reproducir esta canci\u00f3n</string>
     <string name="up_next">A continuación</string>
-    <string name="update">Actualizar</string>
     <string name="update_image">Actualizar imagen</string>
-    <string name="updated_artist_image">Imagen de artista actualizada</string>
     <string name="updating">Actualizando...</string>
-    <string name="user_profile_summary">Cambiar imagen de perfil y de portada</string>
     <string name="version">Versión</string>
-    <string name="virtualizer_strength">Nivel de virtualización</string>
-    <string name="volume_control">Control de volumen</string>
     <string name="web_search">Buscar en Internet</string>
     <string name="what_do_you_want_to_share">¿Qué es lo que deseas compartir?</string>
     <string name="window">Ventana</string>
     <string name="x_has_been_set_as_ringtone">Establecer %1$s como tu tono de llamada</string>
     <string name="x_selected">%1$d seleccionado</string>
     <string name="year">Año</string>
-    <string name="you_have_to_select_at_least_one_category">Debes seleccionar al menos una categoría</string>
 </resources>
diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml
index 80b7df384..e052a2830 100644
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@@ -8,7 +8,6 @@
     <string name="action_add_to_playlist">Añadir a lista de reproducción...</string>
     <string name="action_clear_playing_queue">Limpiar lista de reproducción</string>
     <string name="action_clear_playlist">Limpiar lista de reproducción</string>
-    <string name="action_cycle_repeat">Modo de repetición de ciclo</string>
     <string name="action_delete">Borrar</string>
     <string name="action_delete_from_device">Eliminar del dispositivo</string>
     <string name="action_details">Detalles</string>
@@ -18,13 +17,11 @@
     <string name="action_grant">Conceder</string>
     <string name="action_grid_size">Tamaño de cuadrícula</string>
     <string name="action_grid_size_land">Tamaño de cuadrícula (horizontal)</string>
-    <string name="action_new_playlist">Nueva lista de reproducción...</string>
     <string name="action_next">"Siguiente "</string>
     <string name="action_play">Reproducir</string>
     <string name="action_play_next">Reproducir siguiente</string>
     <string name="action_play_pause">Reproducir/Pausar</string>
     <string name="action_previous">"Anterior "</string>
-    <string name="action_re_download_artist_image">Actualizar imagen del artista</string>
     <string name="action_remove_from_favorites">"Quitar de favoritos "</string>
     <string name="action_remove_from_playing_queue">Quitar de la cola de reproducción</string>
     <string name="action_remove_from_playlist">Quitar de la lista de reproducción</string>
@@ -37,15 +34,10 @@
     <string name="action_set_as_start_directory">Establecer como directorio de inicio</string>
     <string name="action_settings">"Ajustes "</string>
     <string name="action_share">"Compartir "</string>
-    <string name="action_show_lyrics">Mostrar letra de la canción</string>
-    <string name="action_shuffle_album">Mezclar el álbum</string>
     <string name="action_shuffle_all">Mezclar todo</string>
-    <string name="action_shuffle_artist">Mezclar artista</string>
     <string name="action_shuffle_playlist">Lista de reproducción aleatoria</string>
     <string name="action_sleep_timer">Temporizador</string>
     <string name="action_tag_editor">Editor de etiquetas</string>
-    <string name="action_toggle_favorite">Alternar favorito</string>
-    <string name="action_toggle_shuffle">Alternar el modo aleatorio</string>
     <string name="add_action">Agregar</string>
     <string name="add_photo">Agregar\nfotografía</string>
     <string name="add_playlist_title">"Añadir a la lista de reproducción"</string>
@@ -53,11 +45,9 @@
     <string name="added_x_titles_to_playing_queue">%1$d canciones añadidas a la cola de reproducción.</string>
     <string name="album">"Álbum "</string>
     <string name="album_artist">"Álbum de artista "</string>
-    <string name="album_desc">Descripción del álbum</string>
     <string name="album_or_artist_empty">El título o el artista está vacío.</string>
     <string name="albums">"Álbumes "</string>
     <!-- Android Auto -->
-    <string name="albums_label">Álbumes</string>
     <string name="always">Siempre</string>
     <string name="app_share">Echa un vistazo a este reproductor de música: https://play.google.com/store/apps/details?id=%s</string>
     <!-- App Shortcuts -->
@@ -67,22 +57,15 @@
     <string name="app_shortcut_shuffle_all_short">Aleatorio</string>
     <string name="app_shortcut_top_tracks_long">@string/my_top_tracks</string>
     <string name="app_shortcut_top_tracks_short">Más Reproducidas</string>
-    <string name="app_summary">Una aplicación que combina lo mejor del diseño de iOS y Android.</string>
     <string name="app_widget_big_name">Retro Music - Grande</string>
-    <string name="app_widget_big_name_2">Retro Music - Grande 2</string>
     <string name="app_widget_card_name">Retro Music - Tarjeta</string>
     <string name="app_widget_classic_name">Retro Music - Clásico</string>
     <string name="app_widget_small_name">Retro Music - Pequeño</string>
     <string name="artist">Artista</string>
-    <string name="artist_desc">Descripción de artista</string>
     <string name="artists">Artistas</string>
-    <string name="artists_label">Artistas</string>
-    <string name="at_least_one_category_must_be_enabled">Al menos una categoría debe estar habilitada.</string>
     <string name="audio_focus_denied">"Ecualizador denegado "</string>
     <string name="audio_settings_summary">Ajustar los ajustes de sonido y controles del ecualizador</string>
-    <string name="bass_boost_strength">Reforzar graves</string>
     <string name="biography">"Biografía "</string>
-    <string name="biography_unavailable">No ha sido posible encontrar la biograf\u00eda de este artista.</string>
     <string name="black_theme_name">Solo negro</string>
     <string name="blacklist">Lista negra</string>
     <string name="blur">Desenfocar</string>
@@ -98,7 +81,6 @@
     <string name="clear_playlist_x"><![CDATA[\u00bfEliminar la lista <b>%1$s</b>? \u00a1Esto no se puede revertir!]]></string>
     <string name="color">Color</string>
     <string name="color_theme_name">Color</string>
-    <string name="colored_footers">Pies de página coloreados</string>
     <string name="colors">Colores</string>
     <string name="could_not_create_playlist">La playlist no pudo ser creada.</string>
     <string name="could_not_download_album_cover">"No se pudo descargar una car\u00e1tula del \u00e1lbum correspondiente."</string>
@@ -107,36 +89,23 @@
     <string name="create_action">Crear</string>
     <string name="created_playlist_x">La lista de reproducción %1$s ha sido creada.</string>
     <string name="currently_listening_to_x_by_x">Escuchando %1$s de %2$s</string>
-    <string name="custom">Personalizar</string>
     <string name="dark_theme_name">Oscuro</string>
-    <string name="date">Fecha</string>
     <string name="default_hint">No hay letra disponible</string>
-    <string name="delete_action">Eliminar</string>
     <string name="delete_playlist_title">Eliminar lista de reproducción</string>
     <string name="delete_playlist_x"><![CDATA[¿Eliminar la lista de reproducción <b>%1$s</b>?]]></string>
     <string name="delete_playlists_title">"Eliminar listas de reproducción "</string>
-    <string name="delete_song_title">"Eliminar canción "</string>
     <string name="delete_song_x"><![CDATA[¿Eliminar la canción <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Eliminar canciones</string>
     <string name="delete_x_playlists"><![CDATA[¿Eliminar listas de reproducción <b>%1$d</b>?]]></string>
     <string name="delete_x_songs"><![CDATA[¿Eliminar canciones <b>%1$d</b>?]]></string>
     <string name="deleted_x_songs">Canciones %1$d se han eliminado</string>
-    <string name="deleting_songs">Borrando canciones</string>
     <string name="do_you_want_to_clear_the_blacklist">¿Quieres limpiar la lista negra?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[¿Quieres borrar <b>%1$s</b> de la lista negra?]]></string>
     <string name="donate">Donar</string>
     <string name="donate_summary">Si crees que merezco ser recompensado por mi trabajo, puedes dejarme un poco de dinero aquí.</string>
     <string name="donation_header">Cómprame una</string>
     <string name="download_from_last_fm">Descarga de Last.fm</string>
-    <string name="duration">Duración</string>
-    <string name="edit">Editar</string>
-    <string name="edit_categories">Editar categorías</string>
-    <string name="edit_tags">Editar etiquetas</string>
     <string name="empty">Vacío</string>
     <string name="equalizer">Ecualizador</string>
-    <string name="error_loading_lyrics_from_network">Error cargando recurso desde la red</string>
-    <string name="experimental">Experimental</string>
-    <string name="failed_to_save_playlist">Error al guardar la lista de reproducción (%s).</string>
     <string name="favorites">Favoritos</string>
     <string name="flat">Plano</string>
     <string name="folders">Carpetas</string>
@@ -146,7 +115,6 @@
     <string name="general_settings_title">Apariencia</string>
     <string name="genre">"Género "</string>
     <string name="genres">Géneros</string>
-    <string name="gradient">Gradiente</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -156,36 +124,24 @@
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
     <string name="history">Historial</string>
-    <string name="history_label">Historial</string>
-    <string name="holiday">Vacaciones</string>
     <string name="home">Inicio</string>
     <string name="inserted_x_songs_into_playlist_x">%1$d canciones han sido insertadas en la lista de reprodución %2$s.</string>
-    <string name="inspired_designs_by">Diseños inspirados por</string>
-    <string name="join_community">Únete a la comunidad de Google Plus</string>
-    <string name="join_community_summary">Si necesitas ayuda o tiene una pregunta, la comunidad de Retro Music en Google+ es un buen lugar para ir.</string>
     <string name="label_bit_rate">Tasa de bits</string>
-    <string name="label_details">"Detalles "</string>
     <string name="label_file_format">"Formato "</string>
     <string name="label_file_name">"Nombre del archivo "</string>
     <string name="label_file_path">Ubicación de archivo</string>
     <string name="label_file_size">Tamaño</string>
     <string name="label_sampling_rate">Frecuencia de muestreo</string>
     <string name="label_track_length">Duración</string>
-    <string name="language_contributors">Traductores</string>
     <string name="last_added">Agregados últimamente</string>
     <string name="lets_play_something">Vamos a poner algo</string>
     <string name="library">Biblioteca</string>
-    <string name="library_categories">Categorías de biblioteca</string>
     <string name="licenses">Licencias</string>
     <string name="light_theme_name">Blanco</string>
     <string name="listing_files">Listado de archivos</string>
-    <string name="loading">Cargando...</string>
     <string name="loading_products">Cargando productos...</string>
     <string name="lyrics">Letras</string>
-    <string name="media_route_menu_title">Dispositivo de difusión</string>
-    <string name="more">Más</string>
     <string name="my_name">Mi Nombre</string>
-    <string name="my_playlists">Mi lista de reproducción</string>
     <string name="my_top_tracks">Mis pistas favoritas</string>
     <string name="never">Nunca</string>
     <string name="new_playlist_title">Nueva lista de reproducción</string>
@@ -194,7 +150,6 @@
     <string name="no_artists">No hay artistas</string>
     <string name="no_audio_ID">"Primero reproduce una canción, luego prueba otra vez."</string>
     <string name="no_equalizer">No se encontró ningún ecualizador.</string>
-    <string name="no_files">No hay archivos</string>
     <string name="no_genres">Sin género</string>
     <string name="no_lyrics_found">No se encontraron letras</string>
     <string name="no_playlists">No hay listas de reproducción</string>
@@ -219,52 +174,36 @@
     <string name="personalize_settings_summary">Personalizar la ventana de reproducción y la interfaz</string>
     <string name="pick_from_local_storage">Elige del almacenamiento local</string>
     <string name="plain">Plano</string>
-    <string name="play">Reproducir</string>
-    <string name="play_all">Reproducir todo</string>
     <string name="playing_notification_description">La notificación de reproducción muestra controles para parar, reproducir, etc.</string>
     <string name="playing_notification_name">Notificación de reproducción</string>
     <string name="playlist_empty_text">Lista de Reproducción vacía</string>
     <string name="playlist_is_empty">La lista de reproducción está vacía</string>
     <string name="playlist_name_empty">Nombre de Lista de reproducción</string>
     <string name="playlists">Playlists</string>
-    <string name="playlists_label">Listas de reproducción</string>
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_general">"General "</string>
     <string name="pref_header_images">Imágenes</string>
     <string name="pref_header_lockscreen">Pantalla de bloqueo</string>
-    <string name="pref_header_now_playing_screen">Reproduciendo ahora</string>
     <string name="pref_header_playlists">Listas de reproducción</string>
     <string name="pref_only_lollipop">"Solo disponible para Lollipop."</string>
-    <string name="pref_only_nougat_mr1">"Solo disponible en Nougat 7.1."</string>
-    <string name="pref_summary_about">Personas que ayudaron en el proyecto</string>
     <string name="pref_summary_album_art_on_lockscreen">Utiliza la carátula actual del álbum de canciones como fondo de pantalla de bloqueo.</string>
     <string name="pref_summary_audio_ducking">Notificaciones, navegación, etc.</string>
     <string name="pref_summary_blurred_album_art">Desenfocar la cubierta del álbum en la pantalla de bloqueo. Puede causar problemas con aplicaciones y widgets de terceros</string>
     <string name="pref_summary_carousel_effect">Efecto carrusel en carátulas en ventana de reproducción. No funciona con los Temas Tarjeta y Tarjeta con desenfoque.</string>
-    <string name="pref_summary_circular_album_effect">Mostrar carátula del álbum circular en la pantalla de temas de reproduciendo ahora, solo para los temas seleccionados no todos</string>
     <string name="pref_summary_classic_notification">Utiliza el diseño de notificación clásico.</string>
     <string name="pref_summary_colored_app">El color del fondo y del botón de control cambian de acuerdo con la imagen del álbum de la pantalla del reproductor</string>
     <string name="pref_summary_colored_app_shortcuts">Colorea los atajos de la app en el color de énfasis. Cada vez que cambies el color, por favor activa esto para que haga efecto.</string>
     <string name="pref_summary_colored_navigation_bar">Color de la barra de navegación en color primario.</string>
     <string name="pref_summary_colored_notification">"Colorea la notificaci\u00f3n en el color vibrante de la car\u00e1tula del \u00e1lbum."</string>
-    <string name="pref_summary_day_dream">Mostrar detalles de canciones cuando la música esté reproduciéndose</string>
     <string name="pref_summary_dominant_color">El color dominante se elegirá de la imagen del álbum o artista.</string>
-    <string name="pref_summary_exclude_songs">Excluir canciones de menos de 30 segundos.</string>
     <string name="pref_summary_gapless_playback">"Puede causar problemas de reproducción en algunos dispositivos."</string>
     <string name="pref_summary_ignore_media_store_artwork">Puede aumentar la calidad de la portada del álbum, pero causa tiempos de carga lenta de la imagen. Activar únicamente si tienes problemas con carátulas de baja resolución.</string>
-    <string name="pref_summary_language_en">Forzar idioma de la aplicación al inglés ( para probar la opción de múltiples idiomas)</string>
-    <string name="pref_summary_library_categories">Configurar la visibilidad y el orden de las categorías de la biblioteca.</string>
     <string name="pref_summary_lock_screen">Controles en la pantalla de bloqueo para Retro Music.</string>
-    <string name="pref_summary_lock_screen_app">Mostrar controles completos desde la pantalla de bloqueo</string>
     <string name="pref_summary_open_source_licences">Detalles de licencia para software libre</string>
     <string name="pref_summary_round_corners">Esquinas redondeadas para la aplicación, las ilustraciones de los álbumes, etc.</string>
     <string name="pref_summary_tab_titles">Habilitar/deshabilitar títulos de las pestañas inferiores.</string>
-    <string name="pref_summary_toggle_bottom_bar_titles">Deshabilitar títulos de la barra de navegación inferior</string>
     <string name="pref_summary_toggle_full_screen">Modo inmersivo</string>
-    <string name="pref_summary_toggle_genre">Si lo deseas, muestra la pestaña de género en la parte inferior de las pestañas</string>
     <string name="pref_summary_toggle_headset">Iniciar reproducción inmediatamente al conectar los auriculares.</string>
-    <string name="pref_summary_toggle_navigation_bar">Ocultar solo la barra de navegación</string>
-    <string name="pref_summary_toggle_status_bar">Ocultar solo la barra de estado</string>
     <string name="pref_summary_toggle_volume">Activar controles de volumen si hay espacio en la pantalla de reproduccióm</string>
     <string name="pref_title_album_art_on_lockscreen">Mostrar carátula del álbum</string>
     <string name="pref_title_app_shortcuts">Atajo de aplicación coloreada</string>
@@ -274,30 +213,18 @@
     <string name="pref_title_classic_notification">Diseño de notificación clásico</string>
     <string name="pref_title_colored_app">Color adaptativo</string>
     <string name="pref_title_colored_notification">Notificación coloreada</string>
-    <string name="pref_title_day_dream">Ensueño</string>
-    <string name="pref_title_exclude_songs">Excluir canciones</string>
-    <string name="pref_title_external_storage_access">Permitir acceso al almacenamiento externo</string>
     <string name="pref_title_gapless_playback">"Reproducción sin interrupciones "</string>
     <string name="pref_title_general_theme">Tema general</string>
-    <string name="pref_title_gradient_color">Elige un color</string>
     <string name="pref_title_ignore_media_store_artwork">Ignorar carátulas de la biblioteca de medios</string>
     <string name="pref_title_last_added_interval">Último intervalo de listas agregado</string>
     <string name="pref_title_lock_screen">Controles de pantalla completa</string>
-    <string name="pref_title_lock_screen_app">Bloqueo de pantalla de Retro</string>
-    <string name="pref_title_lyrics_options">Opciones de letra</string>
     <string name="pref_title_navigation_bar">Barra de navegación coloreada</string>
     <string name="pref_title_now_playing_screen_appearance">Apariencia</string>
     <string name="pref_title_open_source_licences">Licencias de código abierto</string>
     <string name="pref_title_round_corners">Esquinas redondeadas</string>
-    <string name="pref_title_toggle_bottom_bar_titles">Desactivar títulos</string>
     <string name="pref_title_toggle_carousel_effect">Efecto carrusel</string>
-    <string name="pref_title_toggle_circular_album_effect">Álbum circular</string>
     <string name="pref_title_toggle_dominant_color">Color dominante</string>
     <string name="pref_title_toggle_full_screen">App a pantalla completa</string>
-    <string name="pref_title_toggle_genre">Mostrar género</string>
-    <string name="pref_title_toggle_language_en">Idioma inglés</string>
-    <string name="pref_title_toggle_navigation_bar">Barra de navegación</string>
-    <string name="pref_title_toggle_status_bar">Barra de estado</string>
     <string name="pref_title_toggle_tab_titles">Títulos de pestañas</string>
     <string name="pref_title_toggle_toggle_headset">Reproducción automática</string>
     <string name="pref_title_toggle_volume">Controles de volumen</string>
@@ -306,10 +233,8 @@
     <string name="primary_color_desc">El color del tema principal, por defecto es gris azulado, por ahora funciona con colores oscuros</string>
     <string name="purchase">Compra</string>
     <string name="queue">Cola de reproducción</string>
-    <string name="queue_label">Cola</string>
     <string name="rate_app">¡Puntúa la app!</string>
     <string name="rate_on_google_play_summary">Si te encanta esta aplicación, haznos saber en Google Play Store para ofrecer una mejor experiencia</string>
-    <string name="recent_activity">Actividad reciente</string>
     <string name="recent_albums">Álbumes recientes</string>
     <string name="recent_artists">Artistas recientes</string>
     <string name="remove_action">Eliminar</string>
@@ -319,112 +244,62 @@
     <string name="remove_song_x_from_playlist"><![CDATA[¿Quitar canción <b>%1$s</b> de la lista?]]></string>
     <string name="remove_songs_from_playlist_title">Quitar canciones de la lista</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[¿Eliminar canciones <b>%1$d</b> de la lista?]]></string>
-    <string name="rename_action">Renombrar</string>
     <string name="rename_playlist_title">Renombrar lista</string>
-    <string name="reset_action">Reiniciar</string>
     <string name="reset_artist_image">Restablecer imagen del artista</string>
     <string name="restore">Restaurar</string>
     <string name="restored_previous_purchase_please_restart">Compra anterior restaurada. Por favor, reinicie la aplicación para hacer uso de todas las funciones.</string>
     <string name="restored_previous_purchases">Compras previas restauradas.</string>
     <string name="restoring_purchase">Restaurando compra…</string>
-    <string name="retro">Retro</string>
     <string name="retro_equalizer">Ecualizador Retro</string>
-    <string name="saf_delete_failed">Error al eliminar el archivo: %s</string>
     <!-- SAF -->
-    <string name="saf_error_uri">No se puede obtener el URI de SAF</string>
-    <string name="saf_guide_slide1_description">Abrir el panel de navegación</string>
-    <string name="saf_guide_slide1_description_before_o">Habilita \'Mostrar tarjeta SD\' en el menú desplegable</string>
     <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s necesita acceso a la tarjeta SD</string>
-    <string name="saf_guide_slide2_description">Debes seleccionar el directorio raíz de tu tarjeta SD</string>
-    <string name="saf_guide_slide2_title">Selecciona tu tarjeta SD en el panel de navegación</string>
-    <string name="saf_guide_slide3_description">No abrir ninguna subcarpeta</string>
-    <string name="saf_guide_slide3_title">Toca el botón \'seleccionar\' en la parte inferior de la pantalla</string>
-    <string name="saf_pick_file">Se requiere acceso a archivos. Elige %s</string>
-    <string name="saf_pick_sdcard">Se requiere acceso a la tarjeta SD. Elija el directorio raíz de la tarjeta SD</string>
-    <string name="saf_write_failed">Error de escritura de archivo: %s</string>
     <string name="save_playlist_title">Guardar como archivo</string>
     <string name="saved_playlist_to">Guardar lista de reproducción en %s.</string>
     <string name="saving_changes">Guardando cambios</string>
-    <string name="saving_tags">Guardando etiquetas</string>
-    <string name="saving_to_file">Guardando en el archivo...</string>
     <string name="scanned_files">Escaneado %1$d de %2$d archivos.</string>
     <string name="search_hint">Busca en tu biblioteca...</string>
-    <string name="see_all">Ver todo</string>
-    <string name="select_preset">Seleccionar preestablecido</string>
     <string name="set_artist_image">Establecer imagen del artista</string>
     <string name="shuffle">Aleatorio</string>
     <string name="simple">Simple</string>
     <string name="sleep_timer_canceled">Temporizador cancelado.</string>
     <string name="sleep_timer_set">Temporizador de apagado activado para dentro de %d</string>
-    <string name="slide_unlock">Desliza para desbloquear</string>
-    <string name="solid">Sólido</string>
     <string name="song">Canción</string>
     <string name="song_duration">Duración de la canción</string>
     <string name="songs">Canciones</string>
     <string name="sort_order">Orden de clasificación</string>
     <string name="speech_not_supported">Lo siento, tu dispositivo no soporta las órdenes por voz.</string>
     <string name="speech_prompt">Busca en tu biblioteca</string>
-    <string name="suggestions">Sugerencias</string>
-    <string name="summary_material_design_city_wallpaper">Imágenes de ciudad Material Design de www.techjuice.pk</string>
-    <string name="summary_material_design_icons">Todos los iconos que usamos provienen de www.flaticon.com o materialdesignicons.com</string>
     <string name="summary_user_info">Solo muestra tu nombre en la pantalla de inicio</string>
     <string name="support_development">Soporte del desarrollador</string>
-    <string name="support_development_summary">Si disfrutas usando Retro Music Player, considera la donación como apoyo para mi trabajo.</string>
     <!-- Message displayed when tag editing fails -->
-    <string name="tag_edit_error">Se produjo un error al editar las etiquetas.</string>
-    <string name="tag_editor_check_permission">Comprobando los permisos</string>
-    <string name="tag_editor_document_tree_message">Selecciona el directorio de almacenamiento externo</string>
-    <string name="tag_editor_document_tree_permission_failed">Parece que no tenemos permiso para editar los archivos. Verifica dos veces el directorio en el selector de archivos.</string>
-    <string name="tag_error_kitkat">Se produjo un error al editar las etiquetas. ¿El archivo está almacenado en una tarjeta SD? Si es así, Google ha hecho que la edición de etiquetas sea imposible para este archivo.</string>
-    <string name="tag_error_lollipop">Se produjo un error al editar las etiquetas. Si el archivo está almacenado en una tarjeta SD, es posible que Retro Music no tenga permiso para acceder a él.</string>
-    <string name="tag_retrieve_error">Se produjo un error al recuperar las etiquetas.</string>
-    <string name="text">Texto</string>
     <string name="thank_you">¡Gracias!</string>
     <string name="the_audio_file">El archivo de audio</string>
     <string name="this_month">Este mes</string>
     <string name="this_week">Esta semana</string>
     <string name="this_year">Este año</string>
     <string name="tiny">Pequeño</string>
-    <string name="title">Título</string>
     <string name="title_dashboard">Interfaz</string>
-    <string name="title_desc">Título descendiente</string>
     <string name="title_good_afternoon">¡Buenas tardes!</string>
     <string name="title_good_day">¡Buen día!</string>
     <string name="title_good_evening">¡Buenas tardes!</string>
     <string name="title_good_morning">¡Buenos días!</string>
     <string name="title_good_night">¡Buenas noches!</string>
-    <string name="title_home">Inicio</string>
-    <string name="title_material_design_city_wallpaper">Wallpaper de ciudad</string>
-    <string name="title_material_design_icons">Iconos</string>
-    <string name="title_notifications">Notificaciones</string>
     <string name="title_user_info">¿Cuál es tu nombre?</string>
     <string name="today">Hoy</string>
-    <string name="toggle_lyrics_size">Cambiar tamaño de letra</string>
-    <string name="tool_tip_see_all">Ver todas las canciones</string>
     <string name="top_albums">Álbumes favoritos</string>
     <string name="top_artists">Artistas favoritos</string>
-    <string name="top_tracks">Más reproducidas</string>
-    <string name="top_tracks_label">Las Mejores Canciones</string>
     <string name="track_hint">"Cancion (2 para la canción 2 o 3004 para el CD 3 canción 4)"</string>
     <string name="track_list">Número de pista</string>
     <string name="translate">Traducir</string>
-    <string name="translate_summary">Ayuda a traducir Retro Music a tu idioma.</string>
     <string name="unplayable_file">No es posible reproducir est\u00e1 canci\u00f3n.</string>
     <string name="up_next">A continuación</string>
-    <string name="update">Actualización</string>
     <string name="update_image">Actualizar imagen</string>
-    <string name="updated_artist_image">Imagen del artista actualizada.</string>
     <string name="updating">Actualizando...</string>
-    <string name="user_profile_summary">Cambiar imagen de perfil y banner</string>
     <string name="version">Versión</string>
-    <string name="virtualizer_strength">Fuerza del virtualizador</string>
-    <string name="volume_control">Control de volumen</string>
     <string name="web_search">Búsqueda web</string>
     <string name="what_do_you_want_to_share">¿Qué quieres compartir?</string>
     <string name="window">Ventana</string>
     <string name="x_has_been_set_as_ringtone">Establecer %1$s como nuevo tono de llamada.</string>
     <string name="x_selected">%1$d seleccionado</string>
     <string name="year">Año</string>
-    <string name="you_have_to_select_at_least_one_category">Debes seleccionar al menos una categoría</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 53d138a55..63e6189ad 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -8,7 +8,6 @@
     <string name="action_add_to_playlist">Ajouter à la liste de lecture...</string>
     <string name="action_clear_playing_queue">Vider la file d\'attente</string>
     <string name="action_clear_playlist">Effacer la liste</string>
-    <string name="action_cycle_repeat">Mode de répétition cyclique</string>
     <string name="action_delete">Supprimer</string>
     <string name="action_delete_from_device">Supprimer de l\'appareil</string>
     <string name="action_details">Détails</string>
@@ -18,13 +17,11 @@
     <string name="action_grant">Autoriser</string>
     <string name="action_grid_size">Taille de la grille</string>
     <string name="action_grid_size_land">Taille de la grille (paysage)</string>
-    <string name="action_new_playlist">Nouvelle playlist...</string>
     <string name="action_next">Suivant</string>
     <string name="action_play">Lecture</string>
     <string name="action_play_next">Ajouter à la liste d\'attente</string>
     <string name="action_play_pause">Lecture/Pause</string>
     <string name="action_previous">Précédent</string>
-    <string name="action_re_download_artist_image">Mettre à jour la photo d\'artiste</string>
     <string name="action_remove_from_favorites">Retirer des favoris</string>
     <string name="action_remove_from_playing_queue">Retirer de la file d\'attente</string>
     <string name="action_remove_from_playlist">Retirer de la playlist</string>
@@ -37,15 +34,10 @@
     <string name="action_set_as_start_directory">Définir comme répertoire d\'origine</string>
     <string name="action_settings">"Paramètres"</string>
     <string name="action_share">Partager</string>
-    <string name="action_show_lyrics">Afficher les paroles</string>
-    <string name="action_shuffle_album">Album en aléatoire</string>
     <string name="action_shuffle_all">Tout en aléatoire</string>
-    <string name="action_shuffle_artist">Artiste en aléatoire</string>
     <string name="action_shuffle_playlist">Playlist en aléatoire</string>
     <string name="action_sleep_timer">Minuteur de sommeil</string>
     <string name="action_tag_editor">Éditeur de tag</string>
-    <string name="action_toggle_favorite">ajouter/enlever des favoris</string>
-    <string name="action_toggle_shuffle">Activer/désactiver le mode aléatoire</string>
     <string name="add_action">Ajouter</string>
     <string name="add_photo">Ajouter une photo</string>
     <string name="add_playlist_title">"Ajouter à la playlist"</string>
@@ -53,11 +45,9 @@
     <string name="added_x_titles_to_playing_queue">%1$d morceaux ajoutés à la file d\'attente.</string>
     <string name="album">Album</string>
     <string name="album_artist">Artiste de l\'album</string>
-    <string name="album_desc">Description de l\'album</string>
     <string name="album_or_artist_empty">Le titre ou l\'artiste est vide.</string>
     <string name="albums">Albums</string>
     <!-- Android Auto -->
-    <string name="albums_label">Albums</string>
     <string name="always">Toujours</string>
     <string name="app_share">Hey, jetez un œil  à ce super lecteur de musique sur : https://play.google.com/store/apps/details?id=%s</string>
     <string name="app_shortcut_last_added_long">\@string/last_added</string>
@@ -67,21 +57,14 @@
     <string name="app_shortcut_shuffle_all_short">Aléatoire</string>
     <string name="app_shortcut_top_tracks_long">\@string/my_top_tracks</string>
     <string name="app_shortcut_top_tracks_short">Plus écoutés</string>
-    <string name="app_summary">Une application Hybride entre le Material Design et iOS</string>
     <string name="app_widget_big_name">Retro music - Gros</string>
-    <string name="app_widget_big_name_2">Retro music - Gros2</string>
     <string name="app_widget_card_name">Retro music - Carte</string>
     <string name="app_widget_classic_name">Retro music - Classique</string>
     <string name="app_widget_small_name">Retro music - Petit</string>
     <string name="artist">Artiste</string>
-    <string name="artist_desc">Description de l\'artiste</string>
     <string name="artists">Artistes</string>
-    <string name="artists_label">Artistes</string>
-    <string name="at_least_one_category_must_be_enabled">Au moins une catégorie doit être activée.</string>
     <string name="audio_focus_denied">Priorité audio refusée.</string>
-    <string name="bass_boost_strength">Puissance du Booster de Basse</string>
     <string name="biography">Biographie</string>
-    <string name="biography_unavailable">Impossible de trouver la biographie de l\'artiste.</string>
     <string name="black_theme_name">Juste noir</string>
     <string name="blacklist">Liste noire</string>
     <string name="blur">Flou</string>
@@ -97,7 +80,6 @@
     <string name="clear_playlist_x"><![CDATA[Vider la playlist <b>%1$s</b>? Ceci est irr\u00e9versible !]]></string>
     <string name="color">Couleur</string>
     <string name="color_theme_name">Couleur</string>
-    <string name="colored_footers">Bas de page colorés</string>
     <string name="colors">Couleurs</string>
     <string name="could_not_create_playlist">Impossible de cr\u00e9er la playlist</string>
     <string name="could_not_download_album_cover">"Impossible de t\u00e9l\u00e9charger une pochette d'album correspondante."</string>
@@ -106,36 +88,23 @@
     <string name="create_action">Créer</string>
     <string name="created_playlist_x">Playlist %1$s créée</string>
     <string name="currently_listening_to_x_by_x">Vous écoutez %1$s par %2$s.</string>
-    <string name="custom">Personnalisé</string>
     <string name="dark_theme_name">Plutôt Sombre</string>
-    <string name="date">Date</string>
     <string name="default_hint">Pas de paroles</string>
-    <string name="delete_action">Supprimer</string>
     <string name="delete_playlist_title">Supprimer la playlist</string>
     <string name="delete_playlist_x"><![CDATA[Supprimer la playlist <b>%1$s</b>?]]></string>
     <string name="delete_playlists_title">Supprimer les playlists</string>
-    <string name="delete_song_title">Supprimer le morceau</string>
     <string name="delete_song_x"><![CDATA[Supprimer le morceau <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Supprimer les morceaux</string>
     <string name="delete_x_playlists"><![CDATA[Supprimer <b>%1$d</b> playlists?]]></string>
     <string name="delete_x_songs"><![CDATA[Supprimer <b>%1$d</b> morceaux?]]></string>
     <string name="deleted_x_songs">%1$d morceaux supprimés.</string>
-    <string name="deleting_songs">Suppression</string>
     <string name="do_you_want_to_clear_the_blacklist">Voulez-vous effacer la liste noire ?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Voulez-vous retirer <b>%1$s</b>  de la liste noire ?]]></string>
     <string name="donate">Faire un don</string>
     <string name="donate_summary">Si vous pensez que je mérite d\'être payé pour mon travail, vous pouvez me donner quelques dollars ici.</string>
     <string name="donation_header">Achetez-moi</string>
     <string name="download_from_last_fm">Télécharger à partir de Last.fm</string>
-    <string name="duration">Durée</string>
-    <string name="edit">Modifier</string>
-    <string name="edit_categories">Modifier les catégories</string>
-    <string name="edit_tags">Éditer les tags</string>
     <string name="empty">Vide</string>
     <string name="equalizer">Égaliseur</string>
-    <string name="error_loading_lyrics_from_network">Erreur de chargement via le réseau</string>
-    <string name="experimental">Expérimental</string>
-    <string name="failed_to_save_playlist">Impossible d\'enregistrer la liste de lecture (%s).</string>
     <string name="favorites">Favoris</string>
     <string name="flat">Plat</string>
     <string name="folders">Dossiers</string>
@@ -143,7 +112,6 @@
     <string name="full">Plein</string>
     <string name="genre">Genre</string>
     <string name="genres">Genres</string>
-    <string name="gradient">Dégradé</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -153,36 +121,24 @@
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
     <string name="history">Historique</string>
-    <string name="history_label">Historique</string>
-    <string name="holiday">Vacances</string>
     <string name="home">Accueil</string>
     <string name="inserted_x_songs_into_playlist_x">%1$d morceaux ajoutés à la playlist %2$d.</string>
-    <string name="inspired_designs_by">Designs inspirés par</string>
-    <string name="join_community">Rejoindre la communauté Google Plus.</string>
-    <string name="join_community_summary">Si vous avez besoin d\'aide ou si vous avez des questions, vous pouvez vous rendre sur la communauté Google Plus \"Retro music\".</string>
     <string name="label_bit_rate">Débit</string>
-    <string name="label_details">Détails</string>
     <string name="label_file_format">Format</string>
     <string name="label_file_name">Nom du fichier</string>
     <string name="label_file_path">Chemin du fichier</string>
     <string name="label_file_size">Taille</string>
     <string name="label_sampling_rate">Échantillonnage</string>
     <string name="label_track_length">Durée</string>
-    <string name="language_contributors">Contributeurs linguistiques</string>
     <string name="last_added">Derniers ajouts</string>
     <string name="lets_play_something">Jouons quelque-chose</string>
     <string name="library">Librairie</string>
-    <string name="library_categories">Catégories de la bibliothèque</string>
     <string name="licenses">Licences</string>
     <string name="light_theme_name">Nettement blanc</string>
     <string name="listing_files">Liste les fichiers</string>
-    <string name="loading">Chargement...</string>
     <string name="loading_products">Chargement des produits...</string>
     <string name="lyrics">Paroles</string>
-    <string name="media_route_menu_title">Diffuser l\'appareil</string>
-    <string name="more">Plus</string>
     <string name="my_name">Mon Nom</string>
-    <string name="my_playlists">Ma playlist</string>
     <string name="my_top_tracks">Les plus écoutés</string>
     <string name="never">Jamais</string>
     <string name="new_playlist_title">Nouvelle liste</string>
@@ -191,7 +147,6 @@
     <string name="no_artists">Aucun artiste</string>
     <string name="no_audio_ID">"Lisez un morceaux d'abord, puis réessayez"</string>
     <string name="no_equalizer">Aucun égaliseur trouvé</string>
-    <string name="no_files">Aucun fichiers</string>
     <string name="no_genres">Aucun genre</string>
     <string name="no_lyrics_found">Aucunes paroles trouvées</string>
     <string name="no_playlists">Aucune liste de lecture</string>
@@ -213,52 +168,36 @@
     <string name="personalize">Interface</string>
     <string name="pick_from_local_storage">Choisir à partir de mes fichiers</string>
     <string name="plain">Épuré</string>
-    <string name="play">Lecture</string>
-    <string name="play_all">Lire tout</string>
     <string name="playing_notification_description">La notification de lecture vous donne accès à des actions comme lecture/pause etc.</string>
     <string name="playing_notification_name">Notification de lecture</string>
     <string name="playlist_empty_text">Liste de lecture vide</string>
     <string name="playlist_is_empty">La liste de lecture est vide</string>
     <string name="playlist_name_empty">Nom de la liste</string>
     <string name="playlists">Listes</string>
-    <string name="playlists_label">Listes de lecture</string>
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_general">Général</string>
     <string name="pref_header_images">Images</string>
     <string name="pref_header_lockscreen">Écran de verrouillage</string>
-    <string name="pref_header_now_playing_screen">En train de jouer</string>
     <string name="pref_header_playlists">Listes de lecture</string>
     <string name="pref_only_lollipop">"Disponible sur Lollipop uniquement."</string>
-    <string name="pref_only_nougat_mr1">"Disponible sur Nougat 7.1 uniquement."</string>
-    <string name="pref_summary_about">Personnes qui ont aidés sur ce projet</string>
     <string name="pref_summary_album_art_on_lockscreen">Utilise la pochette d\'album comme fond d\'écran de verrouillage.</string>
     <string name="pref_summary_audio_ducking">Notifications, navigation, etc...</string>
     <string name="pref_summary_blurred_album_art">Applique un effet de flou sur l\'écran de verrouillage. Peut causer des problèmes avec les applications tierces et les widgets.</string>
     <string name="pref_summary_carousel_effect">Effet de carrousel sur les images d\'album dans l\'écran de lecture. Noter que ça ne marchera pas avec les thèmes Carte et Carte Floue</string>
-    <string name="pref_summary_circular_album_effect">Affiche l\'image d\'album en forme de rond dans l\'écran de lecture en cours, seulement avec certains thèmes</string>
     <string name="pref_summary_classic_notification">Utiliser le design de notification Classique.</string>
     <string name="pref_summary_colored_app">En fond, adapte la couleur des contrôles en fonction de l\'image de l\'album sur l\'écran de lecture</string>
     <string name="pref_summary_colored_app_shortcuts">Colorise les raccourcis de l\'application avec la couleur d\'accentuation. Chaque fois que vous changez la couleur, veuillez basculer ceci pour que le changement prenne effet.</string>
     <string name="pref_summary_colored_navigation_bar">Colorise la barre de navigation avec la couleur primaire.</string>
     <string name="pref_summary_colored_notification">"Colorise la notification avec la couleur vive de la pochette."</string>
-    <string name="pref_summary_day_dream">Montrer les détails de la musique sur dream quand la musique est en cours de lecture</string>
     <string name="pref_summary_dominant_color">Utiliser la couleur dominante de l\'image d\'album ou d\'artiste.</string>
-    <string name="pref_summary_exclude_songs">Exclure les morceaux de moins de 30 sec.</string>
     <string name="pref_summary_gapless_playback">"Peut causer des problèmes de lecture sur certains appareils."</string>
     <string name="pref_summary_ignore_media_store_artwork">Peut améliorer la qualité de la pochette d\'album mais peut aussi ralentir le temps de chargement de l\'image. N\'activez ceci qu\'en cas de faible résolution de la pochette.</string>
-    <string name="pref_summary_language_en">Forcer l\'application à utiliser l\'Anglais (c\'est en test pour plusieurs options de langages)</string>
-    <string name="pref_summary_library_categories">Configurez la visibilité et l\'ordre des catégories de la librairie.</string>
     <string name="pref_summary_lock_screen">Montrer l\'écran de verrouillage pour contrôler Retro Music</string>
-    <string name="pref_summary_lock_screen_app">Affiche tout les contrôles depuis l\'écran de verrouillage</string>
     <string name="pref_summary_open_source_licences">Détails de la licence pour les logiciels open-source</string>
     <string name="pref_summary_round_corners">Coins arrondis pour les fenêtres, pochettes d\'album,  etc...</string>
     <string name="pref_summary_tab_titles">Activer / désactiver les titres des onglets du bas</string>
-    <string name="pref_summary_toggle_bottom_bar_titles">Désactiver les titres depuis la barre de navigation</string>
     <string name="pref_summary_toggle_full_screen">Mode immersif</string>
-    <string name="pref_summary_toggle_genre">Si vous ne voulez pas voir l\'onglet \"Genres\"</string>
     <string name="pref_summary_toggle_headset">Lance la lecture immédiatement quand un casque est branché</string>
-    <string name="pref_summary_toggle_navigation_bar">Masquer seulement la barre de navigation</string>
-    <string name="pref_summary_toggle_status_bar">Masquer seulement la barre d\'état</string>
     <string name="pref_summary_toggle_volume">S\'il y a de l\'espace dans l\'écran \"en cours de lecture\", activer le contôle du volume</string>
     <string name="pref_title_album_art_on_lockscreen">Afficher la pochette d\'album</string>
     <string name="pref_title_app_shortcuts">Raccourcis d\'application colorés</string>
@@ -268,30 +207,18 @@
     <string name="pref_title_classic_notification">Design classique de la notification</string>
     <string name="pref_title_colored_app">Couleur adaptative</string>
     <string name="pref_title_colored_notification">Notification colorée</string>
-    <string name="pref_title_day_dream">Day dream</string>
-    <string name="pref_title_exclude_songs">Exclure des morceaux</string>
-    <string name="pref_title_external_storage_access">Accorder l\'accès au stockage externe</string>
     <string name="pref_title_gapless_playback">Suppression des silences</string>
     <string name="pref_title_general_theme">Thème général</string>
-    <string name="pref_title_gradient_color">Choisissez une couleur</string>
     <string name="pref_title_ignore_media_store_artwork">Ignorer les pochettes du stockage multimédia</string>
     <string name="pref_title_last_added_interval">Dernière intervalle de playlist ajouté</string>
     <string name="pref_title_lock_screen">Contrôles plein écran</string>
-    <string name="pref_title_lock_screen_app">Écran de verrouillage Retro</string>
-    <string name="pref_title_lyrics_options">Options des paroles</string>
     <string name="pref_title_navigation_bar">Barre de navigation colorée</string>
     <string name="pref_title_now_playing_screen_appearance">Apparence</string>
     <string name="pref_title_open_source_licences">Licences Open Source</string>
     <string name="pref_title_round_corners">Coins arrondis</string>
-    <string name="pref_title_toggle_bottom_bar_titles">Désactiver les titres</string>
     <string name="pref_title_toggle_carousel_effect">Effet de caroussel</string>
-    <string name="pref_title_toggle_circular_album_effect">Album circulaire</string>
     <string name="pref_title_toggle_dominant_color">Couleur dominante</string>
     <string name="pref_title_toggle_full_screen">Application plein écran</string>
-    <string name="pref_title_toggle_genre">Afficher genre</string>
-    <string name="pref_title_toggle_language_en">Langage Anglais</string>
-    <string name="pref_title_toggle_navigation_bar">Barre de navigation</string>
-    <string name="pref_title_toggle_status_bar">Barre d\'état</string>
     <string name="pref_title_toggle_tab_titles">Titres des onglets</string>
     <string name="pref_title_toggle_toggle_headset">Lecture automatique</string>
     <string name="pref_title_toggle_volume">Contrôle du volume</string>
@@ -300,10 +227,8 @@
     <string name="primary_color_desc">La couleur primaire du thème, bleu-gris par défaut, maintenant avec des couleurs sombres</string>
     <string name="purchase">Acheter</string>
     <string name="queue">File d\'attente</string>
-    <string name="queue_label">File d\'attente</string>
     <string name="rate_app">Noter l\'application</string>
     <string name="rate_on_google_play_summary">Vous adorez cette appli ? Faisez le savoir en nous laissant un avis sur le Play Store pour nous permettre d\'améliorer votre expérience</string>
-    <string name="recent_activity">Activité récente</string>
     <string name="recent_albums">Albums récents</string>
     <string name="recent_artists">Artists récents</string>
     <string name="remove_action">Retirer</string>
@@ -313,108 +238,60 @@
     <string name="remove_song_x_from_playlist"><![CDATA[Retirer le morceau <b>%1$s</b> de la playlist?]]></string>
     <string name="remove_songs_from_playlist_title">Retirer les morceaux de la playlist</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[Retirer <b>%1$d</b> morceaux de la liste de lecture?]]></string>
-    <string name="rename_action">Renommer</string>
     <string name="rename_playlist_title">Renommer la playlist</string>
-    <string name="reset_action">Remise à zero</string>
     <string name="reset_artist_image">Réinitialiser la photo de l\'artiste</string>
     <string name="restore">Restaurer</string>
     <string name="restored_previous_purchase_please_restart">Les achats précédent ont été restaurés. Merci de redémarrer l\'appli pour pouvoir utiliser toutes ses fonctionnalités.</string>
     <string name="restored_previous_purchases">Restaurer les achats précédents.</string>
     <string name="restoring_purchase">Restauration des achats...</string>
-    <string name="retro">rétro</string>
     <string name="retro_equalizer">Égaliseur Retro</string>
-    <string name="saf_delete_failed">Suppression du fichier échouée : %s</string>
     <!-- SAF -->
-    <string name="saf_guide_slide1_description">Ouvrez le menu de navigation</string>
-    <string name="saf_guide_slide1_description_before_o">Activez \"Afficher la carte SD\" dans le menu</string>
     <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s a besoin d\'accéder à la carte SD</string>
-    <string name="saf_guide_slide2_description">Vous devez sélectionnez la racine de votre carte SD</string>
-    <string name="saf_guide_slide2_title">Sélectionnez votre carte SD dans le menu de navigation</string>
-    <string name="saf_guide_slide3_description">N\'ouvrez aucun autre dossier</string>
-    <string name="saf_guide_slide3_title">Appuyez sur le bouton \"Sélectionner\" en bas de l\'écran</string>
-    <string name="saf_pick_file">Accès au fichier requis. Sélectionnez %s</string>
-    <string name="saf_pick_sdcard">Accès à la carte SD requis. Sélectionnez la racine de la carte SD</string>
-    <string name="saf_write_failed">Écriture du fichier échouée : %s</string>
     <string name="save_playlist_title">Enregistrer comme fichier</string>
     <string name="saved_playlist_to">Liste de lecture enregistrée dans %s.</string>
     <string name="saving_changes">Enregistrement des changements</string>
-    <string name="saving_tags">Sauvegarder les tags</string>
-    <string name="saving_to_file">Enregistrement dans le fichier...</string>
     <string name="scanned_files">Fichier %1$d sur %2$d scanné.</string>
     <string name="search_hint">Recherchez dans votre bibliothèque...</string>
-    <string name="see_all">Voir tout</string>
-    <string name="select_preset">Sélectionnez un préréglage</string>
     <string name="set_artist_image">Définir l\'image de l\'artiste</string>
     <string name="shuffle">Aléatoire</string>
     <string name="simple">Simple</string>
     <string name="sleep_timer_canceled">Minuteur de sommeil annulé</string>
     <string name="sleep_timer_set">Le minuteur de sommeil est défini sur %d minutes à partir de maintenant.</string>
-    <string name="slide_unlock">Glissez pour déverouiller</string>
-    <string name="solid">Solide</string>
     <string name="song">Morceau</string>
     <string name="song_duration">Durée du morceau</string>
     <string name="songs">Morceaux</string>
     <string name="sort_order">Trier par</string>
     <string name="speech_not_supported">Désolé ! Votre appareil ne supporte pas la reconnaissance vocale</string>
     <string name="speech_prompt">Chercher dans la bibliothèque</string>
-    <string name="suggestions">Suggestions</string>
-    <string name="summary_material_design_city_wallpaper">Les fonds d\'écran de ville  \"Material Design\" viennent du site internet www.techjuice.pk</string>
-    <string name="summary_material_design_icons">Pour tous les icônes que nous avons utilisé de ces sites internet : www.flaticon.com et www.materialdesignicons.com</string>
     <string name="summary_user_info">Juste pour montrer votre nom sur l\'écran d\'accueil</string>
     <string name="support_development">Me soutenir</string>
-    <string name="support_development_summary">Si vous appréciez Retro Music Player, merci de considérer un don pour supporter mon travail.</string>
     <!-- Message displayed when tag editing fails -->
-    <string name="tag_edit_error">Une erreur s\'est produite en éditant les tags.</string>
-    <string name="tag_editor_check_permission">Vérification des permissions</string>
-    <string name="tag_editor_document_tree_message">Sélectionnez le stockage externe</string>
-    <string name="tag_editor_document_tree_permission_failed">On dirait que nous n\'avons pas la permission de modifier ce fichier. Vérifiez le chemin d\'accès dans le sélectionneur de fichiers.</string>
-    <string name="tag_error_kitkat">Une erreur est survenue lors de la modification des tags. Le fichier est-il stocké dans une Carte SD ? Si oui, Google a rendu la modification de tags impossible pour ce fichier.</string>
-    <string name="tag_error_lollipop">Une erreur est survenue lors de la modification des tags. Si le fichier est stocké dans une Carte SD, peut-être que Retro n\'a pas la permission d\'y accéder.</string>
-    <string name="tag_retrieve_error">Un erreur s\'est produite en récupérant les tags.</string>
-    <string name="text">Texte</string>
     <string name="thank_you">Merci!</string>
     <string name="the_audio_file">Le fichier audio</string>
     <string name="this_month">Ce mois</string>
     <string name="this_week">Cette semaine</string>
     <string name="this_year">Cette année</string>
     <string name="tiny">Petit</string>
-    <string name="title">Titre</string>
     <string name="title_dashboard">tableau de bord</string>
-    <string name="title_desc">Desc. du titre</string>
     <string name="title_good_afternoon">Bon après-midi</string>
     <string name="title_good_day">Bonne journée 🌞</string>
     <string name="title_good_evening">Bonne soirée</string>
     <string name="title_good_morning">Bonjour</string>
     <string name="title_good_night">Bonne nuit</string>
-    <string name="title_home">Menu</string>
-    <string name="title_material_design_city_wallpaper">fond d\'écran de ville</string>
-    <string name="title_material_design_icons">Icônes</string>
-    <string name="title_notifications">Notifications</string>
     <string name="title_user_info">Quel est votre prénom</string>
     <string name="today">Aujourd\'hui</string>
-    <string name="toggle_lyrics_size">Changer la taille des paroles</string>
-    <string name="tool_tip_see_all">Voir tout les morceaux</string>
-    <string name="top_tracks">Meilleurs titres</string>
-    <string name="top_tracks_label">Meilleurs titres</string>
     <string name="track_hint">"Piste (ex: 2 pour piste 2, 3004 pour CD3 piste 4)"</string>
     <string name="track_list">Numéro du titre</string>
     <string name="translate">Traduire</string>
-    <string name="translate_summary">Aidez à la traduction de Retro music dans votre langue native.</string>
     <string name="unplayable_file">Impossible de lire ce morceau.</string>
     <string name="up_next">À suivre</string>
-    <string name="update">Mise à jour</string>
     <string name="update_image">Mettre la photo à jour.</string>
-    <string name="updated_artist_image">Photo d\'artiste mise à jour.</string>
     <string name="updating">Mise à jour...</string>
     <string name="version">Version</string>
-    <string name="virtualizer_strength">force virtualiseur</string>
-    <string name="volume_control">contrôle du volume</string>
     <string name="web_search">Recherche web</string>
     <string name="what_do_you_want_to_share">Que voulez-vous partager?</string>
     <string name="window">Fenêtre</string>
     <string name="x_has_been_set_as_ringtone">Définir %1$s comme sonnerie.</string>
     <string name="x_selected">%1$d sélectionné</string>
     <string name="year">Année</string>
-    <string name="you_have_to_select_at_least_one_category">Vous devez sélectionner au moins une catégorie</string>
 </resources>
diff --git a/app/src/main/res/values-hdpi/dimens.xml b/app/src/main/res/values-hdpi/dimens.xml
deleted file mode 100644
index f7ae3b950..000000000
--- a/app/src/main/res/values-hdpi/dimens.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="lock_screen_cover_width">360dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 6c9fe51cb..7c440fe1b 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -17,13 +17,11 @@
     <string name="action_grant">अनुदान</string>
     <string name="action_grid_size">ग्रीड आकार</string>
     <string name="action_grid_size_land">ग्रीड आकार (परीसदृश्य)</string>
-    <string name="action_new_playlist">नई प्लेलिस्ट...</string>
     <string name="action_next">अगला</string>
     <string name="action_play">चलाएं</string>
     <string name="action_play_next">अगला चलाएं</string>
     <string name="action_play_pause">चलाएं/रोकें</string>
     <string name="action_previous">पिछला</string>
-    <string name="action_re_download_artist_image">कलाकार का नाय चित्र रखे</string>
     <string name="action_remove_from_favorites">पसंदीदा में से निकाले</string>
     <string name="action_remove_from_playing_queue">कतार में से निकले</string>
     <string name="action_remove_from_playlist">प्लेलिस्ट में से निकालें</string>
@@ -36,10 +34,7 @@
     <string name="action_set_as_start_directory">शुरू निर्देशिका के रूप में सेट करें</string>
     <string name="action_settings">"सेटिंग"</string>
     <string name="action_share">शेयर</string>
-    <string name="action_show_lyrics">गीतिकाव्य दिखाएँ</string>
-    <string name="action_shuffle_album">शफ़ल एल्बम</string>
     <string name="action_shuffle_all">सभी शफ़ल करें</string>
-    <string name="action_shuffle_artist">शफ़ल कलाकार</string>
     <string name="action_shuffle_playlist">शफ़ल प्लेलिस्ट</string>
     <string name="action_sleep_timer">स्लीप टाइमर</string>
     <string name="action_tag_editor">टैग एडिटर</string>
@@ -50,7 +45,6 @@
     <string name="added_x_titles_to_playing_queue">कतार मे %1$d शीर्षक जोड़ा गया है।</string>
     <string name="album">एल्बम</string>
     <string name="album_artist">एल्बम कलाकार</string>
-    <string name="album_desc">एल्बम विवरण</string>
     <string name="album_or_artist_empty">शीर्षक या कलाकार खाली है</string>
     <string name="albums">एल्बम</string>
     <string name="always">हमेशा</string>
@@ -60,11 +54,9 @@
     <string name="app_shortcut_shuffle_all_short">शफ़ल</string>
     <string name="app_shortcut_top_tracks_short">टॉप गीत</string>
     <string name="app_widget_big_name">रेट्रो म्यूजिक - बिग</string>
-    <string name="app_widget_big_name_2">रेट्रो म्यूजिक - बिग2</string>
     <string name="app_widget_card_name">रेट्रो म्यूजिक - कार्ड</string>
     <string name="app_widget_classic_name">रेट्रो म्यूजिक - क्लासिक</string>
     <string name="artist">कलाकार</string>
-    <string name="artist_desc">कलाकार का वर्णन</string>
     <string name="artists">कलाकार</string>
     <string name="biography">जीवनी</string>
     <string name="black_theme_name">सिर्फ काला</string>
@@ -73,10 +65,5 @@
     <string name="changelog">चेंजलाग</string>
     <string name="changelog_summary">साफ़</string>
     <string name="clear_action">साफ़</string>
-    <string name="date">Tareekh</string>
-    <string name="duration">अवधि</string>
     <string name="home">Ghar</string>
-    <string name="inspired_designs_by">"से  डिज़ाइन प्रेरित "</string>
-    <string name="more">और</string>
-    <string name="no_files">" कोई फाइल्स नहीं"</string>
 </resources>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 995861b71..632b80a25 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -8,7 +8,6 @@
     <string name="action_add_to_playlist">Dodaj na listu...</string>
     <string name="action_clear_playing_queue">Očisti red čekanja</string>
     <string name="action_clear_playlist">Očisti listu</string>
-    <string name="action_cycle_repeat">Način ponavljanja ciklusa</string>
     <string name="action_delete">Izbriši</string>
     <string name="action_delete_from_device">Izbriši sa uređaja</string>
     <string name="action_details">Detalji</string>
@@ -18,13 +17,11 @@
     <string name="action_grant">Dopusti</string>
     <string name="action_grid_size">Veličina mreže</string>
     <string name="action_grid_size_land">Veličina mreže (vodoravno)</string>
-    <string name="action_new_playlist">Novi liste...</string>
     <string name="action_next">Sljedeće</string>
     <string name="action_play">Sviraj</string>
     <string name="action_play_next">Sviraj sljedeće</string>
     <string name="action_play_pause">Sviraj/Stani</string>
     <string name="action_previous">Prethodno</string>
-    <string name="action_re_download_artist_image">Ažuriraj sliku autora</string>
     <string name="action_remove_from_favorites">Ukloni iz favorita</string>
     <string name="action_remove_from_playing_queue">Ukloni sa reda čekanja</string>
     <string name="action_remove_from_playlist">Ukloni s liste</string>
@@ -37,15 +34,10 @@
     <string name="action_set_as_start_directory">Postavi kao početni direktorij</string>
     <string name="action_settings">"Postavke"</string>
     <string name="action_share">Dijeli</string>
-    <string name="action_show_lyrics">Prikaži tekst</string>
-    <string name="action_shuffle_album">Izmiješaj album</string>
     <string name="action_shuffle_all">Izmiješaj sve</string>
-    <string name="action_shuffle_artist">Izmiješaj izvođača</string>
     <string name="action_shuffle_playlist">Izmiješaj listu</string>
     <string name="action_sleep_timer">Brojač za spavanje</string>
     <string name="action_tag_editor">Uređivač oznaka</string>
-    <string name="action_toggle_favorite">Uključi/Isključi favorite</string>
-    <string name="action_toggle_shuffle">Uključi/Isključi način miješanja</string>
     <string name="add_action">Dodaj</string>
     <string name="add_photo">Dodaj\nfotografiju</string>
     <string name="add_playlist_title">"Dodaj na listu"</string>
@@ -53,11 +45,9 @@
     <string name="added_x_titles_to_playing_queue">U red čekanja je dodano %1$d pjesama.</string>
     <string name="album">Album</string>
     <string name="album_artist">Autor albuma</string>
-    <string name="album_desc">Opis albuma</string>
     <string name="album_or_artist_empty">Polje naslova ili autora je prazno</string>
     <string name="albums">Albumi</string>
     <!-- Android Auto -->
-    <string name="albums_label">Albumi</string>
     <string name="always">Uvijek</string>
     <string name="app_share">Hej, vidi ovaj kul svirač glazbe na: https://play.google.com/store/apps/details?id=%s</string>
     <!-- App Shortcuts -->
@@ -67,21 +57,14 @@
     <string name="app_shortcut_shuffle_all_short">Miješaj</string>
     <string name="app_shortcut_top_tracks_long">@string/my_top_tracks</string>
     <string name="app_shortcut_top_tracks_short">Najslušanije pjesme</string>
-    <string name="app_summary">Hibridna aplikacija između materijalnog dizajna i iOS-a.</string>
     <string name="app_widget_big_name">Retro glazba - Velik</string>
-    <string name="app_widget_big_name_2">Retro glazba - Velik2</string>
     <string name="app_widget_card_name">Retro glazba - Kartica</string>
     <string name="app_widget_classic_name">Retro glazba - Klasičan</string>
     <string name="app_widget_small_name">Retro glazba - Malen</string>
     <string name="artist">Autor</string>
-    <string name="artist_desc">Opis izvođača</string>
     <string name="artists">Autori</string>
-    <string name="artists_label">Autori</string>
-    <string name="at_least_one_category_must_be_enabled">Bar jedna kategorija mora biti uključena.</string>
     <string name="audio_focus_denied">Fokus zvuka odbijen.</string>
-    <string name="bass_boost_strength">Jačina pojačanja bassa</string>
     <string name="biography">Biografija</string>
-    <string name="biography_unavailable">Nismo uspjeli prona\u0107i autorovu biografiju</string>
     <string name="black_theme_name">Jednostavno crna</string>
     <string name="blacklist">Crna lista</string>
     <string name="blur">Zamagljenje</string>
@@ -97,7 +80,6 @@
     <string name="clear_playlist_x"><![CDATA[Da o\u010distim listu <b>%1$s</b>? Ovo se ne mo\u017ee poni\u0161titi!]]></string>
     <string name="color">Boja</string>
     <string name="color_theme_name">Boja</string>
-    <string name="colored_footers">Obojana podnožja</string>
     <string name="colors">Boje</string>
     <string name="could_not_create_playlist">Nije mogu\u0107e stvoriti listu.</string>
     <string name="could_not_download_album_cover">"Nije mogu\u0107e preuzeti pripadaju\u0107i omot albuma."</string>
@@ -106,36 +88,23 @@
     <string name="create_action">Stvori</string>
     <string name="created_playlist_x">Lista %1$s je stvorena.</string>
     <string name="currently_listening_to_x_by_x">Upravo slušate %1$ od autora %2$</string>
-    <string name="custom">Prilagođeno</string>
     <string name="dark_theme_name">Ponešto Tamna</string>
-    <string name="date">Datum</string>
     <string name="default_hint">Nema teksta</string>
-    <string name="delete_action">Izbriši</string>
     <string name="delete_playlist_title">Izbriši listu</string>
     <string name="delete_playlist_x"><![CDATA[Izbrisati <b>%1$s</b>?]]></string>
     <string name="delete_playlists_title">Izbriši liste</string>
-    <string name="delete_song_title">Izbriši pjesmu</string>
     <string name="delete_song_x"><![CDATA[Izbrisati <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Izbriši pjesme</string>
     <string name="delete_x_playlists"><![CDATA[Da obrišem <b>%1$d</b> lista?]]></string>
     <string name="delete_x_songs"><![CDATA[Izbrisati <b>%1$d</b> pjesama?]]></string>
     <string name="deleted_x_songs">%1$d pjesama je izbrisano.</string>
-    <string name="deleting_songs">Brišem pjesme</string>
     <string name="do_you_want_to_clear_the_blacklist">Želite li očistiti crnu listu?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Želite li ukloniti <b>%1$s</b> sa crne liste?]]></string>
     <string name="donate">Doniraj</string>
     <string name="donate_summary">Ako misliš da zaslužujem plaću za svoj rad, možeš mi ostaviti par dolara.</string>
     <string name="donation_header">Kupi mi</string>
     <string name="download_from_last_fm">Preuzmi sa Last.fm</string>
-    <string name="duration">Trajanje</string>
-    <string name="edit">Uredi</string>
-    <string name="edit_categories">Uredi kategorije</string>
-    <string name="edit_tags">Uredi oznake</string>
     <string name="empty">Prazno</string>
     <string name="equalizer">Ekvilizator</string>
-    <string name="error_loading_lyrics_from_network">Pogreška prilikom učitavanja sa mreže</string>
-    <string name="experimental">Eksperimentalno</string>
-    <string name="failed_to_save_playlist">Spremanje liste nije uspjelo (%s).</string>
     <string name="favorites">Favoriti</string>
     <string name="flat">Ravno</string>
     <string name="folders">Mape</string>
@@ -143,7 +112,6 @@
     <string name="full">Puno</string>
     <string name="genre">Žanr</string>
     <string name="genres">Žanrovi</string>
-    <string name="gradient">Gradijent</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -153,36 +121,24 @@
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
     <string name="history">Povijest</string>
-    <string name="history_label">Povijest</string>
-    <string name="holiday">Blagdan</string>
     <string name="home">Početna stranica</string>
     <string name="inserted_x_songs_into_playlist_x">Umetnuto %1$d pjesama u listu %2$s.</string>
-    <string name="inspired_designs_by">Dizajn inspiriran prema</string>
-    <string name="join_community">Pridruži se Google Plus zajednici</string>
-    <string name="join_community_summary">Ako trebaš pomoć ili imaš pitanja, Retro Music zajednica na Google Plus-u je dobro mjesto.</string>
     <string name="label_bit_rate">Bitrata</string>
-    <string name="label_details">Detalji</string>
     <string name="label_file_format">Format</string>
     <string name="label_file_name">Naziv datoteke</string>
     <string name="label_file_path">Put datoteke</string>
     <string name="label_file_size">Veličina</string>
     <string name="label_sampling_rate">Rata sampliranja</string>
     <string name="label_track_length">Duljina</string>
-    <string name="language_contributors">Suradnici za prijevode</string>
     <string name="last_added">Posljednje dodano</string>
     <string name="lets_play_something">Reproducirajmo nešto</string>
     <string name="library">Istraži</string>
-    <string name="library_categories">Kategorije biblioteke</string>
     <string name="licenses">Licence</string>
     <string name="light_theme_name">Logično bijela</string>
     <string name="listing_files">Ispisivanje datoteka</string>
-    <string name="loading">Učitavanje...</string>
     <string name="loading_products">Učitavanje proizvoda..</string>
     <string name="lyrics">Riječi</string>
-    <string name="media_route_menu_title">Odašilji uređaj</string>
-    <string name="more">Više</string>
     <string name="my_name">Moje ime</string>
-    <string name="my_playlists">Moja lista</string>
     <string name="my_top_tracks">Najslušanije pjesme</string>
     <string name="never">Nikad</string>
     <string name="new_playlist_title">Novi lista</string>
@@ -191,7 +147,6 @@
     <string name="no_artists">Nema autora</string>
     <string name="no_audio_ID">"Prvo pusti pjesmu, a onda probaj ponovo."</string>
     <string name="no_equalizer">Pojačivač nije pronađen.</string>
-    <string name="no_files">Nema datoteka</string>
     <string name="no_genres">Nema žanrova</string>
     <string name="no_lyrics_found">Tekst nije pronađen</string>
     <string name="no_playlists">Nema lista</string>
@@ -213,52 +168,36 @@
     <string name="personalize">Prilagodi</string>
     <string name="pick_from_local_storage">Odaberi iz lokalne memorije</string>
     <string name="plain">Obično</string>
-    <string name="play">Pusti</string>
-    <string name="play_all">Pusti sve</string>
     <string name="playing_notification_description">Obavijest za sviranje pruža akcije za puštanje/zaustavljanje itd.</string>
     <string name="playing_notification_name">Obavijest za sviranje</string>
     <string name="playlist_empty_text">Prazna lista</string>
     <string name="playlist_is_empty">Lista je prazna</string>
     <string name="playlist_name_empty">Ime liste</string>
     <string name="playlists">Lista</string>
-    <string name="playlists_label">Liste</string>
     <string name="pref_header_audio">Zvuk</string>
     <string name="pref_header_general">Generalno</string>
     <string name="pref_header_images">Slike</string>
     <string name="pref_header_lockscreen">Zaključani zaslon</string>
-    <string name="pref_header_now_playing_screen">Trenutno se svira</string>
     <string name="pref_header_playlists">Liste</string>
     <string name="pref_only_lollipop">"Dostupno samo na Lollipop-u."</string>
-    <string name="pref_only_nougat_mr1">"Dostupno samo na Nougat-u 7.1."</string>
-    <string name="pref_summary_about">Ljudi koji su pomogli projektu</string>
     <string name="pref_summary_album_art_on_lockscreen">Koristi trenutne prekrivače albuma kao pozadinu zaključanog zaslona.</string>
     <string name="pref_summary_audio_ducking">Obavijesti, navigacija itd.</string>
     <string name="pref_summary_blurred_album_art">Zamagljuje prekrivač albuma na zaključanom zaslonu. Može uzrokovati problema sa aplikacijama treće strane i widgetima.</string>
     <string name="pref_summary_carousel_effect">Efekt ringišpila na trenutno svirajućem zaslonu slike albuma. Teme Kartica i Zamagljena Kartica neće raditi</string>
-    <string name="pref_summary_circular_album_effect">Pokaži kružni albumski pokrivač u temama za trenutno sviranje, namijenjeno je samo za odabrane teme, ne sve</string>
     <string name="pref_summary_classic_notification">Koristi klasični dizajn obavijesti.</string>
     <string name="pref_summary_colored_app">Pozadina i Kontrolna tipka mijenja boju prema stilu albuma sa početne kartice</string>
     <string name="pref_summary_colored_app_shortcuts">Oboji prečace aplikacije u naglašenu boju. Svaki put kada promijeniš boju molim te uključi/isključi ovo da bi se primjenilo</string>
     <string name="pref_summary_colored_navigation_bar">Oboji navigacijsku traku u glavnu boju.</string>
     <string name="pref_summary_colored_notification">"Boja obavijest u boje omota albuma."</string>
-    <string name="pref_summary_day_dream">Prikažite detalje o pjesmi na dreamu prilikom reproduciranja glazbe</string>
     <string name="pref_summary_dominant_color">Najdominantnija boja bit će odabrana iz slike albuma ili autora.</string>
-    <string name="pref_summary_exclude_songs">Izopći pjesme koje su kraće od 30 sekundi</string>
     <string name="pref_summary_gapless_playback">"Može uzrokovati probleme u reprodukciji na nekim uređajima."</string>
     <string name="pref_summary_ignore_media_store_artwork">Može povećati kvalitetu slike albuma, ali može uzrokovati sporije učitavanje slike. Uključi ovo samo ako imaš problema sa slikama niske rezolucije.</string>
-    <string name="pref_summary_language_en">Prisilno promjeni jezik aplikacije na engleski (ovo je za testiranje više opcija jezika)</string>
-    <string name="pref_summary_library_categories">Konfiguriraj vidljivost i red kategorija biblioteke.</string>
     <string name="pref_summary_lock_screen">Prikazuje kontrole na zaključanom zaslonu.</string>
-    <string name="pref_summary_lock_screen_app">Prikažite sve kontrole na zaključanom zaslonu</string>
     <string name="pref_summary_open_source_licences">Detalji licence za softver otvorenog koda</string>
     <string name="pref_summary_round_corners">Zaobljeni rubovi za prozor, albumski poklopac, itd.</string>
     <string name="pref_summary_tab_titles">Uključi/Isključi nazive na donjim karticama.</string>
-    <string name="pref_summary_toggle_bottom_bar_titles">Isključi nazive sa donje navigacijske trake</string>
     <string name="pref_summary_toggle_full_screen">Uvjerljiv način</string>
-    <string name="pref_summary_toggle_genre">Ako želiš da pokazuje karticu žarnova na dnu kartica</string>
     <string name="pref_summary_toggle_headset">Počni svirati odmah nakon priključenja slušalica.</string>
-    <string name="pref_summary_toggle_navigation_bar">Sakrij samo navigacjsku traku</string>
-    <string name="pref_summary_toggle_status_bar">Sakrij samo traku statusa</string>
     <string name="pref_summary_toggle_volume">Uključi kontrole zvuka ako ima prostora u trenutno svirajućem zaslonu</string>
     <string name="pref_title_album_art_on_lockscreen">Pokaži sliku albuma</string>
     <string name="pref_title_app_shortcuts">Obojani prečaci aplikacije</string>
@@ -268,30 +207,18 @@
     <string name="pref_title_classic_notification">Klasični dizajn obavijesti</string>
     <string name="pref_title_colored_app">Prilagodljiva boja</string>
     <string name="pref_title_colored_notification">Obojana obavijest</string>
-    <string name="pref_title_day_dream">Sanjarenje</string>
-    <string name="pref_title_exclude_songs">Izopći pjesme</string>
-    <string name="pref_title_external_storage_access">Dopusti pristup vanjskoj memoriji</string>
     <string name="pref_title_gapless_playback">Puštanje bez razmaka</string>
     <string name="pref_title_general_theme">Generalna tema</string>
-    <string name="pref_title_gradient_color">Odaberi boju</string>
     <string name="pref_title_ignore_media_store_artwork">Ignoriraj slike Medijskog Spremnika</string>
     <string name="pref_title_last_added_interval">Zadnje dodan interval liste</string>
     <string name="pref_title_lock_screen">Kontrole punog zaslona</string>
-    <string name="pref_title_lock_screen_app">Retro zaključani zaslon</string>
-    <string name="pref_title_lyrics_options">Opcije teksta</string>
     <string name="pref_title_navigation_bar">Obojana navigacijska traka</string>
     <string name="pref_title_now_playing_screen_appearance">Izgled</string>
     <string name="pref_title_open_source_licences">Licence Otvorenog Koda</string>
     <string name="pref_title_round_corners">Rubovi kutova</string>
-    <string name="pref_title_toggle_bottom_bar_titles">Isključi nazive</string>
     <string name="pref_title_toggle_carousel_effect">Efekt ringišpila</string>
-    <string name="pref_title_toggle_circular_album_effect">Kružni album</string>
     <string name="pref_title_toggle_dominant_color">Dominantna boja</string>
     <string name="pref_title_toggle_full_screen">Aplikacija u punom zaslonu</string>
-    <string name="pref_title_toggle_genre">Pokaži žanr</string>
-    <string name="pref_title_toggle_language_en">Engleski jezik</string>
-    <string name="pref_title_toggle_navigation_bar">Navigacijska traka</string>
-    <string name="pref_title_toggle_status_bar">Traka statusa</string>
     <string name="pref_title_toggle_tab_titles">Imena kartica</string>
     <string name="pref_title_toggle_toggle_headset">Automatsko sviranje</string>
     <string name="pref_title_toggle_volume">Kontrole zvuka</string>
@@ -300,10 +227,8 @@
     <string name="primary_color_desc">Glavna boja teme, zadano je plavo-siva, zasad funkcionira sa tamnim bojama</string>
     <string name="purchase">Kupi</string>
     <string name="queue">Red čekanja</string>
-    <string name="queue_label">Red</string>
     <string name="rate_app">Ocijeni aplikaciju</string>
     <string name="rate_on_google_play_summary">Ako voliš ovu aplikaciju, obavijesti nas u Google Play trgovini za bolje iskustvo</string>
-    <string name="recent_activity">Nedavna aktivnost</string>
     <string name="recent_albums">Nedavni albumi</string>
     <string name="recent_artists">Nedavni autori</string>
     <string name="remove_action">Makni</string>
@@ -313,111 +238,62 @@
     <string name="remove_song_x_from_playlist"><![CDATA[Da maknem pjesmu <b>%1$s</b> sa liste?]]></string>
     <string name="remove_songs_from_playlist_title">Makni pjesme sa liste</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[Da maknem <b>%1$d</b> pjesme sa liste?]]></string>
-    <string name="rename_action">Promijeni ime</string>
     <string name="rename_playlist_title">Promijeni ime listi</string>
-    <string name="reset_action">Resetiraj</string>
     <string name="reset_artist_image">Resetiraj sliku autora</string>
     <string name="restore">Vrati</string>
     <string name="restored_previous_purchase_please_restart">Vraćena prošla kupnja. Molim te ponovo pokreni aplikaciju da bi koristio sve usluge.</string>
     <string name="restored_previous_purchases">Vraćene prijašnje kupnje.</string>
     <string name="restoring_purchase">Vraćam kupnju...</string>
-    <string name="retro">Retro</string>
     <string name="retro_equalizer">Retri Pojačivač</string>
-    <string name="saf_delete_failed">Brisanje datoteke neuspješno: %s</string>
     <!-- SAF -->
-    <string name="saf_error_uri">Nemogu dohvatiti SAF URL</string>
-    <string name="saf_guide_slide1_description">Otvori navigacijsku ladicu</string>
-    <string name="saf_guide_slide1_description_before_o">Uključi \'Prikaži SD karticu\' u preljevajućem meniju</string>
     <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s treba pristup SD kartici</string>
-    <string name="saf_guide_slide2_description">Trebaš odabrati početni direktorij tvoje SD kartice</string>
-    <string name="saf_guide_slide2_title">Odaberi svoju SD karticu u navigacijskoj ladici</string>
-    <string name="saf_guide_slide3_description">Ne otvaraj podmape</string>
-    <string name="saf_guide_slide3_title">Dodirni \'odaberi\' gumb na dnu zaslona</string>
-    <string name="saf_pick_file">Pristup datoteci potreban. Odaberi %s</string>
-    <string name="saf_pick_sdcard">Pristup SD kartici potreban. Molim te odaberi početni direktorij SD kartice</string>
-    <string name="saf_write_failed">Zapisivanje datoteke neuspješno: %s</string>
     <string name="save_playlist_title">Spremi kao datoteku</string>
     <string name="saved_playlist_to">Spremljena lista na %s.</string>
     <string name="saving_changes">Spremanje promjena</string>
-    <string name="saving_tags">Spremam oznake</string>
-    <string name="saving_to_file">Spremanje u datoteku</string>
     <string name="scanned_files">Skenirano %1$d od %2$d datoteka.</string>
     <string name="search_hint">Pretraži svoju biblioteku...</string>
-    <string name="see_all">Vidi sve</string>
-    <string name="select_preset">Odaberi predložak</string>
     <string name="set_artist_image">Postavi sliku autora</string>
     <string name="shuffle">Izmješaj</string>
     <string name="simple">Jednostavno</string>
     <string name="sleep_timer_canceled">Brojač sna otkazan.</string>
     <string name="sleep_timer_set">Brojač sna postavljen na %d minuta od sad.</string>
-    <string name="slide_unlock">Potegni za otključavanje</string>
-    <string name="solid">Čvrsto</string>
     <string name="song">Pjesma</string>
     <string name="song_duration">Trajanje pjesme</string>
     <string name="songs">Pjesme</string>
     <string name="sort_order">Način poredavanja</string>
     <string name="speech_not_supported">Žao nam je! Vaš uređaj ne podržava unos govorom</string>
     <string name="speech_prompt">Pretražite svoju biblioteku</string>
-    <string name="suggestions">Prijedlozi</string>
-    <string name="summary_material_design_city_wallpaper">Pozadine grada materijalnog dizajna sa www.techjuice.pk web stranice</string>
-    <string name="summary_material_design_icons">Sve ikone koristili smo s ovih stranica www.flaticon.com i www.materialdesignicons.com</string>
     <string name="summary_user_info">Pokaži samo svoje ime na početnom zaslonu</string>
     <string name="support_development">Podrži razvoj</string>
-    <string name="support_development_summary">Ako uživaš u Retro Music Player-u, uzmi u obzir donaciju kao znak podrške mojem radu.</string>
     <!-- Message displayed when tag editing fails -->
-    <string name="tag_edit_error">Desila se greška prilikom uređivanja oznaka.</string>
-    <string name="tag_editor_check_permission">Provjeravam za dozvole</string>
-    <string name="tag_editor_document_tree_message">Odaberi direktorij eksterne memorije</string>
-    <string name="tag_editor_document_tree_permission_failed">Čini se da nemamo dozvolu za uređivanje datoteka. Dvaput provjeri direktorij u biraču datoteka.</string>
-    <string name="tag_error_kitkat">Desila se greška prilikom uređivanja oznaka. Je li datoteka spremljena na SD Kartici? Ako je, Googlaj have made tag editing impossible for this file.</string>
-    <string name="tag_error_lollipop">Desila se greška prilikom uređivanja oznaka. Ako je datoteka spremljena na SD Kartici, Retro Glazba možda nema dozvolu da bi joj pristupila.</string>
-    <string name="tag_retrieve_error">Desila se greška prilikom uzimanja oznaka.</string>
-    <string name="text">Tekst</string>
     <string name="thank_you">Hvala ti!</string>
     <string name="the_audio_file">Zvučna datoteka</string>
     <string name="this_month">Ovaj mjesec</string>
     <string name="this_week">Ovaj tjedan</string>
     <string name="this_year">Ova godina</string>
     <string name="tiny">Sitno</string>
-    <string name="title">Naziv</string>
     <string name="title_dashboard">Kontrolna ploča</string>
-    <string name="title_desc">Opis naslova</string>
     <string name="title_good_afternoon">Dobra večer</string>
     <string name="title_good_day">Dobar dan</string>
     <string name="title_good_evening">Dobra večer</string>
     <string name="title_good_morning">Dobro jutro</string>
     <string name="title_good_night">Laku noć</string>
-    <string name="title_home">Početna</string>
-    <string name="title_material_design_city_wallpaper">Pozadina grada</string>
-    <string name="title_material_design_icons">Ikone</string>
-    <string name="title_notifications">Obavijesti</string>
     <string name="title_user_info">Koje ti je ime</string>
     <string name="today">Danas</string>
-    <string name="toggle_lyrics_size">Uključi/Isključi veličinu teksta</string>
-    <string name="tool_tip_see_all">Vidi sve pjesme</string>
     <string name="top_albums">Top albumi</string>
     <string name="top_artists">Top autori</string>
-    <string name="top_tracks">Top pjesme</string>
-    <string name="top_tracks_label">Top pjesme</string>
     <string name="track_hint">"Traka (2 za traku 2 ili 3004 za CF3 traku 4"</string>
     <string name="track_list">Broj pjesme</string>
     <string name="translate">Prevedi</string>
-    <string name="translate_summary">Pomogni prevesti Retro glazbu na svoj materinji jezik.</string>
     <string name="unplayable_file">Ne mo\u017eemo reproducirati ovu pesmu.</string>
     <string name="up_next">Sljedeće</string>
-    <string name="update">Ažuriraj</string>
     <string name="update_image">Ažuriraj sliku</string>
-    <string name="updated_artist_image">Slika autora postavljena.</string>
     <string name="updating">Ažuriranje...</string>
     <string name="version">Verzija</string>
-    <string name="virtualizer_strength">Jačina Virtualizatora</string>
-    <string name="volume_control">Kontrole zvuka</string>
     <string name="web_search">Web pretraga</string>
     <string name="what_do_you_want_to_share">Što želiš podijeliti?</string>
     <string name="window">Prozor</string>
     <string name="x_has_been_set_as_ringtone">Postavi %1$ kao tvoju zvonjavu</string>
     <string name="x_selected">%1$d odabran</string>
     <string name="year">Godina</string>
-    <string name="you_have_to_select_at_least_one_category">Moraš odabrati bar jednu kategoriju</string>
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index ec9289eb5..e80f22b6b 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -8,7 +8,6 @@
     <string name="action_add_to_playlist">Hozzáadás a lejátszási listához...</string>
     <string name="action_clear_playing_queue">Lejátszási lista törlése</string>
     <string name="action_clear_playlist">Lejátszási lista törlése</string>
-    <string name="action_cycle_repeat">Ismétlés üzemmód</string>
     <string name="action_delete">Törlés</string>
     <string name="action_delete_from_device">Törlés az eszközről</string>
     <string name="action_details">Részletek</string>
@@ -18,13 +17,11 @@
     <string name="action_grant">Engedélyezés</string>
     <string name="action_grid_size">Rácsméret</string>
     <string name="action_grid_size_land">Rácsméret</string>
-    <string name="action_new_playlist">Új lejátszási lista...</string>
     <string name="action_next">Következő</string>
     <string name="action_play">Lejátszás</string>
     <string name="action_play_next">Lejátszás következőnek</string>
     <string name="action_play_pause">Lejátszás/Szünet</string>
     <string name="action_previous">Előző</string>
-    <string name="action_re_download_artist_image">Előadó képének frissítése</string>
     <string name="action_remove_from_favorites">Eltávolítás a kedvencekből</string>
     <string name="action_remove_from_playing_queue">Eltávolítás a lejátszási sorból</string>
     <string name="action_remove_from_playlist">Eltávolítás a lejátszási listából</string>
@@ -37,15 +34,10 @@
     <string name="action_set_as_start_directory">Beállítás kezdő könyvtárként</string>
     <string name="action_settings">"Beállítások"</string>
     <string name="action_share">Megosztás</string>
-    <string name="action_show_lyrics">Dalszöveg megjelenítése</string>
-    <string name="action_shuffle_album">Album dalainak keverése</string>
     <string name="action_shuffle_all">Összes keverése</string>
-    <string name="action_shuffle_artist">Előadó dalainak keverése</string>
     <string name="action_shuffle_playlist">Lejátszási lista keverése</string>
     <string name="action_sleep_timer">Elalvás időzítő</string>
     <string name="action_tag_editor">Címkeszerkesztő</string>
-    <string name="action_toggle_favorite">A kedvenc váltása</string>
-    <string name="action_toggle_shuffle">A véletlenszerű lejátszás megváltoztatása</string>
     <string name="add_action">Hozzáad</string>
     <string name="add_photo">Hozzáadás</string>
     <string name="add_playlist_title">"Hozzáadás a lejátszási listához"</string>
@@ -53,11 +45,9 @@
     <string name="added_x_titles_to_playing_queue">%1$d dal hozzáadva a lejátszási sorhoz.</string>
     <string name="album">Album</string>
     <string name="album_artist">Album előadó</string>
-    <string name="album_desc">Album leírás</string>
     <string name="album_or_artist_empty">A cím vagy az előadó üres.</string>
     <string name="albums">Albumok</string>
     <!-- Android Auto -->
-    <string name="albums_label">Albumok</string>
     <string name="always">Mindig</string>
     <string name="app_share">Hé, nézd meg ezt a hűvös zenelejátszót: https://play.google.com/store/apps/details?id=%s</string>
     <!-- App Shortcuts -->
@@ -67,22 +57,15 @@
     <string name="app_shortcut_shuffle_all_short">Keverés</string>
     <string name="app_shortcut_top_tracks_long">@string/my_top_tracks</string>
     <string name="app_shortcut_top_tracks_short">Top Dalok</string>
-    <string name="app_summary">Hibrid alkalmazás az Anyagterv és az iOS között.</string>
     <string name="app_widget_big_name">Retro Music - Nagy</string>
-    <string name="app_widget_big_name_2">Retro Music - Nagy2</string>
     <string name="app_widget_card_name">Retro music - Kártya</string>
     <string name="app_widget_classic_name">Retro Music - klasszikus</string>
     <string name="app_widget_small_name">Retro Music - Kicsi</string>
     <string name="artist">Előadó</string>
-    <string name="artist_desc">Előadó leírása</string>
     <string name="artists">Előadók</string>
-    <string name="artists_label">Előadók</string>
-    <string name="at_least_one_category_must_be_enabled">Legalább egy kategóriát engedélyezni kell.</string>
     <string name="audio_focus_denied">Audiofókusz megtagadva.</string>
     <string name="audio_settings_summary">Állítsa be a hangbeállításokat és a hangsínszbályzott</string>
-    <string name="bass_boost_strength">Basszuskiemelés erőssége</string>
     <string name="biography">Életrajz</string>
-    <string name="biography_unavailable">Az el\u0151ad\u00f3 \u00e9letrajza nem tal\u00e1lhat\u00f3.</string>
     <string name="black_theme_name">Csak fekete</string>
     <string name="blacklist">Feketlista</string>
     <string name="blur">Elhomályosít</string>
@@ -98,7 +81,6 @@
     <string name="clear_playlist_x"><![CDATA[Biztosan t\u00f6rli a(z) <b>%1$s</b> lej\u00e1tsz\u00e1si lista tartalm\u00e1t? Ez a m\u0171velet nem visszavonhat\u00f3!]]></string>
     <string name="color">Szín</string>
     <string name="color_theme_name">Szín</string>
-    <string name="colored_footers">Színes lábjegyzetek</string>
     <string name="colors">Színek</string>
     <string name="could_not_create_playlist">Nem siker\u00fclt l\u00e9trehozni a lej\u00e1tsz\u00e1si list\u00e1t.</string>
     <string name="could_not_download_album_cover">"Nem siker\u00fclt let\u00f6lteni a megfelel\u0151 albumbor\u00edt\u00f3t."</string>
@@ -107,36 +89,23 @@
     <string name="create_action">Létrehozás</string>
     <string name="created_playlist_x">%1$s lejátszási lista létrehozva.</string>
     <string name="currently_listening_to_x_by_x">Jelenleg a(z) %1$s-t hallgatja %2$s-tól.</string>
-    <string name="custom">Módositott</string>
     <string name="dark_theme_name">Kinda sötét</string>
-    <string name="date">Dátum</string>
     <string name="default_hint">Nincs dalszöveg</string>
-    <string name="delete_action">Törlés</string>
     <string name="delete_playlist_title">Lejátszási lista törlése</string>
     <string name="delete_playlist_x"><![CDATA[Biztosan törli a(z) <b>%1$s</b> lejátszási listát?]]></string>
     <string name="delete_playlists_title">Lejátszási lista törlése</string>
-    <string name="delete_song_title">Dal törlése</string>
     <string name="delete_song_x"><![CDATA[Biztosan törli a(z) <b>%1$s</b> dalt?]]></string>
-    <string name="delete_songs_title">Dalok törlése</string>
     <string name="delete_x_playlists"><![CDATA[Biztosan töröl <b>%1$d</b> lejátszási listát?]]></string>
     <string name="delete_x_songs"><![CDATA[Biztosan töröl <b>%1$d</b> dalt?]]></string>
     <string name="deleted_x_songs">%1$d dal törölve.</string>
-    <string name="deleting_songs">Dalok törlése</string>
     <string name="do_you_want_to_clear_the_blacklist">Szeretné törölni a feketelistát?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Szeretné eltávolítani <b>%1$s</b>  a feketelistáról?]]></string>
     <string name="donate">Adományozás</string>
     <string name="donate_summary">Ha ön szerint megéri a munkám, itt adományozhat egy csekély összeget.</string>
     <string name="donation_header">Vegyél nekem egy</string>
     <string name="download_from_last_fm">Letöltés a Last.fm-ről</string>
-    <string name="duration">Hossz</string>
-    <string name="edit">Szerkesztés</string>
-    <string name="edit_categories">Kategóriák módosítása</string>
-    <string name="edit_tags">Címkék szerkesztése</string>
     <string name="empty">Üres</string>
     <string name="equalizer">Hangszínszabályzó</string>
-    <string name="error_loading_lyrics_from_network">Hiba történt a hálózatról való betöltés során</string>
-    <string name="experimental">Kisérleti</string>
-    <string name="failed_to_save_playlist">Nem sikerült menteni a lejátszási listát (%s).</string>
     <string name="favorites">Kedvencek</string>
     <string name="flat">Sima</string>
     <string name="folders">Mappák</string>
@@ -146,7 +115,6 @@
     <string name="general_settings_title">Nézz és élvezd</string>
     <string name="genre">Műfaj</string>
     <string name="genres">Műfajok</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>
@@ -156,36 +124,24 @@
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
     <string name="history">Előzmények</string>
-    <string name="history_label">Történet</string>
-    <string name="holiday">Ünnep</string>
     <string name="home">Kezdőlap</string>
     <string name="inserted_x_songs_into_playlist_x">%1$d dal hozzáadva a(z) %2$s lejátszási listához.</string>
-    <string name="inspired_designs_by">Inspirált tervei:</string>
-    <string name="join_community">Csatlakozzon a Google Plus közösséghez</string>
-    <string name="join_community_summary">Ha segítségre vagy kérdéseire van szüksége, a Google Pluszban található Retro Music közösség jó kiindulópont.</string>
     <string name="label_bit_rate">Bitráta</string>
-    <string name="label_details">Részletek</string>
     <string name="label_file_format">Formátum</string>
     <string name="label_file_name">Fájlnév</string>
     <string name="label_file_path">Útvonal</string>
     <string name="label_file_size">Méret</string>
     <string name="label_sampling_rate">Mintavételezés</string>
     <string name="label_track_length">Hossz</string>
-    <string name="language_contributors">Nyelvi hozzájárulók</string>
     <string name="last_added">Legfrissebb dalok</string>
     <string name="lets_play_something">Játsszunk valamit</string>
     <string name="library">Könyvtár</string>
-    <string name="library_categories">Könyvtár kategóriák</string>
     <string name="licenses">Licencek</string>
     <string name="light_theme_name">Világos fehér</string>
     <string name="listing_files">Fájlok betöltése</string>
-    <string name="loading">Betöltés...</string>
     <string name="loading_products">Termékek betöltése...</string>
     <string name="lyrics">Dalszöveg</string>
-    <string name="media_route_menu_title">Cast eszköz</string>
-    <string name="more">Több</string>
     <string name="my_name">Nevem</string>
-    <string name="my_playlists">Én lejátszási listám</string>
     <string name="my_top_tracks">Toplista</string>
     <string name="never">Soha</string>
     <string name="new_playlist_title">Új lejátszási lista</string>
@@ -194,7 +150,6 @@
     <string name="no_artists">Nincsenek előadók</string>
     <string name="no_audio_ID">"Először játsszon le egy dalt, majd próbálja újra."</string>
     <string name="no_equalizer">Nem található hangszínszabályzó.</string>
-    <string name="no_files">Nincs fájl</string>
     <string name="no_genres">Nincsnek műfajok</string>
     <string name="no_lyrics_found">Nincs talált dalszöveget</string>
     <string name="no_playlists">Nincsenek lejátszási listák</string>
@@ -219,52 +174,36 @@
     <string name="personalize_settings_summary">A most játszott és felhasználói felület testreszabása</string>
     <string name="pick_from_local_storage">Kiválasztás az eszközről</string>
     <string name="plain">Egyszerű</string>
-    <string name="play">Lejátszás</string>
-    <string name="play_all">Összes lejátszása</string>
     <string name="playing_notification_description">A lejátszási értesítés lejátszási / szüneteltetési intézkedéseket tartalmaz.</string>
     <string name="playing_notification_name">Lejátszás értesítés</string>
     <string name="playlist_empty_text">Üres lejátszási lista</string>
     <string name="playlist_is_empty">A lejátszási lista üres</string>
     <string name="playlist_name_empty">Lejátszási lista neve</string>
     <string name="playlists">Lejátszási listák</string>
-    <string name="playlists_label">Lejátszási listák</string>
     <string name="pref_header_audio">Hang</string>
     <string name="pref_header_general">Általános</string>
     <string name="pref_header_images">Képek</string>
     <string name="pref_header_lockscreen">Zárképernyő</string>
-    <string name="pref_header_now_playing_screen">Most játszott</string>
     <string name="pref_header_playlists">" lejátszási lista"</string>
     <string name="pref_only_lollipop">"Csak Android 5.0-tól (Lollipop) érhető el."</string>
-    <string name="pref_only_nougat_mr1">"Csak Android 7.1-től (Nougat) érhető el."</string>
-    <string name="pref_summary_about">Azok a személyek, akik segítettek a projektben</string>
     <string name="pref_summary_album_art_on_lockscreen">Jelenlegi dal albumborítójának használata a zárképernyő háttérképeként.</string>
     <string name="pref_summary_audio_ducking">Beérkező értesítéskor a lejátszás hangereje lecsökken, majd az értesítés végén visszaáll az eredeti hangerőre.</string>
     <string name="pref_summary_blurred_album_art">Albumborító elhomályosítása a zárképernyőn. Ez problémákat okozhat a harmadik féltől származó alkalmazásoknál és widgeteknél.</string>
     <string name="pref_summary_carousel_effect">Körhinta effektus mostantól a képernyőn megjelenő albumlemezen. Ne feledje, hogy a kártya és a Blur Card téma nem fog működni</string>
-    <string name="pref_summary_circular_album_effect">Jelenítse meg a kör albumborítóját a most játszott képernyő-témákban, ez a kiválasztott témákhoz nem minden</string>
     <string name="pref_summary_classic_notification">Használja a klasszikus értesítési tervet.</string>
     <string name="pref_summary_colored_app">Háttér, A vezérlőgomb színe a lejátszók képernyőjén megjelenő albumminták szerint változik</string>
     <string name="pref_summary_colored_app_shortcuts">Színek az alkalmazás parancsikonjai az akcentus színében. Minden alkalommal, amikor megváltoztatta a színét, kérjük, kapcsolja be ezt a hatást</string>
     <string name="pref_summary_colored_navigation_bar">Navigációs sáv színezése az alapértelmezett színnel.</string>
     <string name="pref_summary_colored_notification">"\u00c9rtes\u00edt\u00e9sek sz\u00ednez\u00e9se az albumbor\u00edt\u00f3 sz\u00edn\u00e9vel."</string>
-    <string name="pref_summary_day_dream">Megmutatja a részleteket az álomról, amikor zenél</string>
     <string name="pref_summary_dominant_color">A legtöbb domináns színt az album vagy az előadó borítója veszi fel.</string>
-    <string name="pref_summary_exclude_songs">A 30 másodpercnél rövidebb dalok kizárása.</string>
     <string name="pref_summary_gapless_playback">"Lejátszási problémákat okozhat néhány eszközön."</string>
     <string name="pref_summary_ignore_media_store_artwork">Növelheti az albumborítók minőségét, de lassabban tölti be a képeket. Csak akkor engedélyezze, ha az albumborítók rossz minőségben jelennek meg.</string>
-    <string name="pref_summary_language_en">Az alkalmazás nyelvének erőteljesen angol nyelvre történő módosítása (ez többnyelvű opció tesztelésére szolgál)</string>
-    <string name="pref_summary_library_categories">A láthatóság és a könyvtári kategóriák sorrendjének beállítása.</string>
     <string name="pref_summary_lock_screen">Retro zene zárolása a képernyőn.</string>
-    <string name="pref_summary_lock_screen_app">A teljes képernyők megjelenítése a lezárási képernyőn</string>
     <string name="pref_summary_open_source_licences">A nyílt forráskódú szoftverek licence részletei</string>
     <string name="pref_summary_round_corners">Sarokszegélyek az ablakhoz, albumművészethez stb.</string>
     <string name="pref_summary_tab_titles">Az alsó fül címének engedélyezése / tiltása.</string>
-    <string name="pref_summary_toggle_bottom_bar_titles">A címek letiltása a navigációs sáv alsó részén</string>
     <string name="pref_summary_toggle_full_screen">immersív mód</string>
-    <string name="pref_summary_toggle_genre">Ha azt szeretné, hogy megjelenítse a műfajfüvet a lapok alján</string>
     <string name="pref_summary_toggle_headset">Indítsa el a lejátszást, amikor a fejhallgató csatlakoztatva van.</string>
-    <string name="pref_summary_toggle_navigation_bar">Csak a navigációs sáv elrejtése</string>
-    <string name="pref_summary_toggle_status_bar">Csak az  állapot sáv elrejtése</string>
     <string name="pref_summary_toggle_volume">Ha van szabad hely a képernyőn engedélyezett hangerőszabályzókkal</string>
     <string name="pref_title_album_art_on_lockscreen">Az albumborító megjelenítés</string>
     <string name="pref_title_app_shortcuts">Színezett alkalmazás hivatkozások</string>
@@ -274,30 +213,18 @@
     <string name="pref_title_classic_notification">Klasszikus értesítési terv</string>
     <string name="pref_title_colored_app">Adaptív szín</string>
     <string name="pref_title_colored_notification">Színezett értesítés</string>
-    <string name="pref_title_day_dream">Álmodozás</string>
-    <string name="pref_title_exclude_songs">Dalok kizárása</string>
-    <string name="pref_title_external_storage_access">Adjon hozzáférést a külső tárolóhoz</string>
     <string name="pref_title_gapless_playback">Áttűnéses lejátszás</string>
     <string name="pref_title_general_theme">Általános téma</string>
-    <string name="pref_title_gradient_color">Válasszon színt</string>
     <string name="pref_title_ignore_media_store_artwork">A médiatár albumborítók figyelmen kívül hagyása</string>
     <string name="pref_title_last_added_interval">Utoljára hozzáadott lejátszási lista intervalluma</string>
     <string name="pref_title_lock_screen">Teljesképernyős Kezelőszervek</string>
-    <string name="pref_title_lock_screen_app">Retro zárképernyő</string>
-    <string name="pref_title_lyrics_options">Dalszöveg beállítás</string>
     <string name="pref_title_navigation_bar">Színezett navigációs sáv</string>
     <string name="pref_title_now_playing_screen_appearance">Bevezető</string>
     <string name="pref_title_open_source_licences">Nyílt forráskódú licencek</string>
     <string name="pref_title_round_corners">Sarokélek</string>
-    <string name="pref_title_toggle_bottom_bar_titles">A címek letiltása</string>
     <string name="pref_title_toggle_carousel_effect">Körhinta hatás</string>
-    <string name="pref_title_toggle_circular_album_effect">Kör album</string>
     <string name="pref_title_toggle_dominant_color">Domináns szín</string>
     <string name="pref_title_toggle_full_screen">Teljesképernyős alkalmazás</string>
-    <string name="pref_title_toggle_genre">A műfaj mgjelenítése</string>
-    <string name="pref_title_toggle_language_en">Angol nyelv</string>
-    <string name="pref_title_toggle_navigation_bar">Navigációs sáv</string>
-    <string name="pref_title_toggle_status_bar">Állapot sáv</string>
     <string name="pref_title_toggle_tab_titles">Fülek címei</string>
     <string name="pref_title_toggle_toggle_headset">Automatikus lejátszás</string>
     <string name="pref_title_toggle_volume">Hangerőszabályzók</string>
@@ -306,10 +233,8 @@
     <string name="primary_color_desc">Az elsődleges téma színe, alapértelmezés szerint kék szürke, jelenleg sötét színekkel működik</string>
     <string name="purchase">Vásárlás</string>
     <string name="queue">Sorban áll</string>
-    <string name="queue_label">Sorban áll</string>
     <string name="rate_app">Értékeld az alkalmazást</string>
     <string name="rate_on_google_play_summary">Szereted ezt az app-ot a Google Play áruházban, hogy jobb élményt nyújtsunk</string>
-    <string name="recent_activity">Legutóbbi tevékenység</string>
     <string name="recent_albums">Legutóbbi albumok</string>
     <string name="recent_artists">Legújabb előadók</string>
     <string name="remove_action">Eltávolítás</string>
@@ -319,112 +244,62 @@
     <string name="remove_song_x_from_playlist"><![CDATA[Biztosan eltávolítja a(z) <b>%1$s</b> dalt a lejátszási listából?]]></string>
     <string name="remove_songs_from_playlist_title">Dalok eltávolítása a lejátszási listából</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[Biztosan eltávolít <b>%1$d</b> dalt a lejátszási listából?]]></string>
-    <string name="rename_action">Átnevezés</string>
     <string name="rename_playlist_title">Lejátszási lista átnevezése</string>
-    <string name="reset_action">Visszaállítás</string>
     <string name="reset_artist_image">Az előadó képének visszaállítása</string>
     <string name="restore">Visszaállítás</string>
     <string name="restored_previous_purchase_please_restart">Az előző vásárlás helyreállítása. Kérjük, indítsa újra az alkalmazást az összes funkció használatához.</string>
     <string name="restored_previous_purchases">Korábbi vásárlások visszaállítva.</string>
     <string name="restoring_purchase">A vásárlás visszaállítása...</string>
-    <string name="retro">Retro</string>
     <string name="retro_equalizer">Retro Hangszínszabályzó</string>
-    <string name="saf_delete_failed">A fájl törlése sikertelen:%s</string>
     <!-- SAF -->
-    <string name="saf_error_uri">Nem lehet SAF URI</string>
-    <string name="saf_guide_slide1_description">Nyissa meg a navigációs fiókot</string>
-    <string name="saf_guide_slide1_description_before_o">Engedélyezze az \"SD kártya megjelenítése\" lehetőséget a túlcsordulási menüben</string>
     <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s-nak szüksége van az SD kártya elérésére</string>
-    <string name="saf_guide_slide2_description">Meg kell választanod az SD-kártya gyökérkönyvtárát</string>
-    <string name="saf_guide_slide2_title">Válassza ki az SD kártyát a navigációs fiókban</string>
-    <string name="saf_guide_slide3_description">Ne nyisson semmilyen almappát</string>
-    <string name="saf_guide_slide3_title">Érintse meg a \"kiválasztás\" gombot a képernyő alján</string>
-    <string name="saf_pick_file">Fájl eléréséhez szükséges. Szed%s</string>
-    <string name="saf_pick_sdcard">SD kártya szükséges. Kérjük, vegye fel az SD kártya gyökérkönyvtárát</string>
-    <string name="saf_write_failed">A fájl írása sikertelen:%s</string>
     <string name="save_playlist_title">Mentés fájlként</string>
     <string name="saved_playlist_to">Lejátszási lista mentve ide: %s.</string>
     <string name="saving_changes">Változások mentése</string>
-    <string name="saving_tags">Címkék mentése</string>
-    <string name="saving_to_file">Mentés fájlba...</string>
     <string name="scanned_files">%1$d/%2$d fájl beolvasva.</string>
     <string name="search_hint">Keresés a könyvtárban...</string>
-    <string name="see_all">Mutasd azt összest</string>
-    <string name="select_preset">Válassza a előre beállítottat</string>
     <string name="set_artist_image">Állítsa be az előadó képét</string>
     <string name="shuffle">Keverés</string>
     <string name="simple">Egyszerű</string>
     <string name="sleep_timer_canceled">Elalvás időzítő törölve.</string>
     <string name="sleep_timer_set">Elalvás időzítő beállítva, mostantól számított %d percre.</string>
-    <string name="slide_unlock">Csúsztatás a feloldáshoz</string>
-    <string name="solid">Szilárd</string>
     <string name="song">Dal</string>
     <string name="song_duration">Dal hossza</string>
     <string name="songs">Dalok</string>
     <string name="sort_order">Sorrend</string>
     <string name="speech_not_supported">Sajnálom! A készülék nem támogatja a beszédet</string>
     <string name="speech_prompt">Keresés a könyvtárban</string>
-    <string name="suggestions">Javaslatok</string>
-    <string name="summary_material_design_city_wallpaper">A www.techjuice.pk weboldalon található anyagok tervezése városi tapéta</string>
-    <string name="summary_material_design_icons">Minden olyan ikonra vonatkozóan, amelyet ezen webhelyekről a www.flaticon.com vagy a www.materialdesignicons.com weboldalon használunk</string>
     <string name="summary_user_info">Csak mutassa meg a nevét a kezdőképernyőn</string>
     <string name="support_development">Fejlesztés támogatás</string>
-    <string name="support_development_summary">Ha a Retro Music Player használatával élvezni szeretné az adományt, mint munkám támogatását.</string>
     <!-- Message displayed when tag editing fails -->
-    <string name="tag_edit_error">Hiba történt a címkék szerkesztése során.</string>
-    <string name="tag_editor_check_permission">Az engedélyek ellenőrzése</string>
-    <string name="tag_editor_document_tree_message">Válassza ki a külső tárhelyet</string>
-    <string name="tag_editor_document_tree_permission_failed">Úgy tűnik, hogy nincs engedélyünk a fájlok szerkesztésére. Duplán ellenőrizze a fájlválasztó könyvtárát.</string>
-    <string name="tag_error_kitkat">Hiba történt a címkék szerkesztése során. A fájl az SD kártyán van? Ha igen, akkor a Google a címke szerkesztését képtelenné tette.</string>
-    <string name="tag_error_lollipop">Hiba történt a címkék szerkesztése során. Ha a fájlt SD-kártyán tárolja, akkor a Retro Music nem rendelkezik hozzáféréssel.</string>
-    <string name="tag_retrieve_error">Hiba történt a címkék lekérésekor.</string>
-    <string name="text">Szöveg</string>
     <string name="thank_you">Köszönöm!</string>
     <string name="the_audio_file">A hangfájlt</string>
     <string name="this_month">Ez a hónap</string>
     <string name="this_week">Ez a hét</string>
     <string name="this_year">Ez az év</string>
     <string name="tiny">Tiny</string>
-    <string name="title">Cím</string>
     <string name="title_dashboard">Műszerfal</string>
-    <string name="title_desc">Cím leírása</string>
     <string name="title_good_afternoon">Jó napot</string>
     <string name="title_good_day">Jó nap</string>
     <string name="title_good_evening">Jó estét</string>
     <string name="title_good_morning">Jó reggelt</string>
     <string name="title_good_night">Jó éjszakát</string>
-    <string name="title_home">Kezdőlap</string>
-    <string name="title_material_design_city_wallpaper">Városi háttérkép</string>
-    <string name="title_material_design_icons">Ikonok</string>
-    <string name="title_notifications">Értesitések</string>
     <string name="title_user_info">Mi a neved</string>
     <string name="today">Ma</string>
-    <string name="toggle_lyrics_size">Toggle szövegméret</string>
-    <string name="tool_tip_see_all">Mutasd az összes zenét</string>
     <string name="top_albums">Legjobb albumok</string>
     <string name="top_artists">Legjobb előadók</string>
-    <string name="top_tracks">Legjobb számok</string>
-    <string name="top_tracks_label">Legjobb zeneszámok</string>
     <string name="track_hint">"Dal sorszáma az albumban"</string>
     <string name="track_list">Sáv szám</string>
     <string name="translate">Fordítás</string>
-    <string name="translate_summary">Segítsen lefordítani a Retro music-ot a saját nyelvére.</string>
     <string name="unplayable_file">Nem lehet lej\u00e1tszani ezt a dalt.</string>
     <string name="up_next">A következő</string>
-    <string name="update">Frissités</string>
     <string name="update_image">Kép frissítése</string>
-    <string name="updated_artist_image">Az előadó képe frissült.</string>
     <string name="updating">Frissítés...</string>
-    <string name="user_profile_summary">Profil és banner kép módosítása</string>
     <string name="version">Verzió</string>
-    <string name="virtualizer_strength">Virtualizáló erő</string>
-    <string name="volume_control">Hangerőszabályozó</string>
     <string name="web_search">Internetes keresés</string>
     <string name="what_do_you_want_to_share">Mit szeretne megosztani?</string>
     <string name="window">Ablak</string>
     <string name="x_has_been_set_as_ringtone">A(z) %1$s be lett állítva csengőhangnak.</string>
     <string name="x_selected">%1$d kiválasztva</string>
     <string name="year">Év</string>
-    <string name="you_have_to_select_at_least_one_category">Legalább egy kategóriát kell kiválasztania</string>
 </resources>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 0f141c36b..d9bacd017 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -8,7 +8,6 @@
     <string name="action_add_to_playlist">Tambahkan ke daftar putar...</string>
     <string name="action_clear_playing_queue">Bersihkan antrian memainkan</string>
     <string name="action_clear_playlist">Bersihkan daftar putar</string>
-    <string name="action_cycle_repeat">Mode putar ulang</string>
     <string name="action_delete">Hapus</string>
     <string name="action_delete_from_device">Hapus dari perangkat</string>
     <string name="action_details">Rincian</string>
@@ -18,13 +17,11 @@
     <string name="action_grant">Izinkan</string>
     <string name="action_grid_size">Ukuran kotak</string>
     <string name="action_grid_size_land">Ukuran kotak (landscape)</string>
-    <string name="action_new_playlist">Daftar putar baru...</string>
     <string name="action_next">Selanjutnya</string>
     <string name="action_play">Mainkan</string>
     <string name="action_play_next">Mainkan selanjutnya</string>
     <string name="action_play_pause">Mainkan/Jeda</string>
     <string name="action_previous">Sebelumnya</string>
-    <string name="action_re_download_artist_image">Perbarui gambar artis</string>
     <string name="action_remove_from_favorites">Hapus dari favorit</string>
     <string name="action_remove_from_playing_queue">Hapus dari antrian memainkan</string>
     <string name="action_remove_from_playlist">Hapus dari daftar putar</string>
@@ -37,15 +34,10 @@
     <string name="action_set_as_start_directory">Tetapkan sebagai direktori awal</string>
     <string name="action_settings">"Pengaturan"</string>
     <string name="action_share">Bagikan</string>
-    <string name="action_show_lyrics">Tampilkan lirik</string>
-    <string name="action_shuffle_album">Acak album</string>
     <string name="action_shuffle_all">Acak semua</string>
-    <string name="action_shuffle_artist">Acak artis</string>
     <string name="action_shuffle_playlist">Acak daftar putar</string>
     <string name="action_sleep_timer">Sleep timer</string>
     <string name="action_tag_editor">Sunting Tag</string>
-    <string name="action_toggle_favorite">ganti favorit</string>
-    <string name="action_toggle_shuffle">Ganti mode acak</string>
     <string name="add_action">Tambahkan</string>
     <string name="add_photo">Tambahkan foto</string>
     <string name="add_playlist_title">"Tambahkan ke daftar putar"</string>
@@ -53,11 +45,9 @@
     <string name="added_x_titles_to_playing_queue">%1$s judul ditambahkan ke antrian memainkan.</string>
     <string name="album">Album</string>
     <string name="album_artist">Artis album</string>
-    <string name="album_desc">Deskripsi album</string>
     <string name="album_or_artist_empty">Judul atau artis kosong.</string>
     <string name="albums">Album</string>
     <!-- Android Auto -->
-    <string name="albums_label">Album</string>
     <string name="always">Selalu</string>
     <string name="app_share">Hai, temukan pemutar musik keren ini di</string>
     <string name="app_shortcut_last_added_long">\@string/last_added</string>
@@ -67,21 +57,14 @@
     <string name="app_shortcut_shuffle_all_short">Acak</string>
     <string name="app_shortcut_top_tracks_long">\@string/my_top_tracks</string>
     <string name="app_shortcut_top_tracks_short">Trek teratas</string>
-    <string name="app_summary">Aplikasi yang menggabungkan antara desain Material dan iOS dalam satu tempat.</string>
     <string name="app_widget_big_name">Retro music - Besar</string>
-    <string name="app_widget_big_name_2">Retro music - Besar2</string>
     <string name="app_widget_card_name">Retro music - Kartu</string>
     <string name="app_widget_classic_name">Retro music - Klasik</string>
     <string name="app_widget_small_name">Retro music - Kecil</string>
     <string name="artist">Artis</string>
-    <string name="artist_desc">Deskripsi artis</string>
     <string name="artists">Artis</string>
-    <string name="artists_label">Penyanyi</string>
-    <string name="at_least_one_category_must_be_enabled">Setidaknya satu kategori harus aktif</string>
     <string name="audio_focus_denied">Fokus suara ditolak.</string>
-    <string name="bass_boost_strength">Kekuatan Dorongan Bass</string>
     <string name="biography">Biografi</string>
-    <string name="biography_unavailable">Tidak dapat menemukan biografi artis.</string>
     <string name="black_theme_name">Hitam</string>
     <string name="blacklist">Daftar hitam</string>
     <string name="blur">Buram</string>
@@ -96,7 +79,6 @@
     <string name="clear_playlist_x"><![CDATA[Hapus daftar putar <b>%1$s</b>? Tindakan ini tidak dapat dibatalkan!]]></string>
     <string name="color">Warna</string>
     <string name="color_theme_name">Warna</string>
-    <string name="colored_footers">Footer berwarna</string>
     <string name="colors">Warna</string>
     <string name="could_not_create_playlist">Tidak dapat menambahkan daftar putar.</string>
     <string name="could_not_download_album_cover">"Tidak dapat mengunduh sampul album yang sesuai."</string>
@@ -105,35 +87,23 @@
     <string name="create_action">Buat baru</string>
     <string name="created_playlist_x">Daftar putar %1$s telah dibuat</string>
     <string name="currently_listening_to_x_by_x">Sedang mendengarkan %1$s oleh %2$s.</string>
-    <string name="custom">Kustom</string>
     <string name="dark_theme_name">Gelap</string>
-    <string name="date">Tanggal</string>
     <string name="default_hint">Tidak ada lirik</string>
-    <string name="delete_action">Hapus</string>
     <string name="delete_playlist_title">Hapus daftar putar</string>
     <string name="delete_playlist_x"><![CDATA[Hapus daftar putar <b>%1$s</b>?]]></string>
     <string name="delete_playlists_title">Hapus daftar putar</string>
-    <string name="delete_song_title">Hapus lagu</string>
     <string name="delete_song_x"><![CDATA[Hapus lagu <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Hapus lagu</string>
     <string name="delete_x_playlists"><![CDATA[Hapus daftar putar <b>%1$d</b>?]]></string>
     <string name="delete_x_songs"><![CDATA[Hapus lagu<b>%1$d</b>?]]></string>
     <string name="deleted_x_songs">Lagu %1$d dihapus.</string>
-    <string name="deleting_songs">Menghapus lagu</string>
     <string name="do_you_want_to_clear_the_blacklist">Ingin membersihkan daftar putar?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[ingin menghapus <b>%1$s</b> dari daftar putar?]]></string>
     <string name="donate">Donasi</string>
     <string name="donate_summary">Jika Anda ingin mensuport developer, Anda bisa menyumbangkan sedikit donasi disini</string>
     <string name="donation_header">Belikan saya sebuah</string>
     <string name="download_from_last_fm">Unduh dari Last.fm</string>
-    <string name="duration">Durasi</string>
-    <string name="edit">Edit</string>
-    <string name="edit_categories">edit kategori</string>
     <string name="empty">Kosong</string>
     <string name="equalizer">Equalizer</string>
-    <string name="error_loading_lyrics_from_network">Kesalahan memuat dari jaringan</string>
-    <string name="experimental">Eksperimental</string>
-    <string name="failed_to_save_playlist">Gagal menyimpan daftar putar (%s).</string>
     <string name="favorites">Favorit</string>
     <string name="flat">Datar</string>
     <string name="folders">Direktori</string>
@@ -141,7 +111,6 @@
     <string name="full">Penuh</string>
     <string name="genre">Aliran</string>
     <string name="genres">Aliran</string>
-    <string name="gradient">gradasi</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -151,36 +120,24 @@
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
     <string name="history">Riwayat</string>
-    <string name="history_label">Riwayat</string>
-    <string name="holiday">Libur</string>
     <string name="home">Beranda</string>
     <string name="inserted_x_songs_into_playlist_x">Lagu %1$d dimasukkan ke daftar putar %2$s.</string>
-    <string name="inspired_designs_by">Inspirasi desain oleh</string>
-    <string name="join_community">Bergabung di komunitas Google Plus</string>
-    <string name="join_community_summary">Jika kamu perlu bantuan atau pertanyaan, komunitas Retro Musik di Google Plus adalah tempat yang paling tepat</string>
     <string name="label_bit_rate">Bitrate</string>
-    <string name="label_details">Rincian</string>
     <string name="label_file_format">Format</string>
     <string name="label_file_name">Nama berkas</string>
     <string name="label_file_path">Lokasi berkas</string>
     <string name="label_file_size">Ukuran</string>
     <string name="label_sampling_rate">Contoh rate</string>
     <string name="label_track_length">Durasi</string>
-    <string name="language_contributors">Kontributor bahasa</string>
     <string name="last_added">Terakhir ditambahkan</string>
     <string name="lets_play_something">Putarin lagu, yuk!</string>
     <string name="library">Pustaka</string>
-    <string name="library_categories">Kategori Pustaka</string>
     <string name="licenses">Lisensi</string>
     <string name="light_theme_name">Putih</string>
     <string name="listing_files">Daftar berkas</string>
-    <string name="loading">Memuat...</string>
     <string name="loading_products">Memuat produk...</string>
     <string name="lyrics">Lirik</string>
-    <string name="media_route_menu_title">Perangkat transmisi</string>
-    <string name="more">Selengkapnya</string>
     <string name="my_name">Namaku</string>
-    <string name="my_playlists">Daftar putarku</string>
     <string name="my_top_tracks">Lagu teratas</string>
     <string name="never">Tidak pernah</string>
     <string name="new_playlist_title">Daftar putar baru...</string>
@@ -189,7 +146,6 @@
     <string name="no_artists">Tidak ada artis</string>
     <string name="no_audio_ID">"Putar lagu dahulu, lalu coba lagi."</string>
     <string name="no_equalizer">Tidak ada equalizer yang ditemukan.</string>
-    <string name="no_files">Tidak ada data</string>
     <string name="no_lyrics_found">Lirik tidak ditemukan</string>
     <string name="no_playlists">Tidak ada daftar putar</string>
     <string name="no_purchase_found">Tidak ada catatan pembelian</string>
@@ -210,51 +166,36 @@
     <string name="personalize">Personalisasikan</string>
     <string name="pick_from_local_storage">Pilih dari penyimpanan lokal</string>
     <string name="plain">Polos</string>
-    <string name="play">Mainkan</string>
-    <string name="play_all">Putar semua</string>
     <string name="playing_notification_description">Notifikasi pemutaran memungkinkan untuk memutar, menunda, dll.</string>
     <string name="playing_notification_name">Notifikasi pemutaran</string>
     <string name="playlist_empty_text">Daftar putar kosong</string>
     <string name="playlist_is_empty">Daftar putar kosong</string>
     <string name="playlist_name_empty">Nama daftar putar</string>
     <string name="playlists">Daftar putar</string>
-    <string name="playlists_label">Daftar putar</string>
     <string name="pref_header_audio">Suara</string>
     <string name="pref_header_general">Umum</string>
     <string name="pref_header_images">Gambar</string>
     <string name="pref_header_lockscreen">Layar kunci</string>
-    <string name="pref_header_now_playing_screen">Sedang Memainkan</string>
     <string name="pref_header_playlists">Daftar putar</string>
     <string name="pref_only_lollipop">"Hanya tersedia pada versi Lollipop."</string>
-    <string name="pref_only_nougat_mr1">"Hanya tersedia pada versi Nougat 7.1."</string>
-    <string name="pref_summary_about">Orang-orang yang telah membantu proyek ini</string>
     <string name="pref_summary_album_art_on_lockscreen">Gunakan sampul album lagu yang sedang di mainkan sebagai wallpaper layar kunci.</string>
     <string name="pref_summary_audio_ducking">Pemberitahuan, navigasi, dll.</string>
     <string name="pref_summary_blurred_album_art">Buramkan sampul album pada layar kunci. Karena dapat menyebabkan masalah pada aplikasi pihak ketiga dan widget.</string>
     <string name="pref_summary_carousel_effect">Efek Carousel pada sampul pemutar musik. Sebagai catatan pada Tema Card dan Blur Card tidak bekerja</string>
-    <string name="pref_summary_circular_album_effect">Tampilkan sampul ingkaran pada pemutar musik. di tujukan untuk tema dipilih , tidak semuanya</string>
     <string name="pref_summary_classic_notification">Gunakan desain notifikasi lama.</string>
     <string name="pref_summary_colored_app">Latar belakang, warna tombol kontrol berubah sesuai warna sampul album dari layar pemutar</string>
     <string name="pref_summary_colored_app_shortcuts">Warnai pintasan aplikasi dengan warna aksen. Setiap Anda mengubah warna, aktifkan ini untuk menerapkan efek.</string>
     <string name="pref_summary_colored_navigation_bar">Warnai bilah navigasi dengan warna utama.</string>
     <string name="pref_summary_colored_notification">"Warna pemberitahuan mengikuti warna cerah dari warna sampul album."</string>
-    <string name="pref_summary_day_dream">Tampilkan rincian lagu dalam lamunan ketika musik diputar</string>
     <string name="pref_summary_dominant_color">warna dominan akan di ambil dari sampul album dan artis.</string>
-    <string name="pref_summary_exclude_songs">Jangan memasukkan lagu yang kurang dari 30 detik.</string>
     <string name="pref_summary_gapless_playback">"Dapat menyebabkan masalah pada beberapa perangkat."</string>
     <string name="pref_summary_ignore_media_store_artwork">Dapat meningkatkan kualitas sampul album tetapi menyebabkan waktu lebih lama memuat. Aktifkan jika memiliki masalah dengan kualitas sampul album yang beresolusi rendah.</string>
-    <string name="pref_summary_language_en">Paksa ubah bahasa aplkasi ke bahasa inggris (ini percobaan untuk pilihan berbagai bahasa)</string>
-    <string name="pref_summary_library_categories">Konfigurasi visibilitas dan urutan kategori pustaka</string>
     <string name="pref_summary_lock_screen">Kontrol layar kunci.</string>
-    <string name="pref_summary_lock_screen_app">Tampilkan kontrol penuh dari layar kunci</string>
     <string name="pref_summary_open_source_licences">Detail lisensi untuk software terbuka</string>
     <string name="pref_summary_round_corners">Lengkungan pada pojok jendela, sampul album, dll.</string>
     <string name="pref_summary_tab_titles">Hidupkan / matikan tulisan di tab bawah</string>
-    <string name="pref_summary_toggle_bottom_bar_titles">Hilangkan tulisan di bar navigasi bawah</string>
     <string name="pref_summary_toggle_full_screen">Mode mendalam</string>
     <string name="pref_summary_toggle_headset">Langsung putar ketika headphone terhubung.</string>
-    <string name="pref_summary_toggle_navigation_bar">hanya sembunyikan bar navigasi</string>
-    <string name="pref_summary_toggle_status_bar">hanya sembunyikan status bar</string>
     <string name="pref_summary_toggle_volume">Jika ruang pemutaran cukup, aktifkan kontrol volume</string>
     <string name="pref_title_album_art_on_lockscreen">Tampilkan sampul album</string>
     <string name="pref_title_app_shortcuts">Pintasan aplikasi berwarna</string>
@@ -264,30 +205,18 @@
     <string name="pref_title_classic_notification">Desain notifikasi klasik</string>
     <string name="pref_title_colored_app">Warna adaptif</string>
     <string name="pref_title_colored_notification">Pemberitahuan berwarna</string>
-    <string name="pref_title_day_dream">Lamunan</string>
-    <string name="pref_title_exclude_songs">Lagu-lagu yang tidak dimasukkan.</string>
-    <string name="pref_title_external_storage_access">Berikan akses ke penyimpanan external</string>
     <string name="pref_title_gapless_playback">Putar tanpa jeda</string>
     <string name="pref_title_general_theme">Tema utama</string>
-    <string name="pref_title_gradient_color">Pilih warna</string>
     <string name="pref_title_ignore_media_store_artwork">Abaikan gambar Media Store</string>
     <string name="pref_title_last_added_interval">Jangka waktu terakhir ditambahkan</string>
     <string name="pref_title_lock_screen">Kontrol dalam layar penuh</string>
-    <string name="pref_title_lock_screen_app">Layar kunci retro</string>
-    <string name="pref_title_lyrics_options">opsi lirik</string>
     <string name="pref_title_navigation_bar">Bilah navigasi berwarna</string>
     <string name="pref_title_now_playing_screen_appearance">Tampilan</string>
     <string name="pref_title_open_source_licences">Lisensi terbuka</string>
     <string name="pref_title_round_corners">Lengkungan pojok</string>
-    <string name="pref_title_toggle_bottom_bar_titles">Hilangkan judul</string>
     <string name="pref_title_toggle_carousel_effect">efek carousel</string>
-    <string name="pref_title_toggle_circular_album_effect">Album Bundar</string>
     <string name="pref_title_toggle_dominant_color">warna dominan</string>
     <string name="pref_title_toggle_full_screen">Aplkasi dalam layar penuh</string>
-    <string name="pref_title_toggle_genre">Perlihatkan aliran</string>
-    <string name="pref_title_toggle_language_en">Bahasa inggris</string>
-    <string name="pref_title_toggle_navigation_bar">Navigasi bar</string>
-    <string name="pref_title_toggle_status_bar">status bar</string>
     <string name="pref_title_toggle_tab_titles">Tulisan di tab</string>
     <string name="pref_title_toggle_toggle_headset">Putar otomatis</string>
     <string name="pref_title_toggle_volume">Kontrol volume</string>
@@ -296,10 +225,8 @@
     <string name="primary_color_desc">Warna tema utama, default ke biru abu-abu, saat ini bekerja untuk warna gelap</string>
     <string name="purchase">Pembelian</string>
     <string name="queue">Antrian</string>
-    <string name="queue_label">Antrian</string>
     <string name="rate_app">Nilai aplikasi</string>
     <string name="rate_on_google_play_summary">Berikan nilai positif di Google Play jika anda menyukai Retro Music.</string>
-    <string name="recent_activity">Aktifitas baru-baru ini</string>
     <string name="recent_albums">Album baru-baru ini</string>
     <string name="recent_artists">Artis baru-baru ini</string>
     <string name="remove_action">Hapus</string>
@@ -309,109 +236,62 @@
     <string name="remove_song_x_from_playlist"><![CDATA[Hapus lagu <b>%1$s</b> dari daftar putar?]]></string>
     <string name="remove_songs_from_playlist_title">Hapus lagu dari daftar putar</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[Hapus <b>%1$d</b> lagu dari daftar putar?]]></string>
-    <string name="rename_action">Ubah nama</string>
     <string name="rename_playlist_title">Ubah nama daftar putar</string>
-    <string name="reset_action">Setel ulang</string>
     <string name="reset_artist_image">Reset gambar artis</string>
     <string name="restore">Memulihkan</string>
     <string name="restored_previous_purchase_please_restart">mengembalikan pembelian sebelumnya. Silahkan me restart aplikasi untuk menggunakan semua fitur.</string>
     <string name="restored_previous_purchases">Pembelian sebelumnya telah dikembalikan.</string>
     <string name="restoring_purchase">Memulihkan pembelian...</string>
-    <string name="retro">Retro</string>
     <string name="retro_equalizer">Ekualiser retro</string>
-    <string name="saf_delete_failed">Gagal menghapus berkas: %s</string>
     <!-- SAF -->
-    <string name="saf_guide_slide1_description">Buka laci navigasi</string>
-    <string name="saf_guide_slide1_description_before_o">Aktifkan \'Tampilkan Kartu SD\' pada menu</string>
     <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s memerlukan akses Kartu SD</string>
-    <string name="saf_guide_slide2_description">Kamu perlu memilih direktori awal pada Kartu SD</string>
-    <string name="saf_guide_slide2_title">Pilih Kartu SD pada navigasi</string>
-    <string name="saf_guide_slide3_description">Jangan buka subfolder lain</string>
-    <string name="saf_guide_slide3_title">Tap tombol \'pilih\' pada bagian bawah layar</string>
-    <string name="saf_pick_file">memeelukan akses berkas. Pilih %s</string>
-    <string name="saf_pick_sdcard">akses kartu SD dibutuhkan. Mohon pilih direktori root dari kartu SD</string>
-    <string name="saf_write_failed">Gagal menyimpan berkas: %s</string>
     <string name="save_playlist_title">Simpan sebagai berkas</string>
     <string name="saved_playlist_to">Daftar putar tersimpan ke %s.</string>
     <string name="saving_changes">Menyimpan perubahan</string>
-    <string name="saving_tags">Menyimpan tag</string>
-    <string name="saving_to_file">Menyimpan ke berkas...</string>
     <string name="scanned_files">Terpindai %1$d dari %2$d berkas.</string>
     <string name="search_hint">Cari di perpustakaan Anda...</string>
-    <string name="see_all">Lihat semua</string>
-    <string name="select_preset">Pilih preset</string>
     <string name="set_artist_image">Atur gambar artis</string>
     <string name="shuffle">Acak</string>
     <string name="simple">Sederhana</string>
     <string name="sleep_timer_canceled">Sleep timer dibatalkan.</string>
     <string name="sleep_timer_set">Sleep timer ditetapkan %d menit dari sekarang.</string>
-    <string name="slide_unlock">Geser untuk membuka</string>
     <string name="song">Lagu</string>
     <string name="song_duration">Durasi lagu</string>
     <string name="songs">Lagu</string>
     <string name="sort_order">Urutkan berdasarkan</string>
     <string name="speech_not_supported">Maaf! Perangkat anda tidak mendukung input suara</string>
     <string name="speech_prompt">Cari di perpustakaan anda</string>
-    <string name="suggestions">Saran</string>
-    <string name="summary_material_design_city_wallpaper">Latar belakang kota dalam desain material didaptkan dari situs www.techjuice.pk</string>
-    <string name="summary_material_design_icons">Untuk semua ikon, kita ambil dari situs www.flaticon.com or www.materialdesignicons.com</string>
     <string name="summary_user_info">Tunjukkan nama saja di tampilan depan</string>
     <string name="support_development">Dukung pengembangan</string>
-    <string name="support_development_summary">kamu bisa mempertimbangkan donasi sebagai dukungan atas usaha saya jika kamu menikmati menggunakan Retro Music Player.</string>
     <!-- Message displayed when tag editing fails -->
-    <string name="tag_edit_error">Terdapat kesalahan mengedit tag</string>
-    <string name="tag_editor_check_permission">memeriksa ijin</string>
-    <string name="tag_editor_document_tree_message">Pilih direktori penyimpanan external</string>
-    <string name="tag_editor_document_tree_permission_failed">Sepertinya kami tidak memperoleh ijin mengedit berkas. Periksa lagi direktori penyimpanan filenya</string>
-    <string name="tag_error_kitkat">Terdapat kesalahan mengedit tag. Apakah berkas tersimpan di Kartu SD? Jika iya, Google tidak dapat mengedit berkas ini</string>
-    <string name="tag_error_lollipop">Terdapat kesalahan mengedit tag. Jika berkas tersimpan di Kartu SD, mungkin Retro Music tidak mempunyai ijin untuk mengaksesnya</string>
-    <string name="tag_retrieve_error">Terdapat kesalahan pengambilan data tag</string>
-    <string name="text">Teks</string>
     <string name="thank_you">Terima kasih!</string>
     <string name="the_audio_file">Berkas audio</string>
     <string name="this_month">Bulan ini</string>
     <string name="this_week">Minggu ini</string>
     <string name="this_year">Tahun ini</string>
     <string name="tiny">Mungil</string>
-    <string name="title">Judul</string>
     <string name="title_dashboard">Dasbor</string>
-    <string name="title_desc">Judul menurun</string>
     <string name="title_good_afternoon">Selamat siang!</string>
     <string name="title_good_day">Hari yang baik</string>
     <string name="title_good_evening">Selamat sore!</string>
     <string name="title_good_morning">Selamat pagi!</string>
     <string name="title_good_night">Selamat malam!</string>
-    <string name="title_home">Halaman depan</string>
-    <string name="title_material_design_city_wallpaper">Walpaper kota</string>
-    <string name="title_material_design_icons">Ikon</string>
-    <string name="title_notifications">Notifikasi</string>
     <string name="title_user_info">Siapa namamu?</string>
     <string name="today">Hari ini</string>
-    <string name="toggle_lyrics_size">Ukuran tombol lirik</string>
-    <string name="tool_tip_see_all">Lihat semua lagu</string>
     <string name="top_albums">Album teratas</string>
     <string name="top_artists">Artis teratas</string>
-    <string name="top_tracks">Trek teratas</string>
-    <string name="top_tracks_label">Trek Teratas</string>
     <string name="track_hint">"Trek (2 untuk trek 2 atau 3004 untuk CD3 trek 4)"</string>
     <string name="track_list">Nomor trek</string>
     <string name="translate">Menterjemahkan</string>
-    <string name="translate_summary">Bantu terjemahkan Retro Music ke dalam bahasamu.</string>
     <string name="unplayable_file">Tidak dapat memainkan lagu ini.</string>
     <string name="up_next">Selanjutnya</string>
-    <string name="update">Pembaruan</string>
     <string name="update_image">Perbarui gambar</string>
-    <string name="updated_artist_image">Gambar artis diperbarui.</string>
     <string name="updating">Memperbarui...</string>
     <string name="version">Versi</string>
-    <string name="virtualizer_strength">Kekuatan virtualiser</string>
-    <string name="volume_control">Kontrol volume</string>
     <string name="web_search">Pencarian Web</string>
     <string name="what_do_you_want_to_share">Apa yang ingin Anda bagikan?</string>
     <string name="window">Jendela</string>
     <string name="x_has_been_set_as_ringtone">Tetapkan %1$s sebagai nada dering.</string>
     <string name="x_selected">%1$d dipilh</string>
     <string name="year">Tahun</string>
-    <string name="you_have_to_select_at_least_one_category">Setidaknya kamu harus memilih 1 kategori</string>
 </resources>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index f817832c7..1e52820cf 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -18,13 +18,11 @@
     <string name="action_grant">Izinkan</string>
     <string name="action_grid_size">Ukuran kotak</string>
     <string name="action_grid_size_land">Ukuran kotak (lansekap)</string>
-    <string name="action_new_playlist">Daftar putar baru...</string>
     <string name="action_next">Selanjutnya</string>
     <string name="action_play">Putar</string>
     <string name="action_play_next">Putar selanjutnya</string>
     <string name="action_play_pause">Putar/Jeda</string>
     <string name="action_previous">Sebelumnya</string>
-    <string name="action_re_download_artist_image">Perbarui gambar artis</string>
     <string name="action_remove_from_favorites">Hapus dari favorit</string>
     <string name="action_remove_from_playing_queue">Hapus dari antrian</string>
     <string name="action_remove_from_playlist">Hapus dari daftar putar</string>
@@ -36,7 +34,6 @@
     <string name="action_set_as_start_directory">Atur sebagai direktori awal</string>
     <string name="action_settings">"Setelan"</string>
     <string name="action_share">Bagikan</string>
-    <string name="action_show_lyrics">Lihat lirik</string>
     <string name="action_shuffle_all">Acak semua</string>
     <string name="action_shuffle_playlist">Acak daftar putar</string>
     <string name="action_tag_editor">Sunting Tag</string>
@@ -48,7 +45,6 @@
 
     <string name="album">Album</string>
     <string name="album_artist">Artis album</string>
-    <string name="album_desc">Album menurun</string>
     <string name="album_or_artist_empty">Judul atau artis kosong.</string>
 
     <string name="albums">Album</string>
@@ -58,18 +54,15 @@
     <!-- App Shortcuts -->
     <string name="app_shortcut_shuffle_all_short">Acak</string>
     <string name="app_widget_big_name">Retro music - Besar</string>
-    <string name="app_widget_big_name_2">Retro music - Besar2</string>
     <string name="app_widget_classic_name">Retro music - Klasik</string>
 
     <string name="artist">Artis</string>
-    <string name="artist_desc">Artis menurun</string>
 
     <string name="artists">Artis</string>
 
     <string name="audio_focus_denied">Fokus suara ditolak.</string>
 
     <string name="biography">Biografi</string>
-    <string name="biography_unavailable">Tidak dapat menemukan biografi artis.</string>
 
     <string name="black_theme_name">Hitam</string>
 
@@ -89,15 +82,10 @@
 
     <string name="dark_theme_name">Gelap</string>
 
-    <string name="date">Tanggal</string>
-
-    <string name="delete_action">Hapus</string>
     <string name="delete_playlist_title">Hapus daftar putar</string>
     <string name="delete_playlist_x"><![CDATA[Hapus daftar putar <b>%1$s</b>?]]></string>
     <string name="delete_playlists_title">Hapus daftar putar</string>
-    <string name="delete_song_title">Hapus lagu</string>
     <string name="delete_song_x"><![CDATA[Hapus lagu <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Hapus lagu</string>
     <string name="delete_x_playlists"><![CDATA[Hapus <b>%1$d</b> daftar putar?]]></string>
     <string name="delete_x_songs"><![CDATA[Hapus <b>%1$d</b> lagu?]]></string>
 
@@ -107,14 +95,10 @@
 
     <string name="download_from_last_fm">Unduh dari Last.fm</string>
 
-    <string name="duration">Durasi</string>
-
     <string name="empty">Kosong</string>
 
     <string name="equalizer">Ekualizer</string>
 
-    <string name="failed_to_save_playlist">Gagal menyimpan daftar putar (%s).</string>
-
     <string name="favorites">Favorit</string>
 
     <string name="folders">Direktori</string>
@@ -127,10 +111,7 @@
 
     <string name="inserted_x_songs_into_playlist_x">%1$d lagu dimasukkan ke daftar putar %2$s.</string>
 
-    <string name="inspired_designs_by">Terinspirasi dari</string>
-
     <string name="label_bit_rate">Birate</string>
-    <string name="label_details">Rincian</string>
     <string name="label_file_format">Format</string>
     <string name="label_file_name">Nama fail</string>
     <string name="label_file_path">Lokasi fail</string>
@@ -152,8 +133,6 @@
 
     <string name="lyrics">Lirik</string>
 
-    <string name="more">Selengkapnya</string>
-
     <string name="my_top_tracks">Lagu teratas</string>
 
     <string name="never">Tidak pernah</string>
@@ -165,7 +144,6 @@
     <string name="no_artists">Tidak ada artis</string>
     <string name="no_audio_ID">"Putar lagu dahulu, lalu coba lagi."</string>
     <string name="no_equalizer">Tidak ada ekualizer ditemukan.</string>
-    <string name="no_files">Tidak ada fail</string>
     <string name="no_playlists">Tidak ada daftar putar</string>
     <string name="no_results">Tak ada hasil</string>
     <string name="no_songs">Tidak ada lagu</string>
@@ -182,8 +160,6 @@
 
     <string name="pick_from_local_storage">Pilih dari penyimpanan lokal</string>
 
-    <string name="play">Putar</string>
-
     <string name="playlist_empty_text">Daftar putar kosong</string>
     <string name="playlist_name_empty">Nama daftar putar</string>
 
@@ -193,7 +169,6 @@
     <string name="pref_header_images">Gambar</string>
     <string name="pref_header_lockscreen">Layarkunci</string>
     <string name="pref_only_lollipop">"Hanya tersedia pada Lollipop."</string>
-    <string name="pref_only_nougat_mr1">"Hanya tersedia pada Nougat 7.1."</string>
     <string name="pref_summary_album_art_on_lockscreen">Menggunakan gambar album sebagai latar layarkunci.</string>
     <string name="pref_summary_audio_ducking">Pemberitahuan, navigasi, dll.</string>
     <string name="pref_summary_blurred_album_art">Kaburkan gambar album pada layarkunci. Dapat menyebabkan masalah pada apl pihak ketiga dan widget.</string>
@@ -230,7 +205,6 @@
     <string name="remove_songs_from_playlist_title">Hapus lagu dari daftar putar</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[Hapus <b>%1$d</b> lagu dari daftar putar?]]></string>
 
-    <string name="rename_action">Ubah nama</string>
     <string name="rename_playlist_title">Ubah nama daftar putar</string>
 
     <string name="save_playlist_title">Simpan sebagai fail</string>
@@ -238,7 +212,6 @@
     <string name="saved_playlist_to">Daftar putar tersimpan ke %s.</string>
 
     <string name="saving_changes">Menyimpan perubahan</string>
-    <string name="saving_to_file">Menyimpan ke fail...</string>
 
     <string name="scanned_files">Terpindai %1$d dari %2$d fail.</string>
 
@@ -261,9 +234,6 @@
 
     <string name="the_audio_file">Fail audio</string>
 
-    <string name="title">Judul</string>
-    <string name="title_desc">Judul menurun</string>
-
     <string name="track_hint">"Trek (2 untuk trek 2 atau 3004 untuk CD3 trek 4)"</string>
 
     <string name="unplayable_file">Tidak dapat memutar lagu ini.</string>
@@ -272,8 +242,6 @@
 
     <string name="update_image">Perbarui gambar</string>
 
-    <string name="updated_artist_image">Gambar artis diperbarui.</string>
-
     <string name="updating">Memperbarui...</string>
 
     <string name="web_search">Pencarian Web</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 0da57b49f..591290fce 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -8,7 +8,6 @@
     <string name="action_add_to_playlist">Aggiungi alla playlist...</string>
     <string name="action_clear_playing_queue">Cancella coda</string>
     <string name="action_clear_playlist">Svuota playlist</string>
-    <string name="action_cycle_repeat">Modalità ripetizione ciclica</string>
     <string name="action_delete">Elimina</string>
     <string name="action_delete_from_device">Elimina dal dispositivo</string>
     <string name="action_details">Dettagli</string>
@@ -18,13 +17,11 @@
     <string name="action_grant">Concedi</string>
     <string name="action_grid_size">Dimensioni griglia</string>
     <string name="action_grid_size_land">Dimensioni griglia (orizzontale)</string>
-    <string name="action_new_playlist">Nuova playlist...</string>
     <string name="action_next">Successivo</string>
     <string name="action_play">Riproduci</string>
     <string name="action_play_next">Riproduci successivo</string>
     <string name="action_play_pause">Riproduci/Pausa</string>
     <string name="action_previous">Precedente</string>
-    <string name="action_re_download_artist_image">Aggiorna immagine artista</string>
     <string name="action_remove_from_favorites">Rimuovi dai preferiti</string>
     <string name="action_remove_from_playing_queue">Rimuovi dalla coda</string>
     <string name="action_remove_from_playlist">Rimuovi dalla playlist</string>
@@ -37,15 +34,10 @@
     <string name="action_set_as_start_directory">Imposta come cartella iniziale</string>
     <string name="action_settings">"Impostazioni"</string>
     <string name="action_share">Condividi</string>
-    <string name="action_show_lyrics">Mostra il testo</string>
-    <string name="action_shuffle_album">Riproduzione casuale dell\'album</string>
     <string name="action_shuffle_all">Riproduzione casuale</string>
-    <string name="action_shuffle_artist">Riproduzione casuale dell\'artista</string>
     <string name="action_shuffle_playlist">Riproduzione casuale della playlist</string>
     <string name="action_sleep_timer">Timer sonno</string>
     <string name="action_tag_editor">Modifica tag</string>
-    <string name="action_toggle_favorite">Attiva/disattiva preferito</string>
-    <string name="action_toggle_shuffle">Attiva/disattiva la riproduzione casuale</string>
     <string name="add_action">Aggiungi</string>
     <string name="add_photo">Aggiungi foto</string>
     <string name="add_playlist_title">"Aggiungi alla playlist"</string>
@@ -53,11 +45,9 @@
     <string name="added_x_titles_to_playing_queue">Aggiunti %1$d titoli alla coda di riproduzione.</string>
     <string name="album">Album</string>
     <string name="album_artist">Artista album</string>
-    <string name="album_desc">Descrizione album</string>
     <string name="album_or_artist_empty">Manca il titolo o l\'artista.</string>
     <string name="albums">Album</string>
     <!-- Android Auto -->
-    <string name="albums_label">Album</string>
     <string name="always">Sempre</string>
     <string name="app_share">Hey dai un\'occhiata a questo lettore musicale: https://play.google.com/store/apps/details?id=%s</string>
     <!-- App Shortcuts -->
@@ -67,22 +57,15 @@
     <string name="app_shortcut_shuffle_all_short">Casuale</string>
     <string name="app_shortcut_top_tracks_long">Brani migliori</string>
     <string name="app_shortcut_top_tracks_short">Brani migliori</string>
-    <string name="app_summary">Un\'applicazione ibrida a metà tra Material Design e iOS.</string>
     <string name="app_widget_big_name">Retro music - Grande</string>
-    <string name="app_widget_big_name_2">Retro music - Grande 2</string>
     <string name="app_widget_card_name">Retro music - Card</string>
     <string name="app_widget_classic_name">Retro music - Classico</string>
     <string name="app_widget_small_name">Retro music - Piccolo</string>
     <string name="artist">Artista</string>
-    <string name="artist_desc">Descrizione artista</string>
     <string name="artists">Artisti</string>
-    <string name="artists_label">Artisti</string>
-    <string name="at_least_one_category_must_be_enabled">Deve essere abilitata almeno una categoria.</string>
     <string name="audio_focus_denied">Focus audio negato.</string>
     <string name="audio_settings_summary">Regola le impostazioni audio e i controlli dell\'equalizzatore</string>
-    <string name="bass_boost_strength">Aumenta potenza dei bassi</string>
     <string name="biography">Biografia</string>
-    <string name="biography_unavailable">Imposibile trovare la biografia dell\'artista.</string>
     <string name="black_theme_name">Solo nero</string>
     <string name="blacklist">Lista nera</string>
     <string name="blur">Sfocato</string>
@@ -98,7 +81,6 @@
     <string name="clear_playlist_x"><![CDATA[Svuotare la playlist <b>%1$s</b>? Questa operazione non pu\u00f2 essere annullata!]]></string>
     <string name="color">Colorato</string>
     <string name="color_theme_name">Colore</string>
-    <string name="colored_footers">Footers colorati</string>
     <string name="colors">Colori</string>
     <string name="could_not_create_playlist">Impossibile creare la playlist</string>
     <string name="could_not_download_album_cover">"Impossibile scaricare una copertina dell'album corrispondente."</string>
@@ -107,36 +89,23 @@
     <string name="create_action">Crea</string>
     <string name="created_playlist_x">Playlist %1$s creata</string>
     <string name="currently_listening_to_x_by_x">Sto ascoltando a %1$s di %2$s</string>
-    <string name="custom">Custom</string>
     <string name="dark_theme_name">Scuro</string>
-    <string name="date">Data</string>
     <string name="default_hint">Nessun testo</string>
-    <string name="delete_action">Elimina</string>
     <string name="delete_playlist_title">Elimina playlist</string>
     <string name="delete_playlist_x"><![CDATA[Vuoi eliminare la playlist <b>%1$s</b>?]]></string>
     <string name="delete_playlists_title">Elimina playlist</string>
-    <string name="delete_song_title">Elimina brano</string>
     <string name="delete_song_x"><![CDATA[Eliminare il brano <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Elimina brani</string>
     <string name="delete_x_playlists"><![CDATA[Eliminare <b>%1$d</b> playlist?]]></string>
     <string name="delete_x_songs"><![CDATA[Eliminare <b>%1$d</b> brani?]]></string>
     <string name="deleted_x_songs">Eliminati %1$d brani.</string>
-    <string name="deleting_songs">Eliminando i brani</string>
     <string name="do_you_want_to_clear_the_blacklist">Vuoi pulire la lista nera?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Vuoi rimuovere <b>%1$s</b> dalla lista nera?]]></string>
     <string name="donate">Fai un donazione</string>
     <string name="donate_summary">Se pensi che mi meriti di essere pagato per il mio lavoro, puoi lasciarmi qualche soldo qui.</string>
     <string name="donation_header">Pagami un</string>
     <string name="download_from_last_fm">Scarica da Last.fm</string>
-    <string name="duration">Durata</string>
-    <string name="edit">Modifica</string>
-    <string name="edit_categories">Modifica categorie</string>
-    <string name="edit_tags">Modifica tag</string>
     <string name="empty">Vuoto</string>
     <string name="equalizer">Equalizzatore</string>
-    <string name="error_loading_lyrics_from_network">Errore di caricamento di rete</string>
-    <string name="experimental">Sperimentale</string>
-    <string name="failed_to_save_playlist">Salvataggio playlist fallito (%s).</string>
     <string name="favorites">Preferiti</string>
     <string name="flat">Piatto</string>
     <string name="folders">Cartelle</string>
@@ -146,7 +115,6 @@
     <string name="general_settings_title">Aspetto</string>
     <string name="genre">Genere</string>
     <string name="genres">Generi</string>
-    <string name="gradient">Sfumatura</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -156,36 +124,24 @@
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
     <string name="history">Cronologia</string>
-    <string name="history_label">Cronologia</string>
-    <string name="holiday">Vacanze</string>
     <string name="home">Home</string>
     <string name="inserted_x_songs_into_playlist_x">Inserite %1$d canzoni nella playlist %2$s.</string>
-    <string name="inspired_designs_by">Design ispirato da</string>
-    <string name="join_community">Partecipa alla community di Google+</string>
-    <string name="join_community_summary">Se hai bisogno di aiuto o altre domande, la community Retro Music su Google+ è un ottimo punto di partenza.</string>
     <string name="label_bit_rate">Bitrate</string>
-    <string name="label_details">Dettagli</string>
     <string name="label_file_format">Formato</string>
     <string name="label_file_name">Nome file</string>
     <string name="label_file_path">Percorso file</string>
     <string name="label_file_size">Dimensioni</string>
     <string name="label_sampling_rate">Campionamento</string>
     <string name="label_track_length">Durata</string>
-    <string name="language_contributors">Traduttori</string>
     <string name="last_added">Ultimi aggiunti</string>
     <string name="lets_play_something">Suoniamo qualcosa</string>
     <string name="library">Raccolta</string>
-    <string name="library_categories">Categorie raccolta</string>
     <string name="licenses">Licenze</string>
     <string name="light_theme_name">Bianco</string>
     <string name="listing_files">File di elenco</string>
-    <string name="loading">Caricamento...</string>
     <string name="loading_products">Caricando i prodotti...</string>
     <string name="lyrics">Testo</string>
-    <string name="media_route_menu_title">Dispositivo di cast</string>
-    <string name="more">Altro</string>
     <string name="my_name">Il mio nome</string>
-    <string name="my_playlists">La mia playlist</string>
     <string name="my_top_tracks">Brani migliori</string>
     <string name="never">Mai</string>
     <string name="new_playlist_title">Nuova playlist</string>
@@ -194,7 +150,6 @@
     <string name="no_artists">Nessun artista</string>
     <string name="no_audio_ID">"Riproduci una canzone, poi riprova"</string>
     <string name="no_equalizer">Equalizzatore non trovato</string>
-    <string name="no_files">Nessun file</string>
     <string name="no_genres">Nessun genere</string>
     <string name="no_lyrics_found">Nessun testo trovato</string>
     <string name="no_playlists">Nessuna playlist</string>
@@ -219,52 +174,36 @@
     <string name="personalize_settings_summary">Personalizza schermata riproduzione e interfaccia</string>
     <string name="pick_from_local_storage">Prendi dalla memoria locale</string>
     <string name="plain">Semplice</string>
-    <string name="play">Riproduci</string>
-    <string name="play_all">Riproduci tutto</string>
     <string name="playing_notification_description">La notifica della riproduzione prevede azioni per il play/pausa ecc...</string>
     <string name="playing_notification_name">Notifica della riproduzione</string>
     <string name="playlist_empty_text">Playlist vuota</string>
     <string name="playlist_is_empty">La playlist è vuota</string>
     <string name="playlist_name_empty">Nome della playlist</string>
     <string name="playlists">Playlist</string>
-    <string name="playlists_label">Playlist</string>
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_general">Generale</string>
     <string name="pref_header_images">Immagini</string>
     <string name="pref_header_lockscreen">Schermata di blocco</string>
-    <string name="pref_header_now_playing_screen">Ora in riproduzione</string>
     <string name="pref_header_playlists">Playlists</string>
     <string name="pref_only_lollipop">"Disponibile solo su Lollipop"</string>
-    <string name="pref_only_nougat_mr1">"Disponibile solo su Nougat 7.1."</string>
-    <string name="pref_summary_about">Le persone che hanno aiutato nel progetto</string>
     <string name="pref_summary_album_art_on_lockscreen">Usa la copertina dell\'album della canzone in riproduzione come sfondo della schermata di blocco.</string>
     <string name="pref_summary_audio_ducking">Notifiche, navigazione ecc.</string>
     <string name="pref_summary_blurred_album_art">Applica sfocatura alla copertina dell\'album della canzone in riproduzione nella schermata di blocco. Può causare problemi con app e widget di terze parti.</string>
     <string name="pref_summary_carousel_effect">Effetto scorrimento della copertina nella schermata di riproduzione. Non funziona con i temi Scheda e Scheda sfocata</string>
-    <string name="pref_summary_circular_album_effect">Mostra la copertina circolare nelle schermate in riproduzione, solo per temi selezionati</string>
     <string name="pref_summary_classic_notification">Usa il design classico per le notifiche</string>
     <string name="pref_summary_colored_app">Lo sfondo ed il tasto di riproduzione cambiano colore in base alla copertina dell\'album</string>
     <string name="pref_summary_colored_app_shortcuts">Colora le scorciatoie dell\'app con il colore in rilievo. Ogni volta che cambi colore attiva questo perché abbia effetto.</string>
     <string name="pref_summary_colored_navigation_bar">Colora la barra di navigazione con il colore primario.</string>
     <string name="pref_summary_colored_notification">"Colora la notifica con il colore principale della copertina dell'album."</string>
-    <string name="pref_summary_day_dream">Mostra i dettagli della canzone nel dream mentre la musica è in riproduzione</string>
     <string name="pref_summary_dominant_color">Il colore più dominante sarà preso dall\'immagine dell\'album o dell\'artista.</string>
-    <string name="pref_summary_exclude_songs">Escludi brani più corti di 30 secondi</string>
     <string name="pref_summary_gapless_playback">"Può causare problemi di riproduzione su alcuni dispositivi."</string>
     <string name="pref_summary_ignore_media_store_artwork">Può aumentare la qualità della copertina degli album, ma causa un rallentamento nel caricamento dell\'immagine. Abilita solo se hai problemi con la bassa qualità delle copertine.</string>
-    <string name="pref_summary_language_en">Forza il cambiamento della lingua in inglese (quest\'opzione serve per testare la funzione multilingua)</string>
-    <string name="pref_summary_library_categories">Configura ordine e visibilità delle categorie della raccolta.</string>
     <string name="pref_summary_lock_screen">Mostra i controlli per la schermata di blocco di Retro Music</string>
-    <string name="pref_summary_lock_screen_app">Mostra i controlli per la schermata di blocco</string>
     <string name="pref_summary_open_source_licences">Dettagli per la licenza per l\'open source</string>
     <string name="pref_summary_round_corners">Angoli arrotondati per le finestre, le copertine degli album, ecc...</string>
     <string name="pref_summary_tab_titles">Abilita/disabilita i titoli nella barra in basso</string>
-    <string name="pref_summary_toggle_bottom_bar_titles">Disattiva i titoli dalla barra di navigazione</string>
     <string name="pref_summary_toggle_full_screen">Modalità immersiva</string>
-    <string name="pref_summary_toggle_genre">Se vuoi vedere \"Genere\" nella barra in basso</string>
     <string name="pref_summary_toggle_headset">Inizia la riproduzione musicale quando colleghi le cuffie.</string>
-    <string name="pref_summary_toggle_navigation_bar">Nascondi solo la barra di navigazione</string>
-    <string name="pref_summary_toggle_status_bar">Nascondi solo la barra di stato</string>
     <string name="pref_summary_toggle_volume">Se c\'è spazio nella schermata di riproduzione, attiva i controlli per il volume</string>
     <string name="pref_title_album_art_on_lockscreen">Mostra la copertina dell\'album</string>
     <string name="pref_title_app_shortcuts">Scorciatoie app colorate</string>
@@ -274,30 +213,18 @@
     <string name="pref_title_classic_notification">Design classico per le notifiche</string>
     <string name="pref_title_colored_app">Colore adattivo</string>
     <string name="pref_title_colored_notification">Notifica colorata</string>
-    <string name="pref_title_day_dream">Day dream</string>
-    <string name="pref_title_exclude_songs">Escludi brani</string>
-    <string name="pref_title_external_storage_access">Dai accesso alla memoria esterna</string>
     <string name="pref_title_gapless_playback">Riproduzione senza interruzioni</string>
     <string name="pref_title_general_theme">Tema generale</string>
-    <string name="pref_title_gradient_color">Scegli il colore</string>
     <string name="pref_title_ignore_media_store_artwork">Ignora le copertine Media Store</string>
     <string name="pref_title_last_added_interval">"Ultimo intervallo di playlist aggiunto "</string>
     <string name="pref_title_lock_screen">Controlli a schermo intero</string>
-    <string name="pref_title_lock_screen_app">Blocco schermo Retro</string>
-    <string name="pref_title_lyrics_options">Opzioni testo</string>
     <string name="pref_title_navigation_bar">Barra di navigazione colorata</string>
     <string name="pref_title_now_playing_screen_appearance">Aspetto</string>
     <string name="pref_title_open_source_licences">Licenze open source</string>
     <string name="pref_title_round_corners">Angoli arrotondati</string>
-    <string name="pref_title_toggle_bottom_bar_titles">Disattiva titoli</string>
     <string name="pref_title_toggle_carousel_effect">Effetto scorrimento</string>
-    <string name="pref_title_toggle_circular_album_effect">Album circolare</string>
     <string name="pref_title_toggle_dominant_color">Colore dominante</string>
     <string name="pref_title_toggle_full_screen">Applicazione a schermo intero</string>
-    <string name="pref_title_toggle_genre">Mostra \"Genere\"</string>
-    <string name="pref_title_toggle_language_en">Lingua inglese</string>
-    <string name="pref_title_toggle_navigation_bar">Barra di navigazione</string>
-    <string name="pref_title_toggle_status_bar">Barra di stato</string>
     <string name="pref_title_toggle_tab_titles">Tab titoli</string>
     <string name="pref_title_toggle_toggle_headset">Auto play</string>
     <string name="pref_title_toggle_volume">Controlli volume</string>
@@ -306,10 +233,8 @@
     <string name="primary_color_desc">Il colore primario del tema, bianco di default.</string>
     <string name="purchase">Acquista</string>
     <string name="queue">Coda</string>
-    <string name="queue_label">Coda</string>
     <string name="rate_app">Recensisci l\'app</string>
     <string name="rate_on_google_play_summary">Lascia una buona recensione nel Play Store per farci sapere che apprezzi l\'applicazione</string>
-    <string name="recent_activity">Attività recenti</string>
     <string name="recent_albums">Album recenti</string>
     <string name="recent_artists">Artisti recenti</string>
     <string name="remove_action">Rimuovi</string>
@@ -319,112 +244,62 @@
     <string name="remove_song_x_from_playlist"><![CDATA[Rimuovere il brano <b>%1$s</b> dalla playlist?]]></string>
     <string name="remove_songs_from_playlist_title">Rimuovi brani dalla playlist</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[Rimuovi <b>%1$d</b> brani dalla playlist?]]></string>
-    <string name="rename_action">Rinomina</string>
     <string name="rename_playlist_title">Rinomina playlist</string>
-    <string name="reset_action">Reset</string>
     <string name="reset_artist_image">Resetta l\'immagine dell\'artista</string>
     <string name="restore">Ripristina</string>
     <string name="restored_previous_purchase_please_restart">Acquisto precedente ripristinato. Riavvia l\'app per utilizzare tutte le funzionalità.</string>
     <string name="restored_previous_purchases">Precedenti acquisti ripristinati.</string>
     <string name="restoring_purchase">Ripristino acquisto...</string>
-    <string name="retro">Retro</string>
     <string name="retro_equalizer">Equalizzatore Retro</string>
-    <string name="saf_delete_failed">Eliminazione file non riuscita: %s</string>
     <!-- SAF -->
-    <string name="saf_error_uri">Impossibile ottenere SAF URI</string>
-    <string name="saf_guide_slide1_description">Apri il menù di navigazione</string>
-    <string name="saf_guide_slide1_description_before_o">Abilita \"Mostra SD card\" nel menu</string>
     <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s richiede l\'accesso alla SD card</string>
-    <string name="saf_guide_slide2_description">Devi selezionare l\'indirizzo root della tua SD card</string>
-    <string name="saf_guide_slide2_title">Seleziona la tua SD card dal menù di navigazione</string>
-    <string name="saf_guide_slide3_description">Non aprire nessuna sottocartella</string>
-    <string name="saf_guide_slide3_title">Premi il pulsante \"Seleziona\" nella parte inferiore dello schermo</string>
-    <string name="saf_pick_file">Accesso al file richiesto. Seleziona %s</string>
-    <string name="saf_pick_sdcard">L\'accesso alla SD card è richiesto. Scegli l\'indirizzo root della SD card</string>
-    <string name="saf_write_failed">Scrittura file non riuscita: %s</string>
     <string name="save_playlist_title">Salva come file</string>
     <string name="saved_playlist_to">Playlist salvata in %s.</string>
     <string name="saving_changes">Applicando i cambiamenti</string>
-    <string name="saving_tags">Salvataggio tag</string>
-    <string name="saving_to_file">Salvando sul file...</string>
     <string name="scanned_files">Analizzato %1$d di %2$d file</string>
     <string name="search_hint">Cerca nella tua raccolta...</string>
-    <string name="see_all">Vedi tutto</string>
-    <string name="select_preset">Seleziona preset</string>
     <string name="set_artist_image">Imposta l\'immagine dell\'artista</string>
     <string name="shuffle">Casuale</string>
     <string name="simple">Semplice</string>
     <string name="sleep_timer_canceled">Timer per il sonno cancellato</string>
     <string name="sleep_timer_set">Timer per il sonno impostato per %d minuti da adesso.</string>
-    <string name="slide_unlock">Scorri per sbloccare</string>
-    <string name="solid">Uniforme</string>
     <string name="song">Brano</string>
     <string name="song_duration">Durata della canzone</string>
     <string name="songs">Brani</string>
     <string name="sort_order">Ordina per</string>
     <string name="speech_not_supported">Spiacenti! Il tuo dispositivo non supporta l\'input vocale</string>
     <string name="speech_prompt">Cerca nella tua raccolta</string>
-    <string name="suggestions">Suggerimenti</string>
-    <string name="summary_material_design_city_wallpaper">Sfondo della città in material design preso dal sito www.techjuice.pk</string>
-    <string name="summary_material_design_icons">Tutte le icone prese dal sito materialdesignicons.com</string>
     <string name="summary_user_info">Mostra il tuo nome sulla schermata principale</string>
     <string name="support_development">Supporta lo sviluppo</string>
-    <string name="support_development_summary">Se ti piace usare Retro Music Player supporta il mio lavoro con una donazione.</string>
     <!-- Message displayed when tag editing fails -->
-    <string name="tag_edit_error">Errore nell\'editing dei tag.</string>
-    <string name="tag_editor_check_permission">Controllando le autorizzazioni</string>
-    <string name="tag_editor_document_tree_message">Seleziona il dispositivo di memorizzazione esterno</string>
-    <string name="tag_editor_document_tree_permission_failed">Sembra che non abbiamo l\'autorizzazione per editare i file. Ricontrolla la directory nel selettore di file.</string>
-    <string name="tag_error_kitkat">Errore nell\'editing dei tag. Il file si trova sulla SD Card? Se sì, Google ha reso impossibile l\'editing dei tag per questo file.</string>
-    <string name="tag_error_lollipop">Errore nell\'editing dei tag. Se il file si trova sulla SD Card, Retro Music potrebbe non avere l\'autorizzazione ad accedervi.</string>
-    <string name="tag_retrieve_error">Errore nel recupero dei tag.</string>
-    <string name="text">Testo</string>
     <string name="thank_you">Grazie!</string>
     <string name="the_audio_file">Il file audio</string>
     <string name="this_month">Questo mese</string>
     <string name="this_week">Questa settimana</string>
     <string name="this_year">Quest\'anno</string>
     <string name="tiny">Piccolo</string>
-    <string name="title">Titolo</string>
     <string name="title_dashboard">Dashboard</string>
-    <string name="title_desc">Descrizione titolo</string>
     <string name="title_good_afternoon">Buon pomeriggio</string>
     <string name="title_good_day">Buon giorno</string>
     <string name="title_good_evening">Buona sera</string>
     <string name="title_good_morning">Buon mattino</string>
     <string name="title_good_night">Buona notte</string>
-    <string name="title_home">Home</string>
-    <string name="title_material_design_city_wallpaper">Sfondo della città</string>
-    <string name="title_material_design_icons">Icone</string>
-    <string name="title_notifications">Notifiche</string>
     <string name="title_user_info">Come ti chiami</string>
     <string name="today">Oggi</string>
-    <string name="toggle_lyrics_size">Attiva/disattiva la dimensione del testo</string>
-    <string name="tool_tip_see_all">Guarda tutti i brani</string>
     <string name="top_albums">Album migliori</string>
     <string name="top_artists">Artisti migliori</string>
-    <string name="top_tracks">Brani migliori</string>
-    <string name="top_tracks_label">Brani migliori</string>
     <string name="track_hint">"Traccia (2 per traccia 2 oppure 3004 per traccia 4 del CD 3)"</string>
     <string name="track_list">Numero della traccia</string>
     <string name="translate">Traduci</string>
-    <string name="translate_summary">Aiutaci a tradurre Retro music nella tua lingua madre.</string>
     <string name="unplayable_file">Non posso riprodurre questo brano.</string>
     <string name="up_next">Avanti il prossimo</string>
-    <string name="update">Aggiorna</string>
     <string name="update_image">Aggiorna immagine</string>
-    <string name="updated_artist_image">Immagine artista aggiornata.</string>
     <string name="updating">Aggiornando...</string>
-    <string name="user_profile_summary">Cambia immagine profilo e copertina</string>
     <string name="version">Versione</string>
-    <string name="virtualizer_strength">Potenza del virtualizzatore</string>
-    <string name="volume_control">Controlli del volume</string>
     <string name="web_search">Cerca sul web</string>
     <string name="what_do_you_want_to_share">Cosa vuoi condividere?</string>
     <string name="window">Finestra</string>
     <string name="x_has_been_set_as_ringtone">Imposta %1$s come suoneria.</string>
     <string name="x_selected">%1$d selezionato</string>
     <string name="year">Anno</string>
-    <string name="you_have_to_select_at_least_one_category">Devi selezionare almeno una categoria</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 40ec5bc62..4fd21492a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -17,13 +17,11 @@
     <string name="action_grant">許可</string>
     <string name="action_grid_size">グリッドサイズ</string>
     <string name="action_grid_size_land">グリッドサイズ(横画面)</string>
-    <string name="action_new_playlist">新規再生リスト</string>
     <string name="action_next">次</string>
     <string name="action_play">再生</string>
     <string name="action_play_next">次を再生</string>
     <string name="action_play_pause">再生/一時停止</string>
     <string name="action_previous">前</string>
-    <string name="action_re_download_artist_image">アーティストの画像を更新</string>
     <string name="action_remove_from_favorites">お気に入りから削除</string>
     <string name="action_remove_from_playing_queue">キューから削除</string>
     <string name="action_remove_from_playlist">再生リストから削除</string>
@@ -36,10 +34,7 @@
     <string name="action_set_as_start_directory">初期ディレクトリに設定</string>
     <string name="action_settings">"設定"</string>
     <string name="action_share">シェア</string>
-    <string name="action_show_lyrics">歌詞を表示</string>
-    <string name="action_shuffle_album">アルバムをシャッフル</string>
     <string name="action_shuffle_all">すべてシャッフル</string>
-    <string name="action_shuffle_artist">アーティストをシャッフル</string>
     <string name="action_shuffle_playlist">再生リストをシャッフル</string>
     <string name="action_sleep_timer">スリープタイマー</string>
     <string name="action_tag_editor">タグを編集</string>
@@ -50,7 +45,6 @@
     <string name="added_x_titles_to_playing_queue">%1$d曲を再生中のキューに追加しました</string>
     <string name="album">アルバム</string>
     <string name="album_artist">アルバムアーティスト</string>
-    <string name="album_desc">アルバム(降順)</string>
     <string name="album_or_artist_empty">タイトルかアーティストが空です</string>
     <string name="albums">アルバム</string>
     <!-- Android Auto -->
@@ -64,20 +58,14 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="app_shortcut_shuffle_all_short">シャッフル</string>
     <string name="app_shortcut_top_tracks_long">\@string/my_top_tracks</string>
     <string name="app_shortcut_top_tracks_short">トップのトラック</string>
-    <string name="app_summary">マテリアルデザインとiOSの両者を踏まえたハイブリットアプリ</string>
     <string name="app_widget_big_name">Retro music - 大</string>
-    <string name="app_widget_big_name_2">Retro music  - 大2</string>
     <string name="app_widget_card_name">Retro music - カード</string>
     <string name="app_widget_classic_name">Retro music - クラシック</string>
     <string name="app_widget_small_name">Retro music - 小</string>
     <string name="artist">アーティスト</string>
-    <string name="artist_desc">アーティスト(降順)</string>
     <string name="artists">アーティスト</string>
-    <string name="at_least_one_category_must_be_enabled">少なくとも1つのカテゴリが有効化されている必要があります</string>
     <string name="audio_focus_denied">オーディオフォーカスが拒否されました</string>
-    <string name="bass_boost_strength">低音ブーストの強さ</string>
     <string name="biography">略歴</string>
-    <string name="biography_unavailable">\u30a2\u30fc\u30c6\u30a3\u30b9\u30c8\u306e\u8a73\u7d30\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f</string>
     <string name="black_theme_name">ブラック</string>
     <string name="blacklist">ブラックリスト</string>
     <string name="cancel_current_timer">現在のタイマーをキャンセル</string>
@@ -87,7 +75,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="clear_blacklist">ブラックリストをクリア</string>
     <string name="clear_playlist_title">再生リストをクリア</string>
     <string name="clear_playlist_x"><![CDATA[<b>%1$s</b>\u3092\u524a\u9664\u3057\u307e\u3059\u304b\uff1f\u3053\u306e\u64cd\u4f5c\u306f\u3082\u3068\u306b\u623b\u305b\u307e\u305b\u3093]]></string>
-    <string name="colored_footers">フッターを着色</string>
     <string name="colors">色</string>
     <string name="could_not_create_playlist">\u518d\u751f\u30ea\u30b9\u30c8\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f</string>
     <string name="could_not_download_album_cover">"\u5bfe\u5fdc\u3059\u308b\u30a2\u30eb\u30d0\u30e0\u30ab\u30d0\u30fc\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u51fa\u6765\u307e\u305b\u3093\u3067\u3057\u305f\u3002"</string>
@@ -95,36 +82,23 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="create_action">作成</string>
     <string name="created_playlist_x">作成されたプレイリスト %1$s</string>
     <string name="currently_listening_to_x_by_x">%1$sから%2$sを再生中</string>
-    <string name="custom">カスタム</string>
     <string name="dark_theme_name">ダーク</string>
-    <string name="date">日付</string>
     <string name="default_hint">歌詞なし</string>
-    <string name="delete_action">削除</string>
     <string name="delete_playlist_title">再生リストを削除</string>
     <string name="delete_playlist_x"><![CDATA[<b>%1$s</b>を削除しますか？]]></string>
     <string name="delete_playlists_title">再生リストを削除</string>
-    <string name="delete_song_title">削除</string>
     <string name="delete_song_x"><![CDATA[ <b>%1$s</b>を削除しますか？]]></string>
-    <string name="delete_songs_title">曲を削除</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="deleting_songs">曲を削除しています</string>
     <string name="do_you_want_to_clear_the_blacklist">ブラックリストを削除しますか？</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[<b>%1$s</b>をブラックリストから削除しますか？]]></string>
     <string name="donate">寄付</string>
     <string name="donate_summary">もしあなたが私の仕事を評価した場合、数ドルの寄付ができます。</string>
     <string name="donation_header">私に買ってください</string>
     <string name="download_from_last_fm">Last.fmからダウンロード</string>
-    <string name="duration">長さ</string>
-    <string name="edit">編集</string>
-    <string name="edit_categories">カテゴリの編集</string>
-    <string name="edit_tags">タグを編集</string>
     <string name="empty">空</string>
     <string name="equalizer">イコライザー</string>
-    <string name="error_loading_lyrics_from_network">ネットワークからの読み込みに失敗</string>
-    <string name="experimental">試験的</string>
-    <string name="failed_to_save_playlist">再生リスト(%s)の保存に失敗しました</string>
     <string name="favorites">お気に入り</string>
     <string name="flat">フラット</string>
     <string name="folders">フォルダ</string>
@@ -140,35 +114,24 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
     <string name="history">履歴</string>
-    <string name="holiday">ホリデー</string>
     <string name="home">ホーム</string>
     <string name="inserted_x_songs_into_playlist_x">再生リスト %2$sに%1$d曲を追加しました</string>
-    <string name="inspired_designs_by">この方々のデザインを参考にしました:</string>
-    <string name="join_community">Google Plusのコミュニティーに参加</string>
-    <string name="join_community_summary">ヘルプが必要な場合や質問はRetro musicのGoogle Plusコミュニティでお願いします。</string>
     <string name="label_bit_rate">ビットレート</string>
-    <string name="label_details">詳細</string>
     <string name="label_file_format">フォーマット</string>
     <string name="label_file_name">ファイル名</string>
     <string name="label_file_path">ファイルパス</string>
     <string name="label_file_size">サイズ</string>
     <string name="label_sampling_rate">サンプリングレート</string>
     <string name="label_track_length">長さ</string>
-    <string name="language_contributors">翻訳者</string>
     <string name="last_added">最近追加したもの</string>
     <string name="lets_play_something">何か再生しましょう</string>
     <string name="library">ブラウズ</string>
-    <string name="library_categories">カテゴリ</string>
     <string name="licenses">ライセンス</string>
     <string name="light_theme_name">ホワイト</string>
     <string name="listing_files">リストファイル</string>
-    <string name="loading">読み込み中…</string>
     <string name="loading_products">プロダクトを読み込み中...</string>
     <string name="lyrics">歌詞</string>
-    <string name="media_route_menu_title">キャスト先デバイス</string>
-    <string name="more">さらに</string>
     <string name="my_name">私の名前</string>
-    <string name="my_playlists">プレイリスト</string>
     <string name="my_top_tracks">自分のトップトラック</string>
     <string name="never">無効</string>
     <string name="new_playlist_title">新規再生リスト</string>
@@ -177,7 +140,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="no_artists">アーティスト無し</string>
     <string name="no_audio_ID">"曲を再生して、もう一度お試し下さい"</string>
     <string name="no_equalizer">イコライザーは準備中です</string>
-    <string name="no_files">ファイル無し</string>
     <string name="no_genres">ジャンルなし</string>
     <string name="no_lyrics_found">歌詞が見つかりませんでした</string>
     <string name="no_playlists">再生リストなし</string>
@@ -197,8 +159,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="permissions_denied">パーミッションが拒否されました</string>
     <string name="pick_from_local_storage">ローカルストレージから選択</string>
     <string name="plain">プレーン</string>
-    <string name="play">再生</string>
-    <string name="play_all">全て再生</string>
     <string name="playing_notification_description">再生中の通知がコントローラーを提供します</string>
     <string name="playing_notification_name">再生中の通知</string>
     <string name="playlist_empty_text">空のプレイリスト</string>
@@ -209,11 +169,8 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="pref_header_general">一般</string>
     <string name="pref_header_images">画像</string>
     <string name="pref_header_lockscreen">ロック画面</string>
-    <string name="pref_header_now_playing_screen">再生中画面のテーマ</string>
     <string name="pref_header_playlists">プレイリスト</string>
     <string name="pref_only_lollipop">"Lollipop(Android5.0)以上で使用可能"</string>
-    <string name="pref_only_nougat_mr1">"Android7.1以上で使用可能"</string>
-    <string name="pref_summary_about">このプロジェクトの貢献者</string>
     <string name="pref_summary_album_art_on_lockscreen">再生中のアルバムカバーをロック画面の壁紙に使用</string>
     <string name="pref_summary_audio_ducking">通知などが来た際にボリュームを下げます。</string>
     <string name="pref_summary_blurred_album_art">ロック画面でアルバムカバーをぼかします。他のアプリやウィジェットで問題が起こる場合があります。</string>
@@ -223,24 +180,15 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="pref_summary_colored_app_shortcuts">アプリのショートカットにアクセントカラーを適用します。あなたがいつも色を変更する場合、有効にしてください。</string>
     <string name="pref_summary_colored_navigation_bar">ナビゲーションバーがプライマリカラーで着色されます</string>
     <string name="pref_summary_colored_notification">"\u901a\u77e5\u306b\u30a2\u30eb\u30d0\u30e0\u30ab\u30d0\u30fc\u304b\u3089\u62bd\u51fa\u3057\u305f\u8272\u3092\u4f7f\u7528"</string>
-    <string name="pref_summary_day_dream">曲を再生中に曲の詳細を表示する</string>
     <string name="pref_summary_dominant_color">アルバム/アーティスト画像から選択されます</string>
-    <string name="pref_summary_exclude_songs">30秒未満のトラックを除外します</string>
     <string name="pref_summary_gapless_playback">"幾つかの端末で再生に問題が発生する場合があります"</string>
     <string name="pref_summary_ignore_media_store_artwork">アルバムカバーの品質を上げることができますが、読み込みに時間がかかる場合があります。低品質の画像に問題がある場合のみ有効にしてください。</string>
-    <string name="pref_summary_language_en">言語を強制的に英語にする(複数言語対応へのテスト)</string>
-    <string name="pref_summary_library_categories">カテゴリの並びや表示を設定する</string>
     <string name="pref_summary_lock_screen">Retroプレイヤーのロック画面コントロールを表示</string>
-    <string name="pref_summary_lock_screen_app">ロック画面でフルコントロールを表示</string>
     <string name="pref_summary_open_source_licences">オープンソースソフトウェアのライセンス詳細</string>
     <string name="pref_summary_round_corners">ウィンドウやアルバムアートの角を丸くします</string>
     <string name="pref_summary_tab_titles">最下部タブの見出しを有効/無効</string>
-    <string name="pref_summary_toggle_bottom_bar_titles">下部ナビゲーションバーのタイトルを無効</string>
     <string name="pref_summary_toggle_full_screen">没入モードを有効</string>
-    <string name="pref_summary_toggle_genre">ジャンルを表示したくない場合、非表示にできます</string>
     <string name="pref_summary_toggle_headset">有線ヘッドフォンの接続時に再生を開始する</string>
-    <string name="pref_summary_toggle_navigation_bar">ナビゲーションバーのみを隠す</string>
-    <string name="pref_summary_toggle_status_bar">ステータスバーのみを隠す</string>
     <string name="pref_summary_toggle_volume">再生画面にスペースがあれば音量コントロールを有効にする</string>
     <string name="pref_title_album_art_on_lockscreen">アルバムカバーを表示</string>
     <string name="pref_title_app_shortcuts">アプリのショートカットを着色</string>
@@ -250,29 +198,18 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="pref_title_classic_notification">クラシックな通知デザイン</string>
     <string name="pref_title_colored_app">色を変化させる</string>
     <string name="pref_title_colored_notification">通知に色を付ける</string>
-    <string name="pref_title_day_dream">スクリーンセーバー</string>
-    <string name="pref_title_exclude_songs">トラックの除外</string>
-    <string name="pref_title_external_storage_access">外部ストレージへのアクセス権を付与</string>
     <string name="pref_title_gapless_playback">ギャップレス再生</string>
     <string name="pref_title_general_theme">全体のテーマ</string>
-    <string name="pref_title_gradient_color">色を選択</string>
     <string name="pref_title_ignore_media_store_artwork">メディアストアのカバーを無視</string>
     <string name="pref_title_last_added_interval">最後に追加されたプレイリストに表示する間隔</string>
     <string name="pref_title_lock_screen">フルスクリーンコントロール</string>
-    <string name="pref_title_lock_screen_app">レトロなロック画面</string>
-    <string name="pref_title_lyrics_options">歌詞の設定</string>
     <string name="pref_title_navigation_bar">ナビゲーションバーを着色</string>
     <string name="pref_title_now_playing_screen_appearance">外観</string>
     <string name="pref_title_open_source_licences">オープンソースライセンス</string>
     <string name="pref_title_round_corners">角を丸める</string>
-    <string name="pref_title_toggle_bottom_bar_titles">タイトルを無効</string>
     <string name="pref_title_toggle_carousel_effect">カルーセル エフェクト</string>
     <string name="pref_title_toggle_dominant_color">テーマ色</string>
     <string name="pref_title_toggle_full_screen">アプリを全画面にする</string>
-    <string name="pref_title_toggle_genre">ジャンルを非表示にする</string>
-    <string name="pref_title_toggle_language_en">英語</string>
-    <string name="pref_title_toggle_navigation_bar">ナビゲーションバー</string>
-    <string name="pref_title_toggle_status_bar">ステータスバー</string>
     <string name="pref_title_toggle_tab_titles">タブの見出し</string>
     <string name="pref_title_toggle_toggle_headset">自動再生</string>
     <string name="pref_title_toggle_volume">音量調節</string>
@@ -282,7 +219,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="queue">キュー</string>
     <string name="rate_app">このアプリを評価</string>
     <string name="rate_on_google_play_summary">このアプリを気に入っていただけたら、改善のためにGoogle Play ストアでお知らせください。</string>
-    <string name="recent_activity">最近のアクティビティ</string>
     <string name="remove_action">除外</string>
     <string name="remove_cover">カバーを削除</string>
     <string name="remove_from_blacklist">ブラックリストから削除</string>
@@ -290,95 +226,53 @@ https://play.google.com/store/apps/details?id=%s</string>
     <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_action">名前を変更</string>
     <string name="rename_playlist_title">再生リストの名前を変更</string>
     <string name="reset_artist_image">アーティストの画像をリセット</string>
     <string name="restored_previous_purchases">以前の購入を復元</string>
-    <string name="retro">レトロ</string>
     <string name="retro_equalizer">Retriイコライザー</string>
-    <string name="saf_delete_failed">ファイルの削除に失敗しました:%s</string>
     <!-- SAF -->
-    <string name="saf_error_uri">SAFのURIを取得できません</string>
-    <string name="saf_guide_slide1_description">ナビゲーションドロワーを開く</string>
-    <string name="saf_guide_slide1_description_before_o">右上のメニューに「SDカードを表示する」の項目を表示する</string>
     <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%sにはSDカードへのアクセス権が必要です</string>
-    <string name="saf_guide_slide2_description">SDカードのルートディレクトリを選択する必要があります</string>
-    <string name="saf_guide_slide2_title">スライドメニューでSDカードを選択してください</string>
-    <string name="saf_guide_slide3_description">どのサブフォルダも選択しないでください</string>
-    <string name="saf_guide_slide3_title">画面下部の「選択」ボタンをタップしてください</string>
-    <string name="saf_pick_file">ファイルへのアクセス権が必要です。%sを選択してください。</string>
-    <string name="saf_pick_sdcard">SDカードへのアクセス権が必要です。SDカードのルートフォルダを選択してください。</string>
-    <string name="saf_write_failed">ファイルの書き込みに失敗しました:%s</string>
     <string name="save_playlist_title">ファイルに保存</string>
     <string name="saved_playlist_to">%sへ保存しました</string>
     <string name="saving_changes">変更を保存</string>
-    <string name="saving_tags">タグを保存</string>
-    <string name="saving_to_file">ファイルに保存</string>
     <string name="scanned_files">%2$d中%1$d個のファイルをスキャンしました</string>
     <string name="search_hint">ライブラリを検索中...</string>
-    <string name="see_all">すべて見る</string>
-    <string name="select_preset">プリセットを選択</string>
     <string name="set_artist_image">アーティストの画像をセット</string>
     <string name="shuffle">シャッフル</string>
     <string name="simple">シンプル</string>
     <string name="sleep_timer_canceled">スリープタイマーがキャンセルされました</string>
     <string name="sleep_timer_set">%d分後にスリープタイマーがセットされました。</string>
-    <string name="slide_unlock">スワイプしてロック解除</string>
     <string name="song">曲</string>
     <string name="song_duration">再生時間</string>
     <string name="songs">曲</string>
     <string name="sort_order">並べ替え</string>
     <string name="speech_not_supported">申し訳ありません、この機種は音声入力に対応していません</string>
     <string name="speech_prompt">ライブラリを検索</string>
-    <string name="summary_material_design_city_wallpaper">www.techjuice.pkから入手した街のマテリアルデザイン壁紙</string>
-    <string name="summary_material_design_icons">すべてのアイコンは www.flaticon.com と materialdesignicons.com から入手したものを使用しています</string>
     <string name="summary_user_info">ホーム画面であなたの名前を表示します</string>
     <string name="support_development">開発を支援</string>
     <!-- Message displayed when tag editing fails -->
-    <string name="tag_edit_error">タグを編集中にエラーが発生しました</string>
-    <string name="tag_editor_check_permission">権限をチェックしています</string>
-    <string name="tag_editor_document_tree_message">外部ストレージのディレクトリを選択してください</string>
-    <string name="tag_editor_document_tree_permission_failed">ファイルへのアクセスが許可されていないようです。ファイル選択画面でチェックしてみてください。</string>
-    <string name="tag_error_kitkat">タグを編集中にエラーが発生しました。ファイルがSDカードに保存されていませんか？Googleの制約によりそのようなファイルの編集はできません。</string>
-    <string name="tag_error_lollipop">タグを編集中にエラーが発生しました。ファイルがSDカード上にある場合、アクセス権が付与されていない可能性があります</string>
-    <string name="tag_retrieve_error">タグを解析中にエラーが発生しました</string>
     <string name="thank_you">ありがとう！</string>
     <string name="the_audio_file">オーディオファイル</string>
     <string name="this_month">今月</string>
     <string name="this_week">今週</string>
     <string name="this_year">今年</string>
     <string name="tiny">小さい</string>
-    <string name="title">タイトル</string>
     <string name="title_dashboard">ダッシュボード</string>
-    <string name="title_desc">タイトル(降順)</string>
     <string name="title_good_afternoon">こんにちは</string>
     <string name="title_good_day">こんにちは</string>
     <string name="title_good_evening">こんにちは</string>
     <string name="title_good_morning">おはようございます</string>
     <string name="title_good_night">おやすみなさい</string>
-    <string name="title_home">ホーム</string>
-    <string name="title_material_design_city_wallpaper">街の壁紙</string>
-    <string name="title_material_design_icons">アイコン</string>
-    <string name="title_notifications">通知</string>
     <string name="title_user_info">あなたの名前を教えて下さい</string>
     <string name="today">今日</string>
-    <string name="toggle_lyrics_size">歌詞のサイズを変更する</string>
-    <string name="tool_tip_see_all">すべての曲を見る</string>
-    <string name="top_tracks">よく再生する曲</string>
     <string name="track_hint">"トラック("2"でトラック2、"3004"でCD3のトラック4)"</string>
     <string name="track_list">トラック番号</string>
     <string name="translate">翻訳</string>
-    <string name="translate_summary">Retro music をあなたの言語へ翻訳するのを手伝う</string>
     <string name="unplayable_file">\u3053\u306e\u30c8\u30e9\u30c3\u30af\u3092\u518d\u751f\u3067\u304d\u307e\u305b\u3093</string>
     <string name="up_next">次</string>
-    <string name="update">アップデート</string>
     <string name="update_image">画像を更新</string>
-    <string name="updated_artist_image">アーティストの画像が更新されました</string>
     <string name="updating">更新中...</string>
     <string name="version">バージョン</string>
-    <string name="virtualizer_strength">バーチャライザーの強さ</string>
-    <string name="volume_control">音量調節</string>
     <string name="web_search">web検索</string>
     <string name="what_do_you_want_to_share">何をシェアしますか？</string>
     <string name="x_has_been_set_as_ringtone">%1$sを着信メロディーに設定しました</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 844e13c7f..240074585 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -8,7 +8,6 @@
     <string name="action_add_to_playlist">재생목록에 추가...</string>
     <string name="action_clear_playing_queue">재생 대기열 비우기</string>
     <string name="action_clear_playlist">재생목록 비우기</string>
-    <string name="action_cycle_repeat">A-B 반복 모드</string>
     <string name="action_delete">삭제</string>
     <string name="action_delete_from_device">기기에서 삭제</string>
     <string name="action_details">세부 정보</string>
@@ -18,13 +17,11 @@
     <string name="action_grant">허용</string>
     <string name="action_grid_size">격자 크기</string>
     <string name="action_grid_size_land">격자 크기 (가로)</string>
-    <string name="action_new_playlist">새 재생목록…</string>
     <string name="action_next">다음</string>
     <string name="action_play">재생</string>
     <string name="action_play_next">다음 곡 재생</string>
     <string name="action_play_pause">재생/일시정지</string>
     <string name="action_previous">이전</string>
-    <string name="action_re_download_artist_image">아티스트 이미지 업데이트</string>
     <string name="action_remove_from_favorites">즐겨찾기에서 제거</string>
     <string name="action_remove_from_playing_queue">재생 대기열에서 제거</string>
     <string name="action_remove_from_playlist">재생목록에서 제거</string>
@@ -37,15 +34,10 @@
     <string name="action_set_as_start_directory">초기 디렉터리로 설정</string>
     <string name="action_settings">"설정"</string>
     <string name="action_share">공유</string>
-    <string name="action_show_lyrics">가사 보기</string>
-    <string name="action_shuffle_album">앨범 무작위 재생</string>
     <string name="action_shuffle_all">모든 곡 무작위 재생</string>
-    <string name="action_shuffle_artist">아티스트 무작위 재생</string>
     <string name="action_shuffle_playlist">재생목록 무작위 재생</string>
     <string name="action_sleep_timer">수면 타이머</string>
     <string name="action_tag_editor">태그 편집기</string>
-    <string name="action_toggle_favorite">즐겨찾기 보기/숨기기</string>
-    <string name="action_toggle_shuffle">무작위 재생 모드</string>
     <string name="add_action">추가</string>
     <string name="add_photo">사진\n추가</string>
     <string name="add_playlist_title">"재생목록에 추가"</string>
@@ -53,11 +45,9 @@
     <string name="added_x_titles_to_playing_queue">재생 대기열에 %1$d곡이 추가되었습니다.</string>
     <string name="album">앨범</string>
     <string name="album_artist">앨범 아티스트</string>
-    <string name="album_desc">앨범 내림차순</string>
     <string name="album_or_artist_empty">제목 또는 아티스트가 없습니다.</string>
     <string name="albums">앨범</string>
     <!-- Android Auto -->
-    <string name="albums_label">앨범</string>
     <string name="always">항상</string>
     <string name="app_share">이 멋진 뮤직 플레이어를 한 번 써보세요!: https://play.google.com/store/apps/details?id=%s</string>
     <!-- App Shortcuts -->
@@ -67,22 +57,15 @@
     <string name="app_shortcut_shuffle_all_short">무작위</string>
     <string name="app_shortcut_top_tracks_long">@string/my_top_tracks</string>
     <string name="app_shortcut_top_tracks_short">자주 재생한 음악</string>
-    <string name="app_summary">머티리얼 디자인과 iOS를 고려한 하이브리드 애플리케이션.</string>
     <string name="app_widget_big_name">Retro music - 대형</string>
-    <string name="app_widget_big_name_2">Retro music - 대형 2</string>
     <string name="app_widget_card_name">Retro music - 카드</string>
     <string name="app_widget_classic_name">Retro music - 클래식</string>
     <string name="app_widget_small_name">Retro music - 소형</string>
     <string name="artist">아티스트</string>
-    <string name="artist_desc">아티스트 내림차순</string>
     <string name="artists">아티스트</string>
-    <string name="artists_label">아티스트</string>
-    <string name="at_least_one_category_must_be_enabled">최소 하나의 카테고리가 활성화되어 있어야 합니다.</string>
     <string name="audio_focus_denied">오디오 포커스가 거부되었습니다.</string>
     <string name="audio_settings_summary">소리 설정 및 이퀄라이저 조정</string>
-    <string name="bass_boost_strength">베이스 부스트 강도</string>
     <string name="biography">바이오그래피</string>
-    <string name="biography_unavailable">\ud574\ub2f9 \uc544\ud2f0\uc2a4\ud2b8\uc758 \ubc14\uc774\uc624\uadf8\ub798\ud53c\ub97c \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.</string>
     <string name="black_theme_name">저스트 블랙</string>
     <string name="blacklist">블랙리스트</string>
     <string name="blur">흐림 효과</string>
@@ -98,7 +81,6 @@
     <string name="clear_playlist_x"><![CDATA[<b>%1$s</b> \uc7ac\uc0dd\ubaa9\ub85d\uc744 \ube44\uc6b0\uc2dc\uaca0\uc2b5\ub2c8\uae4c? \uc774 \uc791\uc5c5\uc740 \ucde8\uc18c\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4!]]></string>
     <string name="color">색상</string>
     <string name="color_theme_name">색상</string>
-    <string name="colored_footers">하단 색상 틴트</string>
     <string name="colors">색상</string>
     <string name="could_not_create_playlist">\uc7ac\uc0dd\ubaa9\ub85d\uc744 \ub9cc\ub4e4 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.</string>
     <string name="could_not_download_album_cover">"\uc774 \uc568\ubc94\uacfc \uc77c\uce58\ud558\ub294 \uc568\ubc94 \ucee4\ubc84\ub97c \ub2e4\uc6b4\ub85c\ub4dc\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4."</string>
@@ -107,36 +89,23 @@
     <string name="create_action">만들기</string>
     <string name="created_playlist_x">%1$s 재생목록을 만들었습니다.</string>
     <string name="currently_listening_to_x_by_x">현재 %2$s의 %1$s를 듣는 중입니다.</string>
-    <string name="custom">사용자 지정</string>
     <string name="dark_theme_name">카인다 다크</string>
-    <string name="date">날짜</string>
     <string name="default_hint">가사 없음</string>
-    <string name="delete_action">삭제</string>
     <string name="delete_playlist_title">재생목록 삭제</string>
     <string name="delete_playlist_x"><![CDATA[<b>%1$s</b> 재생목록을 삭제하시겠습니까?]]></string>
     <string name="delete_playlists_title">재생목록 삭제</string>
-    <string name="delete_song_title">노래 삭제</string>
     <string name="delete_song_x"><![CDATA[<b>%1$s</b> 노래를 삭제하시겠습니까?]]></string>
-    <string name="delete_songs_title">노래 삭제</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="deleting_songs">노래 삭제</string>
     <string name="do_you_want_to_clear_the_blacklist">블랙리스트를 비우시겠습니까?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[블랙리스트에서 <b>%1$s</b> 항목을 제거하시겠습니까?]]></string>
     <string name="donate">기부하기</string>
     <string name="donate_summary">제 작업에 대한 대가를 받을 자격이 있다고 생각하신다면 여기서 저를 위해 소액을 기부할 수 있습니다.</string>
     <string name="donation_header">사주세요!</string>
     <string name="download_from_last_fm">Last.fm에서 다운로드</string>
-    <string name="duration">길이</string>
-    <string name="edit">편집</string>
-    <string name="edit_categories">카테고리 편집</string>
-    <string name="edit_tags">태그 수정하기</string>
     <string name="empty">비어 있음</string>
     <string name="equalizer">이퀄라이저</string>
-    <string name="error_loading_lyrics_from_network">네트워크 불러오기 오류</string>
-    <string name="experimental">실험 기능</string>
-    <string name="failed_to_save_playlist">재생목록을 저장할 수 없습니다 (%s).</string>
     <string name="favorites">즐겨찾기</string>
     <string name="flat">플랫</string>
     <string name="folders">폴더</string>
@@ -146,7 +115,6 @@
     <string name="general_settings_title">외관</string>
     <string name="genre">장르</string>
     <string name="genres">장르</string>
-    <string name="gradient">기울기</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -156,36 +124,24 @@
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
     <string name="history">기록</string>
-    <string name="history_label">기록</string>
-    <string name="holiday">휴일</string>
     <string name="home">홈</string>
     <string name="inserted_x_songs_into_playlist_x">%2$s 재생목록에 %1$d개의 노래를 추가했습니다.</string>
-    <string name="inspired_designs_by">Inspired designs by</string>
-    <string name="join_community">Google+ 커뮤니티에 가입</string>
-    <string name="join_community_summary">도움이 필요하거나 질문이 있다면 Google+의 Retro Music 커뮤니티를 찾으세요.</string>
     <string name="label_bit_rate">비트레이트</string>
-    <string name="label_details">상세 정보</string>
     <string name="label_file_format">형식</string>
     <string name="label_file_name">파일 이름</string>
     <string name="label_file_path">파일 경로</string>
     <string name="label_file_size">크기</string>
     <string name="label_sampling_rate">샘플링 레이트</string>
     <string name="label_track_length">길이</string>
-    <string name="language_contributors">번역</string>
     <string name="last_added">최근 추가된 목록</string>
     <string name="lets_play_something">아무거나 재생해보죠!</string>
     <string name="library">라이브러리</string>
-    <string name="library_categories">라이브러리 카테고리</string>
     <string name="licenses">라이선스</string>
     <string name="light_theme_name">클리어리 화이트</string>
     <string name="listing_files">파일 목록 생성</string>
-    <string name="loading">불러오는 중...</string>
     <string name="loading_products">제품을 불러오는 중...</string>
     <string name="lyrics">가사</string>
-    <string name="media_route_menu_title">캐스트 장치</string>
-    <string name="more">더보기</string>
     <string name="my_name">내 이름</string>
-    <string name="my_playlists">내 재생목록</string>
     <string name="my_top_tracks">자주 재생한 음악</string>
     <string name="never">아니오</string>
     <string name="new_playlist_title">새 재생목록</string>
@@ -194,7 +150,6 @@
     <string name="no_artists">아티스트 없음</string>
     <string name="no_audio_ID">"먼저 노래를 재생하고 다시 시도해 보십시오."</string>
     <string name="no_equalizer">이퀄라이저가 없습니다.</string>
-    <string name="no_files">파일 없음</string>
     <string name="no_genres">장르 없음</string>
     <string name="no_lyrics_found">가사 없음</string>
     <string name="no_playlists">재생목록 없음</string>
@@ -219,52 +174,36 @@
     <string name="personalize_settings_summary">지금 재생 중 화면과 UI 변경</string>
     <string name="pick_from_local_storage">로컬 저장소에서 선택</string>
     <string name="plain">단색</string>
-    <string name="play">재생</string>
-    <string name="play_all">모두 재생</string>
     <string name="playing_notification_description">재생 알림은 재생/일시 정지 등에 대한 작업을 제공합니다.</string>
     <string name="playing_notification_name">재생 중 알림</string>
     <string name="playlist_empty_text">빈 재생목록</string>
     <string name="playlist_is_empty">재생목록이 비어 있음</string>
     <string name="playlist_name_empty">재생목록 이름</string>
     <string name="playlists">재생목록</string>
-    <string name="playlists_label">재생목록</string>
     <string name="pref_header_audio">오디오</string>
     <string name="pref_header_general">일반</string>
     <string name="pref_header_images">이미지</string>
     <string name="pref_header_lockscreen">잠금 화면</string>
-    <string name="pref_header_now_playing_screen">지금 재생 중</string>
     <string name="pref_header_playlists">재생목록</string>
     <string name="pref_only_lollipop">"안드로이드 롤리팝에서만 사용할 수 있습니다."</string>
-    <string name="pref_only_nougat_mr1">"안드로이드 누가 7.1에서만 사용할 수 있습니다."</string>
-    <string name="pref_summary_about">프로젝트에 도움을 주신 분들</string>
     <string name="pref_summary_album_art_on_lockscreen">현재 재생 중인 노래의 앨범 커버를 잠금 화면 배경화면으로 사용합니다.</string>
     <string name="pref_summary_audio_ducking">알림, 탐색 등</string>
     <string name="pref_summary_blurred_album_art">잠금 화면의 앨범 커버에 흐림 효과를 적용합니다. 서드 파티 앱 및 위젯에서 문제가 생길 수 있습니다.</string>
     <string name="pref_summary_carousel_effect">지금 재생 중 화면에서 이전/다음 곡의 앨범 아트를 표시합니다.</string>
-    <string name="pref_summary_circular_album_effect">선택한 테마의 재생 중 스크린에서 동그란 앨범 커버를 사용합니다.</string>
     <string name="pref_summary_classic_notification">클래식 알림 디자인을 사용합니다.</string>
     <string name="pref_summary_colored_app">배경과 조작 버튼의 색상을 재생 화면의 앨범 사진에 따라 바꿉니다.</string>
     <string name="pref_summary_colored_app_shortcuts">강조 색상의 앱 바로 가기 색상을 지정합니다. 색깔을 바꿀 때마다 이 설정을 다시 켜주세요</string>
     <string name="pref_summary_colored_navigation_bar">네비게이션 바의 기본 색상을 지정합니다.</string>
     <string name="pref_summary_colored_notification">"\uc568\ubc94 \uc544\ud2b8\ub85c\ubd80\ud130 \ucd94\ucd9c\ud55c \uc0c9\uc0c1\uc73c\ub85c \uc54c\ub9bc \uc0c9\uc0c1\uc744 \uc9c0\uc815\ud569\ub2c8\ub2e4."</string>
-    <string name="pref_summary_day_dream">음악이 재생중일 때 Dream에 음악의 세부 정보를 표시합니다</string>
     <string name="pref_summary_dominant_color">앨범 아트나 아티스트 사진에서 가장 많이 사용된 색상을 고릅니다.</string>
-    <string name="pref_summary_exclude_songs">30초보다 짧은 음악은 제외합니다.</string>
     <string name="pref_summary_gapless_playback">"몇몇 기기에서 재생 문제를 유발할 수 있습니다."</string>
     <string name="pref_summary_ignore_media_store_artwork">앨범 커버의 품질을 향상시킬 수 있지만 이미지를 불러오는 시간이 늘어납니다. 저해상도 이미지를 불러오는 데 문제가 있는 경우에만 사용하십시오.</string>
-    <string name="pref_summary_language_en">앱의 언어를 강제로 영어로 변경합니다 (다중 언어 옵션 테스트)</string>
-    <string name="pref_summary_library_categories">라이브러리에 나타낼 카테고리와 그 순서를 설정합니다.</string>
     <string name="pref_summary_lock_screen">Retro music에서 제공하는 자체 잠금 화면 사용</string>
-    <string name="pref_summary_lock_screen_app">잠금 화면에 컨트롤러 보이기</string>
     <string name="pref_summary_open_source_licences">오픈소스 소프트웨어의 상세 라이센스 정보</string>
     <string name="pref_summary_round_corners">창이나 앨범 아트 등의 모서리를 둥글게 처리</string>
     <string name="pref_summary_tab_titles">하단 탭에 제목을 보여줄지 결정합니다.</string>
-    <string name="pref_summary_toggle_bottom_bar_titles">하단 내비게이션 바에서 노래 제목 숨기기</string>
     <string name="pref_summary_toggle_full_screen">몰입 모드</string>
-    <string name="pref_summary_toggle_genre">하단 탭에 장르를 표시하지 않습니다.</string>
     <string name="pref_summary_toggle_headset">이어폰이 연결되면 바로 음악을 재생합니다.</string>
-    <string name="pref_summary_toggle_navigation_bar">내비게이션 바만 숨기기</string>
-    <string name="pref_summary_toggle_status_bar">상태 표시줄만 숨기기</string>
     <string name="pref_summary_toggle_volume">음악 재생 화면에서 공간이 있을 시 볼륨 컨트롤을 보입니다</string>
     <string name="pref_title_album_art_on_lockscreen">앨범 커버 표시</string>
     <string name="pref_title_app_shortcuts">앱 바로가기 색상 틴트</string>
@@ -274,30 +213,18 @@
     <string name="pref_title_classic_notification">클래식 알림 디자인</string>
     <string name="pref_title_colored_app">반응형 색상 지정</string>
     <string name="pref_title_colored_notification">알림 색상 틴트</string>
-    <string name="pref_title_day_dream">데이드림</string>
-    <string name="pref_title_exclude_songs">노래 제외</string>
-    <string name="pref_title_external_storage_access">외부 저장소 접근 권한을 부여해 주십시오.</string>
     <string name="pref_title_gapless_playback">지연없이 재생하기</string>
     <string name="pref_title_general_theme">기본 테마</string>
-    <string name="pref_title_gradient_color">색상 선택</string>
     <string name="pref_title_ignore_media_store_artwork">미디어 저장소 커버 무시</string>
     <string name="pref_title_last_added_interval">최근 추가된 음악 간격 지정</string>
     <string name="pref_title_lock_screen">전체 화면 컨트롤</string>
-    <string name="pref_title_lock_screen_app">Retro 잠금 화면</string>
-    <string name="pref_title_lyrics_options">가사 옵션</string>
     <string name="pref_title_navigation_bar">네비게이션 바 색상 틴트</string>
     <string name="pref_title_now_playing_screen_appearance">테마</string>
     <string name="pref_title_open_source_licences">오픈소스 라이선스</string>
     <string name="pref_title_round_corners">모서리 둥글게 처리</string>
-    <string name="pref_title_toggle_bottom_bar_titles">제목 숨기기</string>
     <string name="pref_title_toggle_carousel_effect">회전 효과</string>
-    <string name="pref_title_toggle_circular_album_effect">동그란 앨범</string>
     <string name="pref_title_toggle_dominant_color">주요 색상</string>
     <string name="pref_title_toggle_full_screen">전체 화면</string>
-    <string name="pref_title_toggle_genre">장르 표시하기</string>
-    <string name="pref_title_toggle_language_en">영어 사용</string>
-    <string name="pref_title_toggle_navigation_bar">내비게이션 바</string>
-    <string name="pref_title_toggle_status_bar">상태 표시줄</string>
     <string name="pref_title_toggle_tab_titles">탭 제목</string>
     <string name="pref_title_toggle_toggle_headset">자동 재생</string>
     <string name="pref_title_toggle_volume">볼륨 조절</string>
@@ -306,10 +233,8 @@
     <string name="primary_color_desc">테마의 주 색상을 선택합니다. 기본값은 회청색입니다.</string>
     <string name="purchase">구매</string>
     <string name="queue">대기열</string>
-    <string name="queue_label">대기열</string>
     <string name="rate_app">앱 평가</string>
     <string name="rate_on_google_play_summary">앱이 마음에 드신다면 Google Play 스토어에 평가를 남겨주세요.</string>
-    <string name="recent_activity">최근 활동</string>
     <string name="recent_albums">지난 앨범</string>
     <string name="recent_artists">지난 아티스트</string>
     <string name="remove_action">제거</string>
@@ -319,112 +244,62 @@
     <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_action">이름 바꾸기</string>
     <string name="rename_playlist_title">재생목록 이름 바꾸기</string>
-    <string name="reset_action">초기화</string>
     <string name="reset_artist_image">아티스트 이미지 초기화</string>
     <string name="restore">복원</string>
     <string name="restored_previous_purchase_please_restart">지난 구매를 복원했습니다. 모든 기능을 사용하기 위해선 앱을 재시작해 주세요.</string>
     <string name="restored_previous_purchases">이전 구매 내역을 복원했습니다.</string>
     <string name="restoring_purchase">구매 복원 중...</string>
-    <string name="retro">Retro</string>
     <string name="retro_equalizer">Retro 이퀄라이저</string>
-    <string name="saf_delete_failed">파일 삭제 실패: %s</string>
     <!-- SAF -->
-    <string name="saf_error_uri">SAF URI를 받아올 수 없습니다</string>
-    <string name="saf_guide_slide1_description">네비게이션 드로어 열기</string>
-    <string name="saf_guide_slide1_description_before_o">오버플로우 메뉴에서 \'SD카드 보이기\' 활성화</string>
     <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s은 SD카드 접근 권한이 필요합니다</string>
-    <string name="saf_guide_slide2_description">SD카드의 초기 디렉토리를 선택해 주어야 합니다</string>
-    <string name="saf_guide_slide2_title">내비게이션 서랍에서 SD 카드를 선택하십시오.</string>
-    <string name="saf_guide_slide3_description">하위 폴더 열지 않기</string>
-    <string name="saf_guide_slide3_title">하단의 \'선택\' 버튼을 누르세요</string>
-    <string name="saf_pick_file">파일 접근이 필요합니다. %s를 선택해주세요</string>
-    <string name="saf_pick_sdcard">SD카드 접근 권한이 필요합니다. SD카드의 초기 디렉토리를 선택해주세요</string>
-    <string name="saf_write_failed">파일 쓰기 실패: %s</string>
     <string name="save_playlist_title">파일로 저장</string>
     <string name="saved_playlist_to">재생목록을 %s 위치에 파일로 저장했습니다.</string>
     <string name="saving_changes">변경 사항 저장</string>
-    <string name="saving_tags">태그 저장중</string>
-    <string name="saving_to_file">파일로 저장하는 중...</string>
     <string name="scanned_files">%2$d개 파일 중 %1$d개 파일을 스캔했습니다.</string>
     <string name="search_hint">라이브러리에서 검색…</string>
-    <string name="see_all">모두 보기</string>
-    <string name="select_preset">프리셋 선택</string>
     <string name="set_artist_image">아티스트 이미지 설정</string>
     <string name="shuffle">무작위 재생</string>
     <string name="simple">심플</string>
     <string name="sleep_timer_canceled">수면 타이머가 취소되었습니다.</string>
     <string name="sleep_timer_set">수면 타이머가 지금으로부터 %d분 후로 설정되었습니다.</string>
-    <string name="slide_unlock">스와이프하여 잠금해제</string>
-    <string name="solid">솔리드</string>
     <string name="song">노래</string>
     <string name="song_duration">노래 길이</string>
     <string name="songs">노래</string>
     <string name="sort_order">정렬 순서</string>
     <string name="speech_not_supported">음성 입력을 지원하지 않는 기기입니다</string>
     <string name="speech_prompt">라이브러리 검색</string>
-    <string name="suggestions">제안</string>
-    <string name="summary_material_design_city_wallpaper">웹사이트 www.techjuice.pk 의 머티리얼 디자인 도시 배경화면</string>
-    <string name="summary_material_design_icons">www.flaticon.com 또는 www.materialdesignicons.com의 아이콘을 사용했습니다.</string>
     <string name="summary_user_info">홈 화면에 사용자의 이름을 보여줍니다.</string>
     <string name="support_development">개발 지원</string>
-    <string name="support_development_summary">Retro Music Player가 마음에 드신다면 기부도 한 번 고려해 주세요.</string>
     <!-- Message displayed when tag editing fails -->
-    <string name="tag_edit_error">태그를 수정하는 중 오류가 발생하였습니다.</string>
-    <string name="tag_editor_check_permission">권한 확인중</string>
-    <string name="tag_editor_document_tree_message">외부 저장소 디렉터리를 선택해 주십시오.</string>
-    <string name="tag_editor_document_tree_permission_failed">이 파일을 수정하기 위한 권한이 부여되지 않은 것 같습니다. 파일 선택기에서 디렉토리를 다시 한 번 확인해주세요.</string>
-    <string name="tag_error_kitkat">태그를 수정하는 도중 오류가 발생하였습니다. 파일이 SD카드에 저장되어 있나요? Google은 이러한 파일의 태그 편집을 불가능하게 만들었습니다.</string>
-    <string name="tag_error_lollipop">태그를 수정하는 도중 오류가 발생하였습니다. 파일이 SD카드에 저장되어 있을 시 접근 권한이 필요합니다.</string>
-    <string name="tag_retrieve_error">태그를 불러오는 중 오류가 발생하였습니다.</string>
-    <string name="text">텍스트</string>
     <string name="thank_you">감사합니다!</string>
     <string name="the_audio_file">오디오 파일</string>
     <string name="this_month">이번 달</string>
     <string name="this_week">이번 주</string>
     <string name="this_year">올해</string>
     <string name="tiny">작음</string>
-    <string name="title">제목</string>
     <string name="title_dashboard">대시보드</string>
-    <string name="title_desc">제목 내림차순</string>
     <string name="title_good_afternoon">좋은 저녁입니다</string>
     <string name="title_good_day">좋은 하루입니다</string>
     <string name="title_good_evening">좋은 저녁입니다</string>
     <string name="title_good_morning">좋은 아침이에요</string>
     <string name="title_good_night">좋은 밤이에요</string>
-    <string name="title_home">홈</string>
-    <string name="title_material_design_city_wallpaper">도시 배경화면</string>
-    <string name="title_material_design_icons">아이콘</string>
-    <string name="title_notifications">알림</string>
     <string name="title_user_info">이름이 무엇인가요?</string>
     <string name="today">오늘</string>
-    <string name="toggle_lyrics_size">가사 크기 조정</string>
-    <string name="tool_tip_see_all">모든 노래 보기</string>
     <string name="top_albums">인기 앨범</string>
     <string name="top_artists">인기 아티스트</string>
-    <string name="top_tracks">자주 재생한 음악</string>
-    <string name="top_tracks_label">자주 재생한 음악</string>
     <string name="track_hint">"트랙 (트랙 2는 2, CD3의 트랙 4는 3004)"</string>
     <string name="track_list">트랙 번호</string>
     <string name="translate">번역</string>
-    <string name="translate_summary">Retro Music을 모국어로 번역하는 데 도와주세요.</string>
     <string name="unplayable_file">\uc774 \ub178\ub798\ub97c \uc7ac\uc0dd\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.</string>
     <string name="up_next">다음 곡으로 재생</string>
-    <string name="update">갱신</string>
     <string name="update_image">이미지 갱신</string>
-    <string name="updated_artist_image">아티스트 이미지가 갱신되었습니다.</string>
     <string name="updating">갱신 중...</string>
-    <string name="user_profile_summary">프로필과 배너 이미지 변경</string>
     <string name="version">버전</string>
-    <string name="virtualizer_strength">비주얼라이저 크기</string>
-    <string name="volume_control">볼륨 조절</string>
     <string name="web_search">웹 검색</string>
     <string name="what_do_you_want_to_share">무엇을 공유하시겠습니까?</string>
     <string name="window">창</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">최소 하나 이상의 카테고리를 선택해야 합니다.</string>
 </resources>
diff --git a/app/src/main/res/values-ldpi/dimens.xml b/app/src/main/res/values-ldpi/dimens.xml
deleted file mode 100644
index 04ed18675..000000000
--- a/app/src/main/res/values-ldpi/dimens.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="lock_screen_cover_width">320dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-mdpi/dimens.xml b/app/src/main/res/values-mdpi/dimens.xml
deleted file mode 100644
index 89fc9225d..000000000
--- a/app/src/main/res/values-mdpi/dimens.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="lock_screen_cover_width">340dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index fc28cc30d..6cf94fb51 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -17,13 +17,11 @@
     <string name="action_grant">Keizinan</string>
     <string name="action_grid_size">Saiz grid</string>
     <string name="action_grid_size_land">Saiz grid (landskap)</string>
-    <string name="action_new_playlist">Senarai main baru...</string>
     <string name="action_next">Seterusnya</string>
     <string name="action_play">Main</string>
     <string name="action_play_next">Mainkan seterusnya</string>
     <string name="action_play_pause">Main/Jeda</string>
     <string name="action_previous">Sebelumnya</string>
-    <string name="action_re_download_artist_image">Kemas kini imej seniman</string>
     <string name="action_remove_from_favorites">Keluarkan daripada kegemaran</string>
     <string name="action_remove_from_playing_queue">Keluarkan daripada baris gilir main</string>
     <string name="action_remove_from_playlist">Keluarkan daripada senarai main</string>
@@ -36,10 +34,7 @@
     <string name="action_set_as_start_directory">Tetapkan sebagai direktori mula</string>
     <string name="action_settings">"Seting"</string>
     <string name="action_share">Kongsi</string>
-    <string name="action_show_lyrics">Paparkan seni kata</string>
-    <string name="action_shuffle_album">Kocok album</string>
     <string name="action_shuffle_all">Kocok semua</string>
-    <string name="action_shuffle_artist">Kocok seniman</string>
     <string name="action_shuffle_playlist">Kocok senarai main</string>
     <string name="action_sleep_timer">Pemasa tidur</string>
     <string name="action_tag_editor">Penyunting tag</string>
@@ -50,7 +45,6 @@
     <string name="added_x_titles_to_playing_queue">%1$d judul ditambah ke baris gilir.</string>
     <string name="album">Album</string>
     <string name="album_artist">Seniman album</string>
-    <string name="album_desc">Perihalan album</string>
     <string name="album_or_artist_empty">Judul atau seniman adalah kosong.</string>
     <string name="albums">Album</string>
     <!-- Android Auto -->
@@ -63,19 +57,14 @@
     <string name="app_shortcut_shuffle_all_short">Kocok</string>
     <string name="app_shortcut_top_tracks_long">\@string/my_top_tracks</string>
     <string name="app_shortcut_top_tracks_short">Runut teratas</string>
-    <string name="app_summary">Satu aplikasi hibrid yang menggabungkan reka bentuk Material dan iOS.</string>
     <string name="app_widget_big_name">Retro Music - Besar</string>
-    <string name="app_widget_big_name_2">Retro Music - Besar 2</string>
     <string name="app_widget_card_name">Retro Music - Kad</string>
     <string name="app_widget_classic_name">Retro Music - Klasik</string>
     <string name="app_widget_small_name">Retro Music - Kecil</string>
     <string name="artist">Seniman</string>
-    <string name="artist_desc">Perihalan seniman</string>
     <string name="artists">Seniman</string>
     <string name="audio_focus_denied">Fokus audio dinafikan.</string>
-    <string name="bass_boost_strength">Kekuatan perangsang bes</string>
     <string name="biography">Biografi</string>
-    <string name="biography_unavailable">Tidak dapat mencari biografi seniman.</string>
     <string name="black_theme_name">Cuma hitam</string>
     <string name="blacklist">Senarai hitam</string>
     <string name="cancel_current_timer">Batalkan pemasa semasa</string>
@@ -85,7 +74,6 @@
     <string name="clear_blacklist">Kosongkan senarai hitam</string>
     <string name="clear_playlist_title">Kosongkan senarai main</string>
     <string name="clear_playlist_x"><![CDATA[Kosongkan <b>%1$s</b>? Perbuatan ini tidak boleh diundurkan!]]></string>
-    <string name="colored_footers">Pengaki berwarna</string>
     <string name="colors">Warna</string>
     <string name="could_not_create_playlist">Tidak dapat mencipta senarai main.</string>
     <string name="could_not_download_album_cover">"Tidak dapat memuat turun kulit album yang sepadan."</string>
@@ -93,35 +81,23 @@
     <string name="create_action">Cipta</string>
     <string name="created_playlist_x">Senarai main %1$s dicipta.</string>
     <string name="currently_listening_to_x_by_x">Sedang mendengar %1$s oleh %2$s.</string>
-    <string name="custom">Tersuai</string>
     <string name="dark_theme_name">Macam gelap</string>
-    <string name="date">Tarikh</string>
     <string name="default_hint">Tiada seni kata</string>
-    <string name="delete_action">Padam</string>
     <string name="delete_playlist_title">Padam senarai main</string>
     <string name="delete_playlist_x"><![CDATA[Padamkan senarai main <b>%1$s</b>?]]></string>
     <string name="delete_playlists_title">Padam senarai main</string>
-    <string name="delete_song_title">Padam lagu</string>
     <string name="delete_song_x"><![CDATA[Padamkan lagu <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Padam lagu</string>
     <string name="delete_x_playlists"><![CDATA[Padamkan <b>%1$d</b> senarai main?]]></string>
     <string name="delete_x_songs"><![CDATA[Padamkan <b>%1$d</b> lagu?]]></string>
     <string name="deleted_x_songs">%1$d lagu dipadamkan.</string>
-    <string name="deleting_songs">Memadam lagu</string>
     <string name="do_you_want_to_clear_the_blacklist">Adakah anda ingin mengosongkan senarai hitam?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Adakah anda ingin mengeluarkan <b>%1$s</b> daripada senarai hitam?]]></string>
     <string name="donate">Sumbang</string>
     <string name="donate_summary">Jika anda rasa saya layak untuk menerima bayaran bagi hasil kerja saya, anda boleh memberi sumbangan di sini.</string>
     <string name="donation_header">Belikan saya</string>
     <string name="download_from_last_fm">Muat turun daripada Last.fm</string>
-    <string name="duration">Tempoh</string>
-    <string name="edit">Sunting</string>
-    <string name="edit_tags">Sunting tag</string>
     <string name="empty">Kosong</string>
     <string name="equalizer">Penyama</string>
-    <string name="error_loading_lyrics_from_network">Ralat memuat turun daripada rangkaian</string>
-    <string name="experimental">Percubaan</string>
-    <string name="failed_to_save_playlist">Gagal untuk menyimpan senarai main (%s).</string>
     <string name="favorites">Kegemaran</string>
     <string name="flat">Rata</string>
     <string name="folders">Folder</string>
@@ -137,34 +113,24 @@
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
     <string name="history">Sejarah</string>
-    <string name="holiday">Cuti</string>
     <string name="home">Utama</string>
     <string name="inserted_x_songs_into_playlist_x">%1$d lagu ditambahkan ke dalam senarai main %2$s.</string>
-    <string name="inspired_designs_by">Reka bentuk diilhamkan oleh</string>
-    <string name="join_community">Sertai komuniti Google Plus</string>
-    <string name="join_community_summary">Jika anda memerlukan bantuan atau mempunyai soalan, komuniti Retro Music di Google Plus sedia untuk membantu.</string>
     <string name="label_bit_rate">Kadar bit</string>
-    <string name="label_details">Butiran</string>
     <string name="label_file_format">Format</string>
     <string name="label_file_name">Nama fail</string>
     <string name="label_file_path">Laluan fail</string>
     <string name="label_file_size">Saiz</string>
     <string name="label_sampling_rate">Kadar pensampelan</string>
     <string name="label_track_length">Panjang</string>
-    <string name="language_contributors">Penyumbang bahasa</string>
     <string name="last_added">Terakhir ditambah</string>
     <string name="lets_play_something">Mari mainkan sesuatu</string>
     <string name="library">Semak seimbas</string>
     <string name="licenses">Lesen</string>
     <string name="light_theme_name">Sememangnya putih</string>
     <string name="listing_files">Fail senarai</string>
-    <string name="loading">Memuatkan...</string>
     <string name="loading_products">Memuatkan produk...</string>
     <string name="lyrics">Seni kata</string>
-    <string name="media_route_menu_title">Lancarkan peranti</string>
-    <string name="more">Lagi</string>
     <string name="my_name">Nama saya</string>
-    <string name="my_playlists">Senarai main saya</string>
     <string name="my_top_tracks">Runut teratas saya</string>
     <string name="never">Tidak pernah</string>
     <string name="new_playlist_title">Senarai main baru</string>
@@ -173,7 +139,6 @@
     <string name="no_artists">Tiada seniman</string>
     <string name="no_audio_ID">"Mainkan lagu dahulu, kemudian cuba lagi."</string>
     <string name="no_equalizer">Tiada penyama dijumpai.</string>
-    <string name="no_files">Tiada fail</string>
     <string name="no_genres">Tiada genre</string>
     <string name="no_lyrics_found">Tiada seni kata dijumpai</string>
     <string name="no_playlists">Tiada senarai main</string>
@@ -192,8 +157,6 @@
     <string name="permissions_denied">Keizinan ditolak.</string>
     <string name="pick_from_local_storage">Pilih daripada storan tempatan</string>
     <string name="plain">Biasa</string>
-    <string name="play">Main</string>
-    <string name="play_all">Mainkan semua</string>
     <string name="playing_notification_description">Pemberitahuan main menyediakan tindakan untuk main/jeda dan lain-lain.</string>
     <string name="playing_notification_name">Pemberitahuan main</string>
     <string name="playlist_empty_text">Senarai main kosong</string>
@@ -203,11 +166,8 @@
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_images">Imej</string>
     <string name="pref_header_lockscreen">Skrin kunci</string>
-    <string name="pref_header_now_playing_screen">Kini memainkan</string>
     <string name="pref_header_playlists">Senarai main</string>
     <string name="pref_only_lollipop">"Hanya tersedia pada Lollipop."</string>
-    <string name="pref_only_nougat_mr1">"Hanya tersedia pada Nougat 7.1."</string>
-    <string name="pref_summary_about">Mereka yang membantu dalam projek ini</string>
     <string name="pref_summary_album_art_on_lockscreen">Menggunakan kulit album lagu semasa sebagai hias latar skrin kunci</string>
     <string name="pref_summary_audio_ducking">Pemberitahuan, pandu arah dan lain-lain.</string>
     <string name="pref_summary_blurred_album_art">Kaburkan kulit album pada skrin kunci. Ini boleh menyebabkan masalah dengan aplikasi dan widget pihak ketiga.</string>
@@ -216,20 +176,14 @@
     <string name="pref_summary_colored_app_shortcuts">Gunakan warna aksen pada warna pintasan aplikasi. Setiap kali anda mengubah warna, sila tekan ini melihat perubahan</string>
     <string name="pref_summary_colored_navigation_bar">Warnakan bar pandu arah dengan warna utama.</string>
     <string name="pref_summary_colored_notification">"Warnakan pemberitahuan dengan warna ceria kulit album."</string>
-    <string name="pref_summary_day_dream">Tunjukkan butiran lagu pada impian apabila muzik dimainkan</string>
     <string name="pref_summary_dominant_color">Kebanyakan warna dominan akan diambil daripada seni album atau seniman</string>
-    <string name="pref_summary_exclude_songs">Tidak termasuk lagu yang kurang daripada 30 saat.</string>
     <string name="pref_summary_gapless_playback">"Boleh menyebabkan isu main semula pada sesetengah peranti."</string>
     <string name="pref_summary_ignore_media_store_artwork">Boleh meningkatkan mutu kulit album tetapi menyebabkan masa pemuatan imej yang perlahan. Dayakan ini jika anda mempunyai masalah dengan karya seni yang berleraian rendah.</string>
-    <string name="pref_summary_language_en">Ubah bahasa aplikasi kepada bahasa Inggeris secara paksa (Ini untuk menguji pilihan berbilang bahasa)</string>
     <string name="pref_summary_lock_screen">Tunjukkan kawalan skrin kunci untuk Retro Music</string>
-    <string name="pref_summary_lock_screen_app">Tunjukkan kawalan penuh pada skrin kunci</string>
     <string name="pref_summary_open_source_licences">Butiran lesen untuk perisian sumber terbuka</string>
     <string name="pref_summary_round_corners">Pinggir sudut untuk tetingkap, seni album dan lain-lain.</string>
     <string name="pref_summary_tab_titles">Dayakan/lumpuhkan tajuk pada tab bawah</string>
-    <string name="pref_summary_toggle_bottom_bar_titles">Lumpuhkan tajuk pada bar pandu arah bawah</string>
     <string name="pref_summary_toggle_full_screen">Dayakan ini untuk mod terendam</string>
-    <string name="pref_summary_toggle_genre">Tidak ingin memaparkan genre</string>
     <string name="pref_summary_toggle_headset">Mainkan muzik apabila fon kepala disambungkan</string>
     <string name="pref_summary_toggle_volume">Mendayakan kawalan kelantangan jika terdapat ruang pada skrin kini dimainkan</string>
     <string name="pref_title_album_art_on_lockscreen">Tunjukkan kulit album</string>
@@ -240,25 +194,17 @@
     <string name="pref_title_classic_notification">Reka bentuk pemberitahuan klasik</string>
     <string name="pref_title_colored_app">Warna boleh suai</string>
     <string name="pref_title_colored_notification">Pemberitahuan berwarna</string>
-    <string name="pref_title_day_dream">Lamunan</string>
-    <string name="pref_title_exclude_songs">Tidak termasuk lagu</string>
-    <string name="pref_title_external_storage_access">Berikan capaian kepada storan luar</string>
     <string name="pref_title_gapless_playback">Main semula tanpa sela</string>
     <string name="pref_title_general_theme">Tema umum</string>
-    <string name="pref_title_gradient_color">Pilih warna</string>
     <string name="pref_title_ignore_media_store_artwork">Abaikan kulit gedung media</string>
     <string name="pref_title_last_added_interval">Sela masa senarai main kali terakhir ditambah</string>
     <string name="pref_title_lock_screen">Kawalan skrin penuh</string>
-    <string name="pref_title_lock_screen_app">Skrin kunci Retro</string>
     <string name="pref_title_navigation_bar">Bar pandu arah berwarna</string>
     <string name="pref_title_now_playing_screen_appearance">Penampilan</string>
     <string name="pref_title_open_source_licences">Lesen sumber terbuka</string>
     <string name="pref_title_round_corners">Pinggir sudut</string>
-    <string name="pref_title_toggle_bottom_bar_titles">Lumpuhkan judul</string>
     <string name="pref_title_toggle_dominant_color">Warna dominan</string>
     <string name="pref_title_toggle_full_screen">Aplikasi skrin penuh</string>
-    <string name="pref_title_toggle_genre">Sorokkan genre</string>
-    <string name="pref_title_toggle_language_en">Bahasa Inggeris</string>
     <string name="pref_title_toggle_tab_titles">Tajuk bawah</string>
     <string name="pref_title_toggle_toggle_headset">Automain</string>
     <string name="pref_title_toggle_volume">Kawalan kelantangan</string>
@@ -268,7 +214,6 @@
     <string name="queue">Baris gilir</string>
     <string name="rate_app">Nilaikan aplikasi</string>
     <string name="rate_on_google_play_summary">Sukakan aplikasi ini. Beritahu kami di Gedung Google Play untuk menyediakan pengalaman yang lebih baik</string>
-    <string name="recent_activity">Aktiviti semasa</string>
     <string name="remove_action">Alih keluar</string>
     <string name="remove_cover">Alih keluar kulit</string>
     <string name="remove_from_blacklist">Keluarkan daripada senarai hitam</string>
@@ -276,95 +221,53 @@
     <string name="remove_song_x_from_playlist"><![CDATA[Keluarkan lagu <b>%1$s</b> daripada senarai main?]]></string>
     <string name="remove_songs_from_playlist_title">Keluarkan lagu daripada senarai main</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[Keluarkan <b>%1$d</b> lagu daripada senarai main?]]></string>
-    <string name="rename_action">Nama semula</string>
     <string name="rename_playlist_title">Namakan semula senarai main</string>
     <string name="reset_artist_image">Tetapkan semula imej seniman</string>
     <string name="restored_previous_purchases">Pembelian sebelumnya dipulihkan.</string>
-    <string name="retro">Retro</string>
     <string name="retro_equalizer">Penyama Retro</string>
-    <string name="saf_delete_failed">Gagal memadam fail: %s</string>
     <!-- SAF -->
-    <string name="saf_error_uri">Tidak dapat peroleh URI SAF</string>
-    <string name="saf_guide_slide1_description">Buka laci pandu arah</string>
-    <string name="saf_guide_slide1_description_before_o">Dayakan \'Tunjukkan kad SD\' dalam menu limpah</string>
     <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s memerlukan capaian kad SD</string>
-    <string name="saf_guide_slide2_description">Anda perlu memilih direktori akar kad SD anda</string>
-    <string name="saf_guide_slide2_title">Pilih kad SD anda di laci pandu arah</string>
-    <string name="saf_guide_slide3_description">Jangan buka sebarang subfolder</string>
-    <string name="saf_guide_slide3_title">Ketik butang \'Pilih\' di bawah skrin</string>
-    <string name="saf_pick_file">Capaian fail diperlukan. Pilih %s</string>
-    <string name="saf_pick_sdcard">Capaian kad SD diperlukan. Sila pilih direktori akar kad SD</string>
-    <string name="saf_write_failed">Gagal menulis fail: %s</string>
     <string name="save_playlist_title">Simpan sebagai fail</string>
     <string name="saved_playlist_to">Senarai main yang disimpan ke %s.</string>
     <string name="saving_changes">Menyimpan perubahan</string>
-    <string name="saving_tags">Menyimpan tag</string>
-    <string name="saving_to_file">Menyimpan ke fail...</string>
     <string name="scanned_files">%1$d daripada %2$d fail diimbas.</string>
     <string name="search_hint">Cari pustaka anda...</string>
-    <string name="see_all">Lihat semua</string>
-    <string name="select_preset">Pilih pratetap</string>
     <string name="set_artist_image">Tetapkan imej seniman</string>
     <string name="shuffle">Kocok</string>
     <string name="simple">Ringkas</string>
     <string name="sleep_timer_canceled">Pemasa tidur dibatalkan.</string>
     <string name="sleep_timer_set">Pemasa tidur ditetapkan untuk %d minit dari sekarang.</string>
-    <string name="slide_unlock">Sapu untuk membuka kunci</string>
     <string name="song">Lagu</string>
     <string name="song_duration">Tempoh lagu</string>
     <string name="songs">Lagu</string>
     <string name="sort_order">Isih susunan</string>
     <string name="speech_not_supported">Maaf, peranti anda tidak menyokong input ucapan.</string>
     <string name="speech_prompt">Cari pustaka anda</string>
-    <string name="summary_material_design_city_wallpaper">Hias latar bandar dengan reka bentuk Material daripada laman sesawang www.techjuice.pk</string>
-    <string name="summary_material_design_icons">Kesemua ikon yang digunakan diperoleh daripada laman sesawang www.flaticon.com atau www.materialdesignicons.com</string>
     <string name="summary_user_info">Hanya tunjukkan nama anda pada skrin utama</string>
     <string name="support_development">Sokong pembangunan</string>
     <!-- Message displayed when tag editing fails -->
-    <string name="tag_edit_error">Suatu ralat berlaku ketika menyunting tag.</string>
-    <string name="tag_editor_check_permission">Menyemak keizinan</string>
-    <string name="tag_editor_document_tree_message">Pilih direktori storan luar</string>
-    <string name="tag_editor_document_tree_permission_failed">Kelihatannya kami tidak mempunyai keizinan untuk menyunting fail ini. Semak semula direktori di pemilih fail.</string>
-    <string name="tag_error_kitkat">Suatu ralat berlaku ketika menyunting tag. Adakah fail disimpan di dalam kad SD? Jika ya, penyuntingan tag tidak dapat dilakukan untuk fail ini.</string>
-    <string name="tag_error_lollipop">Suatu ralat berlaku ketika menyunting tag. Jika fail disimpan di dalam kad SD, Retro Music mungkin tidak mempunyai keizinan untuk mencapainya.</string>
-    <string name="tag_retrieve_error">Suatu ralat berlaku ketika mendapatkan tag.</string>
     <string name="thank_you">Terima kasih!</string>
     <string name="the_audio_file">Fail audio</string>
     <string name="this_month">Bulan ini</string>
     <string name="this_week">Minggu ini</string>
     <string name="this_year">Tahun ini</string>
     <string name="tiny">Kecil</string>
-    <string name="title">Judul</string>
     <string name="title_dashboard">Papan pemuka</string>
-    <string name="title_desc">Perihalan judul</string>
     <string name="title_good_afternoon">Selamat tengah hari</string>
     <string name="title_good_day">Selamat siang</string>
     <string name="title_good_evening">Selamat petang</string>
     <string name="title_good_morning">Selamat pagi</string>
     <string name="title_good_night">Selamat malam</string>
-    <string name="title_home">Utama</string>
-    <string name="title_material_design_city_wallpaper">Hias latar bandar</string>
-    <string name="title_material_design_icons">Ikon</string>
-    <string name="title_notifications">Pemberitahuan</string>
     <string name="title_user_info">Siapakah nama anda</string>
     <string name="today">Hari ini</string>
-    <string name="toggle_lyrics_size">Tukar saiz seni kata</string>
-    <string name="tool_tip_see_all">Lihat semua lagu</string>
-    <string name="top_tracks">Runut teratas</string>
     <string name="track_hint">"Runut (2 untuk runut 2 atau 3004 untuk CD3 runut 4)"</string>
     <string name="track_list">Nombor runut</string>
     <string name="translate">Terjemah</string>
-    <string name="translate_summary">Membantu menterjemah Retro Music ke dalam bahasa asli anda.</string>
     <string name="unplayable_file">Tidak dapat memainkan lagu ini.</string>
     <string name="up_next">Seterusnya</string>
-    <string name="update">Kemas kini</string>
     <string name="update_image">Kemas kini imej</string>
-    <string name="updated_artist_image">Imej seniman dikemas kini.</string>
     <string name="updating">Mengemas kini...</string>
     <string name="version">Versi</string>
-    <string name="virtualizer_strength">Kekuatan pemaya</string>
-    <string name="volume_control">Kawalan kelantangan</string>
     <string name="web_search">Carian web</string>
     <string name="what_do_you_want_to_share">Apakah yang anda ingin kongsikan?</string>
     <string name="x_has_been_set_as_ringtone">Tetapkan %1$s sebagai nada dering anda.</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index e1487a9f3..0d59e505a 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -17,13 +17,11 @@
     <string name="action_grant">Geef toestemming</string>
     <string name="action_grid_size">Raster grootte</string>
     <string name="action_grid_size_land">Raster grootte (land)</string>
-    <string name="action_new_playlist">Nieuwe afspeellijst</string>
     <string name="action_next">Volgende</string>
     <string name="action_play">"Afspelen. "</string>
     <string name="action_play_next">"Volgende afspelen "</string>
     <string name="action_play_pause">Afspelen/pauzeren</string>
     <string name="action_previous">Vorige</string>
-    <string name="action_re_download_artist_image">Werk artiest afbeelding boj</string>
     <string name="action_remove_from_favorites">"Verwijder van favorieten "</string>
     <string name="action_remove_from_playing_queue">Verwijder van afspeel wachtrij</string>
     <string name="action_remove_from_playlist">Verwijder van afspeellijst</string>
@@ -36,10 +34,7 @@
     <string name="action_set_as_start_directory">Stel in als begin directory</string>
     <string name="action_settings">"Instellingen"</string>
     <string name="action_share">Delen</string>
-    <string name="action_show_lyrics">Laat lyrics zien</string>
-    <string name="action_shuffle_album">Shuffle album</string>
     <string name="action_shuffle_all">Shuffle alles</string>
-    <string name="action_shuffle_artist">Shuffle artiest</string>
     <string name="action_shuffle_playlist">Shuffle afspeellijst</string>
     <string name="action_sleep_timer">Slaap timer</string>
     <string name="action_tag_editor">Tags aanpassen</string>
@@ -50,26 +45,20 @@
     <string name="added_x_titles_to_playing_queue">%1$d titels toegevoegd aan afspeel wachtrij</string>
     <string name="album">Album</string>
     <string name="album_artist">Album artiest</string>
-    <string name="album_desc">Album beschrijving</string>
     <string name="album_or_artist_empty">De titel of artiest mist</string>
     <string name="albums">Albums</string>
     <string name="always">Altijd</string>
     <string name="app_share">Hey, bekijk deze coole muziekspeler op:https://play.google.com/store/apps/details?id=%s</string>
     <string name="app_shortcut_shuffle_all_short">Shuffle</string>
     <string name="app_shortcut_top_tracks_short">Top tracks</string>
-    <string name="app_summary">Een hybride applicatie tussen Material design en iOS in gedachten</string>
     <string name="app_widget_big_name">Retro music - Groot</string>
-    <string name="app_widget_big_name_2">Retro music - Groot2</string>
     <string name="app_widget_card_name">Retro music - Kaart</string>
     <string name="app_widget_classic_name">Retro music - Klassiek</string>
     <string name="app_widget_small_name">Retro music - Klein</string>
     <string name="artist">Artiest</string>
-    <string name="artist_desc">Artiest(en) beschrijving</string>
     <string name="artists">Artiesten</string>
     <string name="audio_focus_denied">"Geluid focus geweigerd "</string>
-    <string name="bass_boost_strength">Bast Boost Sterkte</string>
     <string name="biography">Biografie</string>
-    <string name="biography_unavailable">Kon artiest\'s biografie niet vinden</string>
     <string name="black_theme_name">Gewoon zwart</string>
     <string name="blacklist">Zwarte lijst</string>
     <string name="cancel_current_timer">Annuleer huidige timer</string>
@@ -79,7 +68,6 @@
     <string name="clear_blacklist">Leeg zwarte lijst</string>
     <string name="clear_playlist_title">Leeg afspeellijst</string>
     <string name="clear_playlist_x"><![CDATA[Leeg afspeellijst <b>%1$s</b>? Dit kan niet ongedaan gemaakt worden!]]></string>
-    <string name="colored_footers">Gekleurde voetteksten</string>
     <string name="colors">Kleuren</string>
     <string name="could_not_create_playlist">Kon geen afspeellijst maken.</string>
     <string name="could_not_download_album_cover">"Kon geen matchende album cover downloaden."</string>
@@ -87,16 +75,11 @@
     <string name="create_action">Aanmaken</string>
     <string name="created_playlist_x">Afspeellijst %1$s aangemaakt.</string>
     <string name="currently_listening_to_x_by_x">Nu luisterend naar %1$s van %2$s.</string>
-    <string name="custom">Aangepast</string>
-    <string name="date">Datum</string>
     <string name="default_hint">Geen lyrics</string>
-    <string name="delete_action">Verwijderen</string>
     <string name="delete_playlist_title">Afspeellijst verwijderen</string>
     <string name="delete_playlist_x"><![CDATA[Afspellijst <b>%1$s</b> verwijderen?]]></string>
     <string name="delete_playlists_title">Afspeellijsten verwijderen</string>
-    <string name="delete_song_title">Liedje verwijderen</string>
     <string name="delete_song_x"><![CDATA[Verwijder liedje <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Verwijder liedjes</string>
     <string name="delete_x_playlists"><![CDATA[Verwijder afspeellijsten <b>%1$d</b>?]]></string>
     <string name="delete_x_songs"><![CDATA[Verwijder liedjes <b>%1$d</b>?]]></string>
     <string name="deleted_x_songs">Liedjes %1$d verwijderd.</string>
@@ -105,11 +88,8 @@
     <string name="donate">Doneren</string>
     <string name="donate_summary">Als je vindt dat ik het verdien om geld te krijgen voor mijn werk, dan kun je hier een paar euro\'s doneren.</string>
     <string name="download_from_last_fm">Downloaden van Last.fm</string>
-    <string name="duration">Lengte</string>
     <string name="empty">Leeg</string>
     <string name="equalizer">Equalizer</string>
-    <string name="error_loading_lyrics_from_network">Error tijdens het laden van het netwerk</string>
-    <string name="failed_to_save_playlist">Opslaan afspeellijst (%s) mislukt.</string>
     <string name="favorites">Favorieten</string>
     <string name="flat">Plat</string>
     <string name="folders">Mappen</string>
@@ -117,15 +97,9 @@
     <string name="history">Geschiedenis</string>
     <string name="home">Start</string>
     <string name="full">Vol</string>
-    <string name="pref_title_day_dream">Dagdroom</string>
-    <string name="pref_summary_day_dream">Laat details van liedje zien tijdens dagdromen</string>
     <string name="inserted_x_songs_into_playlist_x">%1$d liedjes toegevoegd aan afspeellijst %2$s.</string>
-    <string name="inspired_designs_by">Ontwerpen geïnspireerd door</string>
-    <string name="join_community">Neem deel aan de Google Plus community</string>
-    <string name="join_community_summary">Als je hulp nodig hebt, of vragen hebt, de Retro Music community op Google Plus is een goede plek om heen te gaan</string>
     <string name="summary_user_info">Laat gewoon je naam zien op het startscherm</string>
     <string name="label_bit_rate">Bitrate</string>
-    <string name="label_details">Details</string>
     <string name="label_file_format">Formaat</string>
     <string name="label_file_name">Bestandsnaam</string>
     <string name="label_file_path">Bestandslocatie</string>
@@ -138,12 +112,9 @@
     <string name="licenses">Licenties</string>
     <string name="light_theme_name">Clearly wit</string>
     <string name="listing_files">Luister bestanden</string>
-    <string name="loading">Laden...</string>
     <string name="loading_products">Podcasts laden...</string>
     <string name="lyrics">Lyrics</string>
-    <string name="more">Meer</string>
     <string name="my_name">Mijn naam</string>
-    <string name="my_playlists">Mijn afspeellijst</string>
     <string name="my_top_tracks">Mijn top tracks</string>
     <string name="never">Nooit</string>
     <string name="new_playlist_title">Nieuwe afspeellijst</string>
@@ -152,7 +123,6 @@
     <string name="no_artists">Geen artiesten</string>
     <string name="no_audio_ID">"Laat eerst een liedje afspelen, probeer dan opniew."</string>
     <string name="no_equalizer">Geen equalizer gevonden.</string>
-    <string name="no_files">Geen bestanden</string>
     <string name="no_lyrics_found">Geen lyrics gevonden</string>
     <string name="no_playlists">Geen afspeellijsten</string>
     <string name="no_results">Geen resultaten</string>
@@ -168,7 +138,6 @@
     <string name="permission_external_storage_denied">Permissie voor toegang tot extern opslag is afgewezen</string>
     <string name="permissions_denied">Permissies afgewezen</string>
     <string name="pick_from_local_storage">Kies van local storage</string>
-    <string name="play">Afspelen</string>
     <string name="playing_notification_description">De afspeel notificatie bied acties om af te spelen/pauzeren etc.</string>
     <string name="playing_notification_name">Afspeel notificatie</string>
     <string name="playlist_empty_text">Lege afspeellijst</string>
@@ -178,11 +147,8 @@
     <string name="pref_header_audio">Geluid</string>
     <string name="pref_header_images">Afbeeldingen</string>
     <string name="pref_header_lockscreen">Vergrendelscherm</string>
-    <string name="pref_header_now_playing_screen">Nu afspelen</string>
     <string name="pref_header_playlists">Afspeellijsten</string>
     <string name="pref_only_lollipop">"Alleen beschikbaar op Lollipop"</string>
-    <string name="pref_only_nougat_mr1">"Alleen beschikbaar op Nougat 7.1."</string>
-    <string name="pref_summary_about">Mensen die geholpen hebben aan dit project</string>
     <string name="pref_summary_album_art_on_lockscreen">Gebruik de huidige cover als vergrendelscherm achtergrond.</string>
     <string name="pref_summary_audio_ducking">Notificaties, bediening etc.</string>
     <string name="pref_summary_blurred_album_art">Vervaagt de album cover op het vergrendelscherm. Kan problemen veroorzaken met apps van derde en widgets/</string>
@@ -191,13 +157,10 @@
     <string name="pref_summary_colored_app_shortcuts">Kleurt de app snelkoppelingen naar de accent kleur. Elker keer wanneer je de kleur verandert, toggle dit om de changes te zien</string>
     <string name="pref_summary_colored_navigation_bar">Kleurt de navigatiebalk als de primaire kleur.</string>
     <string name="pref_summary_colored_notification">"Kleurt de notificatie in de kleur van de album cover"</string>
-    <string name="pref_summary_exclude_songs">Sluit nummers die korter zijn dan 30 seconden uit.</string>
     <string name="pref_summary_gapless_playback">"Kan afspeelproblemen veroorzaken op sommige toestellen"</string>
     <string name="pref_summary_ignore_media_store_artwork">Kan album cover kwaliteit verbeteren, maar veroorzaakt langere laadtijden. Alleen aanzetten als je problemen hebt met lage resolutie artworks</string>
-    <string name="pref_summary_lock_screen_app">Laat besturing knoppen zien op vergrendelscherm</string>
     <string name="pref_summary_open_source_licences">Licentie details voor open source software</string>
     <string name="pref_summary_round_corners">Afgeronde hoeken voor scherm, album illustratie etc.</string>
-    <string name="pref_summary_toggle_bottom_bar_titles">Zet titels uit voor navigatiebar beneden</string>
     <string name="pref_summary_toggle_full_screen">Zet dit aan voor immersive mode</string>
     <string name="pref_summary_toggle_volume">Als er ruimte is in het nu afspelen scherm, zet volume knoppen aan</string>
     <string name="pref_title_album_art_on_lockscreen">Laat album cover zien</string>
@@ -209,19 +172,15 @@
     <string name="pref_title_colored_app">Aangepaste kleur</string>
     <string name="dark_theme_name">Soort van donker</string>
     <string name="pref_title_colored_notification">Gekleurde notificatie</string>
-    <string name="pref_title_exclude_songs">Nummers uitsluiten</string>
     <string name="pref_title_gapless_playback">Afspelen zonder pauzes</string>
     <string name="pref_title_general_theme">Basis thema</string>
-    <string name="pref_title_gradient_color">Kies kleur</string>
     <string name="pref_title_ignore_media_store_artwork">Negeer media store covers</string>
     <string name="pref_title_last_added_interval">Laatst toegevoegde afspeellijst interval</string>
     <string name="pref_title_lock_screen">Volledig scherm besturing knoppen</string>
-    <string name="pref_title_lock_screen_app">Retro vergrendelscherm</string>
     <string name="pref_title_navigation_bar">Gekleurde navigatiebalk</string>
     <string name="pref_title_now_playing_screen_appearance">Uiterlijk</string>
     <string name="pref_title_open_source_licences">Open source licenties</string>
     <string name="pref_title_round_corners">Afgeronde hoeken</string>
-    <string name="pref_title_toggle_bottom_bar_titles">Titels uitzetten</string>
     <string name="pref_title_toggle_full_screen">Volledig scherm app</string>
     <string name="pref_title_toggle_volume">Volume knoppen</string>
     <string name="pref_title_user_info">Gebruikers info</string>
@@ -229,7 +188,6 @@
     <string name="queue">Wachtrij</string>
     <string name="rate_app">App beoordelen</string>
     <string name="rate_on_google_play_summary">Vind je deze app leuk? Laat het ons weten in de Google Play Store om de ervaring te verbeteren</string>
-    <string name="recent_activity">Recente activiteit</string>
     <string name="remove_action">Verwijderen</string>
     <string name="remove_cover">Verwijder cover</string>
     <string name="remove_from_blacklist">Verwijder van zwarte lijst</string>
@@ -237,18 +195,14 @@
     <string name="remove_song_x_from_playlist"><![CDATA[Verwijder liedje <b>%1$s</b> van de afspeellijst?]]></string>
     <string name="remove_songs_from_playlist_title">Verwijder liedjes van afspeellijst</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[Verwijder liedjes <b>%1$d</b> van de afspeellijst?]]></string>
-    <string name="rename_action">Hernoemen</string>
     <string name="rename_playlist_title">Hernoem afspeellijst</string>
     <string name="restored_previous_purchases">Teruggezette aankopen</string>
-    <string name="retro">Retro</string>
     <string name="retro_equalizer">Retri equalizer</string>
     <string name="save_playlist_title">Opslaan als bestand</string>
     <string name="saved_playlist_to">Afspeellijst opgeslagen in %s.</string>
     <string name="saving_changes">Aanpassingen opslaan</string>
-    <string name="saving_to_file">Opslaan aan bestand...</string>
     <string name="scanned_files">%1$d van de %2$d bestanden gescant</string>
     <string name="search_hint">Zoek in je biebliotheek</string>
-    <string name="select_preset">Selecteer preset</string>
     <string name="shuffle">Shuffle</string>
     <string name="sleep_timer_canceled">Slaap timer geannuleerd</string>
     <string name="sleep_timer_set">Slaap timer ingesteld in %d minuten vanaf nu</string>
@@ -258,36 +212,22 @@
     <string name="sort_order">"Volgorde "</string>
     <string name="speech_not_supported">Sorry! Je apparaat ondersteunt geen spraak invoer</string>
     <string name="speech_prompt">Zoek door je bibliotheek</string>
-    <string name="summary_material_design_city_wallpaper">Material design achtergronden van www.techjuice.pk</string>
-    <string name="summary_material_design_icons">Alle iconen komen van deze sites: www.flaticon.com of www.materialdesignicons.com</string>
     <string name="support_development">Ondersteun ontwikkelaars</string>
     <string name="thank_you">Bedankt!</string>
     <string name="the_audio_file">Het geluidsbestand</string>
     <string name="this_month">Deze maand</string>
     <string name="this_week">Deze week</string>
     <string name="this_year">Dit jaar</string>
-    <string name="title">Titel</string>
     <string name="title_dashboard">Dashbord</string>
-    <string name="title_desc">Titel beschrijving</string>
-    <string name="title_home">Thuis</string>
-    <string name="title_material_design_city_wallpaper">Stad achtergrond</string>
-    <string name="title_material_design_icons">Iconen</string>
-    <string name="title_notifications">Notificaties</string>
     <string name="today">Vandaag</string>
-    <string name="top_tracks">Top tracks</string>
     <string name="track_hint">"Nummer (2 voor nummer 2 of 3004 voor CD3 nummer 4)"</string>
     <string name="track_list">Track nummer</string>
     <string name="translate">Vertalen</string>
-    <string name="translate_summary">Help met vertalen van Retro Music naar jouw eigen taal</string>
     <string name="unplayable_file">"Kon dit nummer niet afspelen "</string>
     <string name="up_next">Volgende</string>
-    <string name="update">Update</string>
     <string name="update_image">Update afbeelding</string>
-    <string name="updated_artist_image">Artiest afbeelding geüpdate</string>
     <string name="updating">Bijwerken...</string>
     <string name="version">Versie</string>
-    <string name="virtualizer_strength">Virtualisatie sterkte</string>
-    <string name="volume_control">Volume knoppen</string>
     <string name="web_search">Web zoekopdracht</string>
     <string name="what_do_you_want_to_share">Wat wil je delen?</string>
     <string name="title_user_info">Wat is je naam</string>
@@ -296,24 +236,18 @@
     <string name="year">Jaar</string>
     <string name="reset_artist_image">Reset artiest afbeelding</string>
     <string name="set_artist_image">Stel artiest afbeelding in</string>
-    <string name="edit">Aanpassen</string>
     <string name="donation_header">Koop mij een</string>
     <string name="plain">Vlak</string>
-    <string name="tool_tip_see_all">Shuffle alle liedjes</string>
-    <string name="toggle_lyrics_size">Toggle lyrics grootte</string>
     <string name="title_good_night">Goede nacht</string>
     <string name="title_good_evening">Goede avond</string>
     <string name="title_good_afternoon">Goedemiddag</string>
     <string name="title_good_morning">Goedemorgen</string>
     <string name="title_good_day">Goededag</string>
-    <string name="language_contributors">Vertalers</string>
     <string name="simple">Simpel</string>
     <string name="pref_summary_toggle_headset">Wanneer headphones ingeplugd zijn, afspelen start automatisch</string>
     <string name="pref_title_toggle_toggle_headset">Automatisch afspelen</string>
     <string name="pref_summary_tab_titles">Aan/uitzetten tabblad titels</string>
     <string name="pref_title_toggle_tab_titles">Tabblad titels</string>
-    <string name="pref_summary_language_en">Verander app taal geforceerd naar Engels (dit is om meerdere talen te testen)</string>
-    <string name="pref_title_toggle_language_en">Engelse taal</string>
     <string name="normal">Normaal</string>
     <string name="pref_summary_lock_screen">Zet besturing knoppen aan op vergrendelscherm</string>
     <!-- SAF -->
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index ab4243709..aea04d2e7 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -8,7 +8,6 @@
     <string name="action_add_to_playlist">Dodaj do playlisty</string>
     <string name="action_clear_playing_queue">Wyczyść kolejkę odtwarzania</string>
     <string name="action_clear_playlist">Wyczyść playlistę</string>
-    <string name="action_cycle_repeat">Tryb powtarzania</string>
     <string name="action_delete">Usuń</string>
     <string name="action_delete_from_device">Usuń z urządzenia</string>
     <string name="action_details">Szczegóły</string>
@@ -18,13 +17,11 @@
     <string name="action_grant">Zezwól</string>
     <string name="action_grid_size">Rozmiar Siatki</string>
     <string name="action_grid_size_land">Rozmiar siatki (poziomo)</string>
-    <string name="action_new_playlist">Nowa playlista</string>
     <string name="action_next">Następny</string>
     <string name="action_play">Odtwarzaj</string>
     <string name="action_play_next">Odtwarzaj następny</string>
     <string name="action_play_pause">Odtwarzaj/Zatrzymaj</string>
     <string name="action_previous">Poprzedni utwór</string>
-    <string name="action_re_download_artist_image">Zaktualizuj obrazek artysty</string>
     <string name="action_remove_from_favorites">Usuń z ulubionych</string>
     <string name="action_remove_from_playing_queue">Usuń z kolejki odtwarzania</string>
     <string name="action_remove_from_playlist">Usuń z playlisty</string>
@@ -37,15 +34,10 @@
     <string name="action_set_as_start_directory">Ustaw jako katalog domyślny</string>
     <string name="action_settings">"Ustawienia"</string>
     <string name="action_share">Udostępnij</string>
-    <string name="action_show_lyrics">Pokaż słowa</string>
-    <string name="action_shuffle_album">Odtwarzaj Album losowo</string>
     <string name="action_shuffle_all">Wszystkie Losowo</string>
-    <string name="action_shuffle_artist">Wykonawca Losowo</string>
     <string name="action_shuffle_playlist">Playlista Losowo</string>
     <string name="action_sleep_timer">Wyłącznik Czasowy</string>
     <string name="action_tag_editor">Edytor tagów</string>
-    <string name="action_toggle_favorite">Dodaj/usuń z ulubionych</string>
-    <string name="action_toggle_shuffle">Przełącz tryb losowy</string>
     <string name="add_action">Dodaj</string>
     <string name="add_photo">Dodaj zdjęcie</string>
     <string name="add_playlist_title">"Dodaj do playlisty"</string>
@@ -53,11 +45,9 @@
     <string name="added_x_titles_to_playing_queue">Dodano %1$d piosenek do kolejki odtwarzania</string>
     <string name="album">Album</string>
     <string name="album_artist">Wykonawca albumu</string>
-    <string name="album_desc">Album (Z-A)</string>
     <string name="album_or_artist_empty">Pole tytuł albo wykonawca jest puste</string>
     <string name="albums">Albumy</string>
     <!-- Android Auto -->
-    <string name="albums_label">Albumy</string>
     <string name="always">Zawsze</string>
     <string name="app_share">Hej, sprawdź ten fajny odtwarzacz muzyki na: https://play.google.com/store/apps/details?id=%s</string>
     <!-- App Shortcuts -->
@@ -67,21 +57,14 @@
     <string name="app_shortcut_shuffle_all_short">Losowo</string>
     <string name="app_shortcut_top_tracks_long">Najczęściej słuchane utwory</string>
     <string name="app_shortcut_top_tracks_short">Najlepsze utwory</string>
-    <string name="app_summary">Hybrydowa aplikacja łącząca styl Material Design i iOS.</string>
     <string name="app_widget_big_name">Retro music - Duży</string>
-    <string name="app_widget_big_name_2">Retro music - Duży2</string>
     <string name="app_widget_card_name">Retro music - Karta</string>
     <string name="app_widget_classic_name">Retro music - Klasyczny</string>
     <string name="app_widget_small_name">Retro music - Mały</string>
     <string name="artist">Artysta</string>
-    <string name="artist_desc">Artysta (Z-A)</string>
     <string name="artists">Artyści</string>
-    <string name="artists_label">Artyści</string>
-    <string name="at_least_one_category_must_be_enabled">Co najmniej jedna kategoria musi być wyświetlana</string>
     <string name="audio_focus_denied">Odrzucenie dźwięku</string>
-    <string name="bass_boost_strength">Siła podbicia basu</string>
     <string name="biography">Biografia</string>
-    <string name="biography_unavailable">Nie mo\u017cemy znale\u017a\u0107 biografii wykonawcy.</string>
     <string name="black_theme_name">Po prostu czarny</string>
     <string name="blacklist">Czarna Lista</string>
     <string name="blur">Rozmycie</string>
@@ -97,7 +80,6 @@
     <string name="clear_playlist_x"><![CDATA[Wyczy\u015b\u0107 playlist\u0119 <b>%1$s</b>? Operacja nie mo\u017ce zosta\u0107 cofni\u0119ta!]]></string>
     <string name="color">Kolor</string>
     <string name="color_theme_name">Kolor</string>
-    <string name="colored_footers">Kolorowe Stopki</string>
     <string name="colors">Kolory</string>
     <string name="could_not_create_playlist">Nie mo\u017cna stworzy\u0107 playlisty</string>
     <string name="could_not_download_album_cover">"Nie mo\u017cna pobra\u0107 pasuj\u0105cej ok\u0142adki albumu"</string>
@@ -106,36 +88,23 @@
     <string name="create_action">Utwórz</string>
     <string name="created_playlist_x">Utworzono playlistę %1$s.</string>
     <string name="currently_listening_to_x_by_x">Aktualnie słuchasz %1$s od %2$s.</string>
-    <string name="custom">Własny</string>
     <string name="dark_theme_name">Prawie ciemny</string>
-    <string name="date">Data</string>
     <string name="default_hint">Brak tekstu</string>
-    <string name="delete_action">Usuń</string>
     <string name="delete_playlist_title">Usuń playlistę</string>
     <string name="delete_playlist_x"><![CDATA[Usunąć playlistę <b>%1$s</b>?]]></string>
     <string name="delete_playlists_title">Usuń playlisty</string>
-    <string name="delete_song_title">Usuń utwór</string>
     <string name="delete_song_x"><![CDATA[Usunąć Utwór <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Usuń utwory</string>
     <string name="delete_x_playlists"><![CDATA[Czy na pewno mam usunąć playlistę <b>%1$d</b>? Operacja nie może zostać cofnięta]]></string>
     <string name="delete_x_songs"><![CDATA[Czy na pewno usunąć  <b>%1$d</b> utworów?]]></string>
     <string name="deleted_x_songs">Usunięto %1$d utworów.</string>
-    <string name="deleting_songs">Usuwanie utworów</string>
     <string name="do_you_want_to_clear_the_blacklist">Czy chcesz wyczyścić czarną listę?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Czy chcesz usunąć <b>%1$s</b> z czarnej listy?]]></string>
     <string name="donate">Przekaż darowiznę</string>
     <string name="donate_summary">Jeśli uważasz, że zasługuję na zapłatę za moją pracę, możesz przekazać darowiznę w postaci kilku złotych.</string>
     <string name="donation_header">Postaw mi</string>
     <string name="download_from_last_fm">Pobierz z Last.fm</string>
-    <string name="duration">Czas trwania</string>
-    <string name="edit">Edytuj</string>
-    <string name="edit_categories">Edytuj kategorie</string>
-    <string name="edit_tags">Edytuj tagi</string>
     <string name="empty">Pusto</string>
     <string name="equalizer">Equalizer</string>
-    <string name="error_loading_lyrics_from_network">Błąd ładowania z sieci</string>
-    <string name="experimental">Beta</string>
-    <string name="failed_to_save_playlist">Niepowodzenie zapisywania playlisty (%s).</string>
     <string name="favorites">Ulubione</string>
     <string name="flat">Płaski</string>
     <string name="folders">Foldery</string>
@@ -143,7 +112,6 @@
     <string name="full">Pełny</string>
     <string name="genre">Gatunek</string>
     <string name="genres">Gatunki</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>
@@ -153,36 +121,24 @@
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
     <string name="history">Historia</string>
-    <string name="history_label">Historia</string>
-    <string name="holiday">Święta</string>
     <string name="home">Strona główna</string>
     <string name="inserted_x_songs_into_playlist_x">Umieszczono %1$d piosenek w playliście %2$s.</string>
-    <string name="inspired_designs_by">Wygląd inspirowany</string>
-    <string name="join_community">Dołącz do społeczności Google Plus</string>
-    <string name="join_community_summary">Jeśli potrzebujesz pomocy lub masz pytania, społeczność Retro Music na Google Plus to dobre miejsce do odwiedzenia.</string>
     <string name="label_bit_rate">Bitrate</string>
-    <string name="label_details">Szczegóły</string>
     <string name="label_file_format">Format</string>
     <string name="label_file_name">Nazwa pliku</string>
     <string name="label_file_path">Ścieżka pliku</string>
     <string name="label_file_size">"Rozmiar "</string>
     <string name="label_sampling_rate">Częstotliwość próbkowania</string>
     <string name="label_track_length">Długość</string>
-    <string name="language_contributors">Tłumaczenie</string>
     <string name="last_added">Ostatnio Dodany</string>
     <string name="lets_play_something">Odtwórzmy coś</string>
     <string name="library">Biblioteka</string>
-    <string name="library_categories">Kategorie biblioteki</string>
     <string name="licenses">Licencje</string>
     <string name="light_theme_name">Przejrzyście Biały</string>
     <string name="listing_files">Wykaz plików</string>
-    <string name="loading">Wczytywanie...</string>
     <string name="loading_products">Wczytywanie produktów...</string>
     <string name="lyrics">Słowa piosenki</string>
-    <string name="media_route_menu_title">Urządzenie do strumieniowania</string>
-    <string name="more">Więcej</string>
     <string name="my_name">Moje Imię</string>
-    <string name="my_playlists">Moja Playlista</string>
     <string name="my_top_tracks">Moje najczęściej odtwarzane utwory</string>
     <string name="never">Nigdy</string>
     <string name="new_playlist_title">Nowa playlista</string>
@@ -191,7 +147,6 @@
     <string name="no_artists">Brak wykonawców</string>
     <string name="no_audio_ID">"Odtwórz utwór, a następnie spróbuj ponownie."</string>
     <string name="no_equalizer">Nie znaleziono equalizera</string>
-    <string name="no_files">Brak plików</string>
     <string name="no_genres">Brak Gatunków</string>
     <string name="no_lyrics_found">Nie znaleziono tekstu</string>
     <string name="no_playlists">Brak playlist</string>
@@ -213,29 +168,22 @@
     <string name="personalize">Personalizuj</string>
     <string name="pick_from_local_storage">Wybierz z magazynu lokalnego</string>
     <string name="plain">Zwykły</string>
-    <string name="play">Odtwarzaj</string>
-    <string name="play_all">Odtwórz wszystkie</string>
     <string name="playing_notification_description">Powiadomienie odtwarzania pozwala na odtwarzanie/zatrzymywanie itd.</string>
     <string name="playing_notification_name">Powiadomienie odtwarzania</string>
     <string name="playlist_empty_text">Pusta playlista</string>
     <string name="playlist_is_empty">Playlista jest pusta</string>
     <string name="playlist_name_empty">Nazwa playlisty</string>
     <string name="playlists">Playlisty</string>
-    <string name="playlists_label">Playlisty</string>
     <string name="pref_header_audio">Dźwięk</string>
     <string name="pref_header_general">Główne</string>
     <string name="pref_header_images">Obrazy</string>
     <string name="pref_header_lockscreen">Ekran blokady</string>
-    <string name="pref_header_now_playing_screen">Teraz Odtwarzanie</string>
     <string name="pref_header_playlists">Playlisty</string>
     <string name="pref_only_lollipop">"Dostępnie jedynie w Androidzie Lollipop"</string>
-    <string name="pref_only_nougat_mr1">"Dostępne jedynie w Androidzie Nougat"</string>
-    <string name="pref_summary_about">Ludzie, którzy pomogli przy projekcie</string>
     <string name="pref_summary_album_art_on_lockscreen">Ustaw okładkę aktualnie odtwarzanego utworu, jako tło ekranu blokady</string>
     <string name="pref_summary_audio_ducking">Powiadomienia, nawigacja itd.</string>
     <string name="pref_summary_blurred_album_art">Rozmyj okładkę albumu na ekranie blokady. Może powodować problemy z innymi aplikacjami i widżetami.</string>
     <string name="pref_summary_carousel_effect">Efekt karuzeli na ekranie odtwarzania utworu. Motywy Karty i Karty z Rozmyciem nie będą działać</string>
-    <string name="pref_summary_circular_album_effect">Pokaż okrągłą okładkę albumu na ekranie „Teraz odtwarzane”, działa dla wybranych motywów</string>
     <string name="pref_summary_classic_notification">Użyj klasycznego wyglądu powiadomienia.</string>
     <string name="pref_summary_colored_app">Tło i kolory przycisków sterowania zmieniają się 
 wedle okładki albumu z ekranu odtwarzania</string>
@@ -243,24 +191,15 @@ wedle okładki albumu z ekranu odtwarzania</string>
 Za każdym razem gdy zmienisz kolor, proszę przełącz to by zmiany zaczęły obowiązywać</string>
     <string name="pref_summary_colored_navigation_bar">Barwi pasek nawigacji na główny kolor.</string>
     <string name="pref_summary_colored_notification">"Barwi powiadomienie kolorem akcentu z ok\u0142adki."</string>
-    <string name="pref_summary_day_dream">Pokazuje szczegóły utworu, w trakcie odtwarzania</string>
     <string name="pref_summary_dominant_color">Najbardziej dominujący kolor zostanie wybrany z obrazu wykonawcy lub okładki.</string>
-    <string name="pref_summary_exclude_songs">Wyklucz utwory trwające mniej niż 30 sekund</string>
     <string name="pref_summary_gapless_playback">"Może powodować problemy z odtwarzaniem na niektórych urządzeniach."</string>
     <string name="pref_summary_ignore_media_store_artwork">Może zwiększyć jakość okładki ale spowalnia czasy wczytywania obrazków. Włącz tylko wtedy gdy masz problem z niską jakością okładek albumów.</string>
-    <string name="pref_summary_language_en">Wymuś język Angielski (Do testowania opcji wielu języków)</string>
-    <string name="pref_summary_library_categories">Konfiguruj widoczność i kolejność kategorii biblioteki</string>
     <string name="pref_summary_lock_screen">"Pokaż przyciski sterowania Retro music na ekranie blokady "</string>
-    <string name="pref_summary_lock_screen_app">Pokaż pełne sterowanie z ekranu blokady.</string>
     <string name="pref_summary_open_source_licences">Szczegóły licencji dla oprogramowania open source</string>
     <string name="pref_summary_round_corners">Zaokrąglij rogi ekranu, okładki, itd.</string>
     <string name="pref_summary_tab_titles">Włącz / Wyłącz dolne karty tytułowe</string>
-    <string name="pref_summary_toggle_bottom_bar_titles">Wyłącza tytuły na dole paska nawigacji</string>
     <string name="pref_summary_toggle_full_screen">Włącz dla trybu imersyjnego</string>
-    <string name="pref_summary_toggle_genre">Jeżeli nie chcesz widzieć nazwy gatunku, ukryj ją</string>
     <string name="pref_summary_toggle_headset">Odtwarzaj po podłączeniu słuchawek</string>
-    <string name="pref_summary_toggle_navigation_bar">Ukryj tylko pasek nawigacyjny</string>
-    <string name="pref_summary_toggle_status_bar">Ukryj tylko pasek stanu</string>
     <string name="pref_summary_toggle_volume">Włącz sterowanie głośnością, gdy jest wystarczająca ilość miejsca na ekranie odtwarzania</string>
     <string name="pref_title_album_art_on_lockscreen">Pokaż okładkę albumu</string>
     <string name="pref_title_app_shortcuts">Kolorowy skrót do aplikacji</string>
@@ -270,30 +209,18 @@ Za każdym razem gdy zmienisz kolor, proszę przełącz to by zmiany zaczęły o
     <string name="pref_title_classic_notification">Klasyczny wygląd powiadomień</string>
     <string name="pref_title_colored_app">Kolor dostosowujący się od okładki albumu</string>
     <string name="pref_title_colored_notification">Kolorowe powiadomienie</string>
-    <string name="pref_title_day_dream">Fantazja</string>
-    <string name="pref_title_exclude_songs">Wyklucz utwory</string>
-    <string name="pref_title_external_storage_access">Nadaj dostęp do pamięci zewnętrznej</string>
     <string name="pref_title_gapless_playback">Przerwa pomiędzy kolejnymi piosenkami</string>
     <string name="pref_title_general_theme">Główny motyw</string>
-    <string name="pref_title_gradient_color">Wybierz kolor</string>
     <string name="pref_title_ignore_media_store_artwork">Ignoruj okładki z Media Store</string>
     <string name="pref_title_last_added_interval">Interwał ostatnio dodanej playlisty</string>
     <string name="pref_title_lock_screen">Sterowanie pełnoekranowe</string>
-    <string name="pref_title_lock_screen_app">Ekran blokady Retro</string>
-    <string name="pref_title_lyrics_options">Opcje tekstu</string>
     <string name="pref_title_navigation_bar">Kolorowy pasek nawigacyjny</string>
     <string name="pref_title_now_playing_screen_appearance">Wygląd</string>
     <string name="pref_title_open_source_licences">Licencje open source</string>
     <string name="pref_title_round_corners">Zaokrąglij krawędzie</string>
-    <string name="pref_title_toggle_bottom_bar_titles">Wyłącz tytuły</string>
     <string name="pref_title_toggle_carousel_effect">Efekt Karuzeli</string>
-    <string name="pref_title_toggle_circular_album_effect">Okrągły album</string>
     <string name="pref_title_toggle_dominant_color">Dominujący kolor</string>
     <string name="pref_title_toggle_full_screen">Aplikacja pełnoekranowa</string>
-    <string name="pref_title_toggle_genre">Ukryj nazwę gatunku</string>
-    <string name="pref_title_toggle_language_en">Język Angielski</string>
-    <string name="pref_title_toggle_navigation_bar">Pasek nawigacyjny</string>
-    <string name="pref_title_toggle_status_bar">Pasek stanu</string>
     <string name="pref_title_toggle_tab_titles">Karty tytułowe</string>
     <string name="pref_title_toggle_toggle_headset">Auto odtwarzanie</string>
     <string name="pref_title_toggle_volume">Sterowanie dźwiękiem</string>
@@ -302,10 +229,8 @@ Za każdym razem gdy zmienisz kolor, proszę przełącz to by zmiany zaczęły o
     <string name="primary_color_desc">Główny kolor motywu, domyślnie biały</string>
     <string name="purchase">Kup</string>
     <string name="queue">Kolejka odtwarzania</string>
-    <string name="queue_label">Kolejka</string>
     <string name="rate_app">Oceń aplikację</string>
     <string name="rate_on_google_play_summary">Uwielbiasz tą aplikację? Daj nam znać w sklepie Google Play by móc uczynić doświadczenie z korzystania z aplikacji lepszym</string>
-    <string name="recent_activity">Ostatnia aktywność</string>
     <string name="recent_albums">Ostatnie albumy</string>
     <string name="recent_artists">Ostatni atryści</string>
     <string name="remove_action">Usuń</string>
@@ -315,109 +240,60 @@ Za każdym razem gdy zmienisz kolor, proszę przełącz to by zmiany zaczęły o
     <string name="remove_song_x_from_playlist"><![CDATA[Usunąć utwór <b>%1$s</b> z playlisty? ]]></string>
     <string name="remove_songs_from_playlist_title">Usunąć utwory z playlisty?</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[Usunąć <b>%1$d</b> utworów  z playlisty? ]]></string>
-    <string name="rename_action">Zmień nazwę</string>
     <string name="rename_playlist_title">Zmień nazwę playlisty</string>
-    <string name="reset_action">Resetuj</string>
     <string name="reset_artist_image">Resetuj obrazek wykonawcy</string>
     <string name="restore">Przywróć</string>
     <string name="restored_previous_purchase_please_restart">Przywrócono poprzedni zakup. Otwórz ponownie aplikację, aby móc używać wszystkich funkcji</string>
     <string name="restored_previous_purchases">Przywróć poprzedni zakup</string>
     <string name="restoring_purchase">Przywracanie zakupu...</string>
-    <string name="retro">Retro</string>
     <string name="retro_equalizer">Retri Equalizer</string>
-    <string name="saf_delete_failed">Usuwanie pliku zakończone niepowodzeniem: %s</string>
     <!-- SAF -->
-    <string name="saf_error_uri">Nie można zdobyć SAF URI</string>
-    <string name="saf_guide_slide1_description">Otwórz menu nawigacyjne</string>
-    <string name="saf_guide_slide1_description_before_o">Zaznacz \'Pokaż kartę SD\' w menu</string>
     <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s Wymaga dostępu do karty SD</string>
-    <string name="saf_guide_slide2_description">Musisz wybrać główny katalog karty SD</string>
-    <string name="saf_guide_slide2_title">Wybierz twoją kartę SD w menu nawigacyjnym</string>
-    <string name="saf_guide_slide3_description">Nie otwieraj żadnych podfolderów</string>
-    <string name="saf_guide_slide3_title">Dotknij przycisku \'select\' na dole ekranu</string>
-    <string name="saf_pick_file">Wymagany dostęp do pliku. Wybierz %s</string>
-    <string name="saf_pick_sdcard">Wymagany dostęp do karty SD. Proszę wybrać główny katalog karty SD</string>
-    <string name="saf_write_failed">Zapisywanie zmian zakończone niepowodzeniem: %s</string>
     <string name="save_playlist_title">Zapisz jako plik</string>
     <string name="saved_playlist_to">Zapisz playlistę do %s.</string>
     <string name="saving_changes">Zapisywanie zmian</string>
-    <string name="saving_tags">Zapisywanie tagów</string>
-    <string name="saving_to_file">Zapisywanie do pliku...</string>
     <string name="scanned_files">Przeskanowano %1$d z %2$d plików</string>
     <string name="search_hint">Przeszukiwanie Twojej biblioteki...</string>
-    <string name="see_all">Zobacz wszystkie</string>
-    <string name="select_preset">Wybierz preset</string>
     <string name="set_artist_image">Ustaw obrazek wykonawcy</string>
     <string name="shuffle">Losowo</string>
     <string name="simple">proste</string>
     <string name="sleep_timer_canceled">Wyłącznik czasowy anulowany.</string>
     <string name="sleep_timer_set">Wyłącznik czasowy ustawiony na %d minut od teraz.</string>
-    <string name="slide_unlock">Przesuń aby odblokować</string>
-    <string name="solid">Jednolity</string>
     <string name="song">Utwór</string>
     <string name="song_duration">Długość utworu</string>
     <string name="songs">Utwory</string>
     <string name="sort_order">Kolejność sortowania</string>
     <string name="speech_not_supported">Przepraszamy! Twoje urządzenie nie wspiera wprowadzania głosem</string>
     <string name="speech_prompt">Przeszukaj swoją bibliotekę</string>
-    <string name="suggestions">Sugestie</string>
-    <string name="summary_material_design_city_wallpaper">Tła miast Material Design ze strony www.techjuice.pk</string>
-    <string name="summary_material_design_icons">Dla wszystkich ikon, które użyliśmy dla tej strony www.flaticon.com lub www.materialdesignicons.com</string>
     <string name="summary_user_info">Po prostu pokaż swoje imię na ekranie głównym.</string>
     <string name="support_development">"Wspomóż rozwój "</string>
-    <string name="support_development_summary">Jeżeli lubisz korzystać z Retro Music Player, możesz wesprzeć moją pracę dotacją.</string>
     <!-- Message displayed when tag editing fails -->
-    <string name="tag_edit_error">Wystąpił błąd podczas edycji tagów</string>
-    <string name="tag_editor_check_permission">Sprawdzanie uprawnień</string>
-    <string name="tag_editor_document_tree_message">Wybierz katalog pamięci zewnętrznej</string>
-    <string name="tag_editor_document_tree_permission_failed">Wygląda na to, że nie mamy uprawnień do edycji plików. Sprawdź ponownie wybrany katalog</string>
-    <string name="tag_error_kitkat">Wystąpił błąd podczas edycji tagów. Czy plik jest przechowywany na karcie SD? Jeśli tak, Google uniemożliwiło edycję tagów dla tego pliku.</string>
-    <string name="tag_error_lollipop">Wystąpił błąd podczas edycji tagów. Jeżeli plik znajduje się na karcie SD, prawdopodobnie Retro Music nie ma dostępu do niej.</string>
-    <string name="tag_retrieve_error">Wystąpił błąd podczas pobierania tagów.</string>
-    <string name="text">Tekst</string>
     <string name="thank_you">Dziękuję!</string>
     <string name="the_audio_file">Plik audio</string>
     <string name="this_month">Ten miesiąc</string>
     <string name="this_week">Ten tydzień</string>
     <string name="this_year">Ten rok</string>
     <string name="tiny">Mały</string>
-    <string name="title">Tytuł</string>
     <string name="title_dashboard">Dashboard</string>
-    <string name="title_desc">Tytuł (Z-A)</string>
     <string name="title_good_afternoon">Miłego popołudnia</string>
     <string name="title_good_day">Miłego dnia</string>
     <string name="title_good_evening">Dobry wieczór</string>
     <string name="title_good_morning">Dzień dobry</string>
     <string name="title_good_night">Dobranoc</string>
-    <string name="title_home">Strona Główna</string>
-    <string name="title_material_design_city_wallpaper">Tapeta miasta</string>
-    <string name="title_material_design_icons">Ikony</string>
-    <string name="title_notifications">Powiadomienia</string>
     <string name="title_user_info">Jak masz na imię?</string>
     <string name="today">Dzisiaj</string>
-    <string name="toggle_lyrics_size">Zmień rozmiar tekstu</string>
-    <string name="tool_tip_see_all">Pokaż wszystkie utwory</string>
-    <string name="top_tracks">Najczęściej odtwarzane utwory</string>
-    <string name="top_tracks_label">Najczęściej odtwarzane utwory</string>
     <string name="track_hint">"Utwór (2, dla utworu 2, lub 3004 dla utworu 4 na płycie 3)"</string>
     <string name="track_list">Numer ścieżki</string>
     <string name="translate">Tłumacz</string>
-    <string name="translate_summary">Pomóż przetłumaczyć Retro music na Twój język.</string>
     <string name="unplayable_file">Nie mo\u017cna odtworzy\u0107 tego utworu.</string>
     <string name="up_next">Kolejny</string>
-    <string name="update">Aktualizacja</string>
     <string name="update_image">Zmień obrazek</string>
-    <string name="updated_artist_image">Zdjęcie artysty zaktualizowane,</string>
     <string name="updating">Aktualizowanie...</string>
     <string name="version">Wersja</string>
-    <string name="virtualizer_strength">Siła virtualizera</string>
-    <string name="volume_control">Sterowanie głośnością</string>
     <string name="web_search">Przeszukiwanie sieci</string>
     <string name="what_do_you_want_to_share">Co chcesz udostępnić?</string>
     <string name="window">Okno</string>
     <string name="x_has_been_set_as_ringtone">"Ustaw %1$s jako dzwonek "</string>
     <string name="x_selected">%1$d zaznaczono</string>
     <string name="year">Rok</string>
-    <string name="you_have_to_select_at_least_one_category">Musisz wybrać co najmniej jedną kategorię</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 6daeba68d..1c6f93b8c 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -8,7 +8,6 @@
     <string name="action_add_to_playlist">Adicionar à lista de reprodução...</string>
     <string name="action_clear_playing_queue">Limpar fila de reprodução</string>
     <string name="action_clear_playlist">Limpar lista de reprodução</string>
-    <string name="action_cycle_repeat">Repetir em ciclo</string>
     <string name="action_delete">Excluir</string>
     <string name="action_delete_from_device">Apagar do dispositivo</string>
     <string name="action_details">Detalhes</string>
@@ -18,13 +17,11 @@
     <string name="action_grant">Conceder</string>
     <string name="action_grid_size">Tamanho da grade</string>
     <string name="action_grid_size_land">Tamanho da grade (horizontal)</string>
-    <string name="action_new_playlist">Nova lista de reprodução...</string>
     <string name="action_next">Próximo</string>
     <string name="action_play">Reproduzir</string>
     <string name="action_play_next">Reproduzir a seguir</string>
     <string name="action_play_pause">Reproduzir/Pausar</string>
     <string name="action_previous">Anterior</string>
-    <string name="action_re_download_artist_image">Atualizar imagem do artista</string>
     <string name="action_remove_from_favorites">Remover dos favoritos</string>
     <string name="action_remove_from_playing_queue">Remover da fila de reprodução</string>
     <string name="action_remove_from_playlist">Remover da lista de reprodução</string>
@@ -37,15 +34,10 @@
     <string name="action_set_as_start_directory">Definir como diretório inicial</string>
     <string name="action_settings">"Configurações"</string>
     <string name="action_share">Compartilhar</string>
-    <string name="action_show_lyrics">Mostrar letras</string>
-    <string name="action_shuffle_album">Embaralhar álbum</string>
     <string name="action_shuffle_all">Embaralhar todas</string>
-    <string name="action_shuffle_artist">Embaralhar artista</string>
     <string name="action_shuffle_playlist">Misturar listas de reprodução</string>
     <string name="action_sleep_timer">Temporizador de soneca</string>
     <string name="action_tag_editor">Editor de tags</string>
-    <string name="action_toggle_favorite">Alternar favorito</string>
-    <string name="action_toggle_shuffle">Alternar modo aleatório</string>
     <string name="add_action">Adicionar</string>
     <string name="add_photo">Adicionar\nfoto</string>
     <string name="add_playlist_title">"Adicionar à lista de reprodução"</string>
@@ -53,11 +45,9 @@
     <string name="added_x_titles_to_playing_queue">Adicionado %1$d título (s) à fila de reprodução</string>
     <string name="album">Álbum</string>
     <string name="album_artist">Artista do álbum</string>
-    <string name="album_desc">Ordem decrescente</string>
     <string name="album_or_artist_empty">O título ou artista está vazio.</string>
     <string name="albums">Álbuns</string>
     <!-- Android Auto -->
-    <string name="albums_label">Álbuns</string>
     <string name="always">Sempre</string>
     <string name="app_share">Olá! Confira este incrível player de música:
 https://play.google.com/store/apps/details?id=%s</string>
@@ -68,22 +58,15 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="app_shortcut_shuffle_all_short">Embaralhar</string>
     <string name="app_shortcut_top_tracks_long">@string/my_top_tracks</string>
     <string name="app_shortcut_top_tracks_short">Faixas Principais</string>
-    <string name="app_summary">Um aplicativo com visual híbrido entre o iOS e o Material Design do Android.</string>
     <string name="app_widget_big_name">Retro Music - Grande</string>
-    <string name="app_widget_big_name_2">Retro Music - Grande2</string>
     <string name="app_widget_card_name">Retro music - Cartão</string>
     <string name="app_widget_classic_name">Retro Music - Clássico</string>
     <string name="app_widget_small_name">Retro Music - Pequeno</string>
     <string name="artist">Artista</string>
-    <string name="artist_desc">Artista &lt;</string>
     <string name="artists">Artistas</string>
-    <string name="artists_label">Artistas</string>
-    <string name="at_least_one_category_must_be_enabled">Deve selecionar pelo menos uma categoria</string>
     <string name="audio_focus_denied">Foco de áudio negado.</string>
     <string name="audio_settings_summary">Ajustar configurações de som e os controles do equalizador</string>
-    <string name="bass_boost_strength">Força do Aumento de Graves</string>
     <string name="biography">Biografia</string>
-    <string name="biography_unavailable">N\u00e3o foi poss\u00edvel encontrar a biografia do artista.</string>
     <string name="black_theme_name">Apenas Escuro</string>
     <string name="blacklist">Lista Negra</string>
     <string name="blur">Desfocado</string>
@@ -99,7 +82,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="clear_playlist_x"><![CDATA[Limpar a lista de reprodu\u00e7\u00e3o <b>%1$s</b>? Isso n\u00e3o poder\u00e1 ser desfeito!]]></string>
     <string name="color">Colorido</string>
     <string name="color_theme_name">Cor</string>
-    <string name="colored_footers">Rodapés coloridos</string>
     <string name="colors">Cores</string>
     <string name="could_not_create_playlist">N\u00e3o foi poss\u00edvel criar a lista de reprodu\u00e7\u00e3o.</string>
     <string name="could_not_download_album_cover">"N\u00e3o foi poss\u00edvel baixar esta capa :("</string>
@@ -108,36 +90,23 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="create_action">Criar</string>
     <string name="created_playlist_x">Lista de reprodução %1$s criada.</string>
     <string name="currently_listening_to_x_by_x">Ouvindo agora %1$s de %2$s.</string>
-    <string name="custom">Personalizar</string>
     <string name="dark_theme_name">Um pouco Escuro</string>
-    <string name="date">Data</string>
     <string name="default_hint">Nenhuma Letra</string>
-    <string name="delete_action">Excluir</string>
     <string name="delete_playlist_title">Excluir lista de reprodução</string>
     <string name="delete_playlist_x"><![CDATA[Excluir a lista de reprodução <b>%1$s</b>?]]></string>
     <string name="delete_playlists_title">Excluir listas de reprodução</string>
-    <string name="delete_song_title">Excluir música</string>
     <string name="delete_song_x"><![CDATA[Excluir a música <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Excluir músicas</string>
     <string name="delete_x_playlists"><![CDATA[Excluir <b>%1$d</b> listas de reprodução?]]></string>
     <string name="delete_x_songs"><![CDATA[Excluir <b>%1$d</b> músicas?]]></string>
     <string name="deleted_x_songs">%1$d músicas excluídas.</string>
-    <string name="deleting_songs">Excluindo músicas</string>
     <string name="do_you_want_to_clear_the_blacklist">Deseja mesmo limpar a lista negra?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Deseja remover <b>%1$s</b> da lista negra?]]></string>
     <string name="donate">Doar</string>
     <string name="donate_summary">Se você acha que eu mereço ser pago pelo meu trabalho, você pode me deixar alguns dólares aqui.</string>
     <string name="donation_header">Compre para mim um</string>
     <string name="download_from_last_fm">Baixar do Last.fm</string>
-    <string name="duration">Duração</string>
-    <string name="edit">Editar</string>
-    <string name="edit_categories">Editar categorias</string>
-    <string name="edit_tags">Editar tags</string>
     <string name="empty">Vazio</string>
     <string name="equalizer">Equalizador</string>
-    <string name="error_loading_lyrics_from_network">Erro de rede ao carregar</string>
-    <string name="experimental">Experimental</string>
-    <string name="failed_to_save_playlist">Falha ao salvar lista de reprodução (%s).</string>
     <string name="favorites">Favoritos</string>
     <string name="flat">Minimalista</string>
     <string name="folders">Pastas</string>
@@ -147,7 +116,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="general_settings_title">Aparência</string>
     <string name="genre">Gênero</string>
     <string name="genres">Gênero</string>
-    <string name="gradient">Gradiente</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -157,36 +125,24 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
     <string name="history">Histórico</string>
-    <string name="history_label">Histórico</string>
-    <string name="holiday">Feriado</string>
     <string name="home">Início</string>
     <string name="inserted_x_songs_into_playlist_x">%1$d músicas inseridas na lista de reprodução %2$s.</string>
-    <string name="inspired_designs_by">Design inspirado por</string>
-    <string name="join_community">Junte-se à comunidade do Google+</string>
-    <string name="join_community_summary">Se você precisar de ajuda ou tiver dúvidas, a comunidade do Retro Music no Google+ é um bom lugar para ir.</string>
     <string name="label_bit_rate">Taxa de bits</string>
-    <string name="label_details">Detalhes</string>
     <string name="label_file_format">Formato</string>
     <string name="label_file_name">Nome do arquivo</string>
     <string name="label_file_path">Diretório do arquivo</string>
     <string name="label_file_size">Tamanho</string>
     <string name="label_sampling_rate">Taxa de amostragem</string>
     <string name="label_track_length">Duração</string>
-    <string name="language_contributors">Colaboradores de tradução</string>
     <string name="last_added">Adições recentes</string>
     <string name="lets_play_something">Vamos tocar algo?</string>
     <string name="library">Biblioteca</string>
-    <string name="library_categories">Categorias da biblioteca</string>
     <string name="licenses">Licenças</string>
     <string name="light_theme_name">Branco</string>
     <string name="listing_files">Listando arquivos</string>
-    <string name="loading">Carregando...</string>
     <string name="loading_products">Carregando produtos...</string>
     <string name="lyrics">Letras</string>
-    <string name="media_route_menu_title">Transmitir</string>
-    <string name="more">Mais</string>
     <string name="my_name">Meu Nome</string>
-    <string name="my_playlists">Minha Playlist</string>
     <string name="my_top_tracks">Minhas faixas principais</string>
     <string name="never">Nunca</string>
     <string name="new_playlist_title">Nova lista de reprodução</string>
@@ -195,7 +151,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="no_artists">Sem artistas</string>
     <string name="no_audio_ID">"Toque uma música primeiro, então tente de novo"</string>
     <string name="no_equalizer">Nenhum equalizador encontrado.</string>
-    <string name="no_files">Sem Arquivos</string>
     <string name="no_genres">Sem gêneros</string>
     <string name="no_lyrics_found">Nenhuma letra encontrada</string>
     <string name="no_playlists">Sem listas de reprodução</string>
@@ -220,52 +175,36 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="personalize_settings_summary">Personalizar a tela de reprodução e a interface</string>
     <string name="pick_from_local_storage">Escolher do armazenamento local</string>
     <string name="plain">Plano</string>
-    <string name="play">Reproduzir</string>
-    <string name="play_all">Reproduzir todas</string>
     <string name="playing_notification_description">A notificação do player fornece ações de tocar/pausar etc.</string>
     <string name="playing_notification_name">Notificação de reprodução</string>
     <string name="playlist_empty_text">Lista de reprodução vazia</string>
     <string name="playlist_is_empty">A playlist está vazia</string>
     <string name="playlist_name_empty">Nome da lista de reprodução</string>
     <string name="playlists">Listas</string>
-    <string name="playlists_label">Listas</string>
     <string name="pref_header_audio">Áudio</string>
     <string name="pref_header_general">Geral</string>
     <string name="pref_header_images">Imagens</string>
     <string name="pref_header_lockscreen">Tela de bloqueio</string>
-    <string name="pref_header_now_playing_screen">Reproduzindo agora</string>
     <string name="pref_header_playlists">Listas de reprodução</string>
     <string name="pref_only_lollipop">"Disponível apenas no Android Lollipop."</string>
-    <string name="pref_only_nougat_mr1">"Disponível apenas no Nougat 7.1"</string>
-    <string name="pref_summary_about">Pessoas que ajudaram no projeto</string>
     <string name="pref_summary_album_art_on_lockscreen">Usa a capa do álbum da música atual como papel de parede na tela de bloqueio.</string>
     <string name="pref_summary_audio_ducking">Notificações, navegação, etc.</string>
     <string name="pref_summary_blurred_album_art">Desfoca a capa de álbum na tela de bloqueio. Pode causar problemas com aplicativos de terceiros e widgets.</string>
     <string name="pref_summary_carousel_effect">Efeito carrossel em capas na tela de reprodução.Tema de Cartão e Cartão com desfoque não funcionarão.</string>
-    <string name="pref_summary_circular_album_effect">Mostre a capa do álbum circular nos temas da tela de reprodução, para temas selecionados, não todos</string>
     <string name="pref_summary_classic_notification">Usar o design de notificação clássico.</string>
     <string name="pref_summary_colored_app">Cor de fundo e cor dos botões de controle mudam de acordo com a arte do álbum na tela do player</string>
     <string name="pref_summary_colored_app_shortcuts">Colore os atalhos do aplicativo na cor de destaque. Sempre que você mudar a cor, basta alternar isso para entrar em vigor.</string>
     <string name="pref_summary_colored_navigation_bar">Colore a barra de navegação na cor primária.</string>
     <string name="pref_summary_colored_notification">"A notifica\u00e7\u00e3o ser\u00e1 pintada com a cor mais vibrante do \u00e1lbum."</string>
-    <string name="pref_summary_day_dream">Mostrar detalhes das músicas no dream quando a música estiver tocando</string>
     <string name="pref_summary_dominant_color">A cor dominante será escolhida a partir da capa do álbum ou imagem do artista.</string>
-    <string name="pref_summary_exclude_songs">Ignorar músicas com menos de 30 segundos.</string>
     <string name="pref_summary_gapless_playback">"Pode causar erros de reprodução em alguns dispositivos."</string>
     <string name="pref_summary_ignore_media_store_artwork">Pode melhorar a qualidade da capa do álbum, mas atrasa o carregamento da imagem. Habilite isso se você tem problemas de capas em baixa resolução.</string>
-    <string name="pref_summary_language_en">Force a alteração do idioma do app para o inglês (esta opção está em teste para outros idiomas)</string>
-    <string name="pref_summary_library_categories">Configurar a visibilidade e a ordem das categorias da biblioteca.</string>
     <string name="pref_summary_lock_screen">Controles na tela de bloqueio para Retro Music.</string>
-    <string name="pref_summary_lock_screen_app">Mostrar controles em tela cheia na tela de bloqueio.</string>
     <string name="pref_summary_open_source_licences">Detalhes de licença de software de código aberto.</string>
     <string name="pref_summary_round_corners">Bordas redondas na janela, arte do álbum, etc.</string>
     <string name="pref_summary_tab_titles">Ativar/desativar títulos de guias inferiores.</string>
-    <string name="pref_summary_toggle_bottom_bar_titles">Desativar títulos na barra de navegação inferior.</string>
     <string name="pref_summary_toggle_full_screen">Modo imersivo</string>
-    <string name="pref_summary_toggle_genre">Se quiser mostrar o gênero nas guias inferiores.</string>
     <string name="pref_summary_toggle_headset">Começa a tocar imediatamente quando o fone de ouvido for conectado.</string>
-    <string name="pref_summary_toggle_navigation_bar">Ocultar apenas a barra de navegação</string>
-    <string name="pref_summary_toggle_status_bar">Ocultar apenas a barras de status</string>
     <string name="pref_summary_toggle_volume">Se houver espaço na tela de reprodução, mostrar controle de volume.</string>
     <string name="pref_title_album_art_on_lockscreen">Mostrar capa do álbum</string>
     <string name="pref_title_app_shortcuts">Atalhos do aplicativo coloridos</string>
@@ -275,30 +214,18 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="pref_title_classic_notification">Design de notificação clássico</string>
     <string name="pref_title_colored_app">Cor adaptável</string>
     <string name="pref_title_colored_notification">Notificação colorida</string>
-    <string name="pref_title_day_dream">Daydream</string>
-    <string name="pref_title_exclude_songs">Ignorar músicas</string>
-    <string name="pref_title_external_storage_access">Permitir acesso ao armazenamento externo</string>
     <string name="pref_title_gapless_playback">Reprodução sem pausa</string>
     <string name="pref_title_general_theme">Tema geral</string>
-    <string name="pref_title_gradient_color">Escolher cor</string>
     <string name="pref_title_ignore_media_store_artwork">Ignorar capas do Armazenamento de Mídia</string>
     <string name="pref_title_last_added_interval">Intervalo da Playlist últimas adicionadas</string>
     <string name="pref_title_lock_screen">Controles de tela cheia</string>
-    <string name="pref_title_lock_screen_app">Tela de bloqueio do Retro</string>
-    <string name="pref_title_lyrics_options">Opções de letras</string>
     <string name="pref_title_navigation_bar">Barra de navegação colorida</string>
     <string name="pref_title_now_playing_screen_appearance">Aparência</string>
     <string name="pref_title_open_source_licences">Licenças de código aberto</string>
     <string name="pref_title_round_corners">Bordas arredondadas</string>
-    <string name="pref_title_toggle_bottom_bar_titles">Desativar títulos</string>
     <string name="pref_title_toggle_carousel_effect">Efeito carrossel</string>
-    <string name="pref_title_toggle_circular_album_effect">Álbum circular</string>
     <string name="pref_title_toggle_dominant_color">Cor dominante</string>
     <string name="pref_title_toggle_full_screen">Aplicativo em Tela Cheia</string>
-    <string name="pref_title_toggle_genre">Exibir gênero</string>
-    <string name="pref_title_toggle_language_en">Idioma inglês</string>
-    <string name="pref_title_toggle_navigation_bar">Barra de navegação</string>
-    <string name="pref_title_toggle_status_bar">Barra de status</string>
     <string name="pref_title_toggle_tab_titles">Título nas abas</string>
     <string name="pref_title_toggle_toggle_headset">Reprodução automática</string>
     <string name="pref_title_toggle_volume">Controle de Volume</string>
@@ -307,10 +234,8 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="primary_color_desc">A cor primária do tema, O padrão é cinza azulado, por funcionar com cores escuras.</string>
     <string name="purchase">Comprar</string>
     <string name="queue">Fila</string>
-    <string name="queue_label">Fila</string>
     <string name="rate_app">Avalie o aplicativo</string>
     <string name="rate_on_google_play_summary">Se você ama este app, deixe uma avaliação positiva na Google Play para nos incentivar</string>
-    <string name="recent_activity">Atividade recente</string>
     <string name="recent_albums">Álbuns recentes</string>
     <string name="recent_artists">Artistas recentes</string>
     <string name="remove_action">Remover</string>
@@ -320,112 +245,62 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="remove_song_x_from_playlist"><![CDATA[Remover a música <b>%1$s</b> da lista de reprodução?]]></string>
     <string name="remove_songs_from_playlist_title">Remover músicas da lista de reprodução</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[Remover <b>%1$d</b> da playlist?]]></string>
-    <string name="rename_action">Renomear</string>
     <string name="rename_playlist_title">Renomear lista de reprodução</string>
-    <string name="reset_action">Redefinir</string>
     <string name="reset_artist_image">Resetar imagem de artista</string>
     <string name="restore">Restaurar</string>
     <string name="restored_previous_purchase_please_restart">Restaurar compra anterior.Por favor reinicie o aplicativo para fazer uso de todas as opções.</string>
     <string name="restored_previous_purchases">Compras anteriores restauradas.</string>
     <string name="restoring_purchase">Restaurando compra…</string>
-    <string name="retro">Retro</string>
     <string name="retro_equalizer">Equalizador Retro</string>
-    <string name="saf_delete_failed">Falha na exclusão do arquivo: %s</string>
     <!-- SAF -->
-    <string name="saf_error_uri">Não consigo obter o URI SAF</string>
-    <string name="saf_guide_slide1_description">Abrir a gaveta de navegação</string>
-    <string name="saf_guide_slide1_description_before_o">Habilitar \'Mostrar cartão SD\' no menu overflow</string>
     <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s requer acesso ao cartão SD</string>
-    <string name="saf_guide_slide2_description">Você precisa selecionar seu cartão SD no diretório raiz</string>
-    <string name="saf_guide_slide2_title">Selecione seu cartão SD na gaveta de navegação</string>
-    <string name="saf_guide_slide3_description">Não abrir subpastas</string>
-    <string name="saf_guide_slide3_title">Toque em \'selecionar\' na parte inferior da tela</string>
-    <string name="saf_pick_file">Acesso ao arquivo requerido. Escolha: %s</string>
-    <string name="saf_pick_sdcard">Acesso ao cartão SD requerido. Por favor, escolha o diretório raiz do cartão SD</string>
-    <string name="saf_write_failed">Falha na escrita do arquivo: %s</string>
     <string name="save_playlist_title">Salvar como arquivo</string>
     <string name="saved_playlist_to">Lista de reprodução salva em %s</string>
     <string name="saving_changes">Salvando alterações</string>
-    <string name="saving_tags">Salvando tags</string>
-    <string name="saving_to_file">Gravando no arquivo...</string>
     <string name="scanned_files">Foram escaneados %1$d de %2$d arquivos.</string>
     <string name="search_hint">Buscar na sua biblioteca...</string>
-    <string name="see_all">Ver tudo</string>
-    <string name="select_preset">Escolher Predefinição</string>
     <string name="set_artist_image">Defina uma imagem para o artista</string>
     <string name="shuffle">Aleatório</string>
     <string name="simple">Simples</string>
     <string name="sleep_timer_canceled">Temporizador de soneca cancelado.</string>
     <string name="sleep_timer_set">Temporizador definido para %d minutos a partir de agora.</string>
-    <string name="slide_unlock">Deslize para desbloquear</string>
-    <string name="solid">Sólida</string>
     <string name="song">Música</string>
     <string name="song_duration">Duração da música</string>
     <string name="songs">Músicas</string>
     <string name="sort_order">Ordenar por</string>
     <string name="speech_not_supported">Desculpe! Seu dispositivo não suporta entrada de voz.</string>
     <string name="speech_prompt">Buscar na biblioteca</string>
-    <string name="suggestions">Sugestões</string>
-    <string name="summary_material_design_city_wallpaper">Material design, Wallpaper de cidades em www.techjuice.pk</string>
-    <string name="summary_material_design_icons">Todos os ícones usados foram tirados dos sites www.flaticons.com ou www.materialdesignicons.com</string>
     <string name="summary_user_info">Apenas mostra seu nome na Página Inicial</string>
     <string name="support_development">Apoiar o desenvolvimento</string>
-    <string name="support_development_summary">Se gosta de usar o Retro Music Player, considere fazer uma doação para apoiar meu trabalho.</string>
     <!-- Message displayed when tag editing fails -->
-    <string name="tag_edit_error">Ocorreu um erro ao editar as tags</string>
-    <string name="tag_editor_check_permission">Verificando as permissões</string>
-    <string name="tag_editor_document_tree_message">Selecione o diretório do armazenamento externo</string>
-    <string name="tag_editor_document_tree_permission_failed">Parece que não temos permissão para editar os arquivos. Verifique o diretório no seletor de arquivos.</string>
-    <string name="tag_error_kitkat">Ocorreu um erro ao editar as tags. O arquivo está armazenado em um cartão SD? Se estiver, o Google tornou impossível a edição de tags para este arquivo.</string>
-    <string name="tag_error_lollipop">Ocorreu um erro ao editar as tags. Se o arquivo está armazenado em um cartão SD, o Retro Music talvez não tenha permissão para acessa-lo.</string>
-    <string name="tag_retrieve_error">Ocorreu um erro na recuperação de tags.</string>
-    <string name="text">Texto</string>
     <string name="thank_you">Obrigado!</string>
     <string name="the_audio_file">O arquivo de áudio</string>
     <string name="this_month">Este mês</string>
     <string name="this_week">Esta semana</string>
     <string name="this_year">Este ano</string>
     <string name="tiny">Minúsculo</string>
-    <string name="title">Título</string>
     <string name="title_dashboard">Painel</string>
-    <string name="title_desc">Título &lt;</string>
     <string name="title_good_afternoon">Boa tarde</string>
     <string name="title_good_day">Bom dia</string>
     <string name="title_good_evening">Boa noite</string>
     <string name="title_good_morning">Bom dia</string>
     <string name="title_good_night">Boa noite</string>
-    <string name="title_home">Início</string>
-    <string name="title_material_design_city_wallpaper">Papel de parede de cidade</string>
-    <string name="title_material_design_icons">Ícones</string>
-    <string name="title_notifications">Notificações</string>
     <string name="title_user_info">Qual é seu nome</string>
     <string name="today">Hoje</string>
-    <string name="toggle_lyrics_size">Defina o tamanho das letras</string>
-    <string name="tool_tip_see_all">Ver todas as faixas</string>
     <string name="top_albums">Top álbuns</string>
     <string name="top_artists">Top artistas</string>
-    <string name="top_tracks">Faixas favoritas</string>
-    <string name="top_tracks_label">Faixas Principais</string>
     <string name="track_hint">"Faixa (2 para a faixa 2 ou 3004 para a faixa 4 do CD3)"</string>
     <string name="track_list">Número da faixa</string>
     <string name="translate">Traduzir</string>
-    <string name="translate_summary">Ajude a traduzir o Retro Music para o seu idioma nativo.</string>
     <string name="unplayable_file">N\u00e3o foi poss\u00edvel reproduzir essa m\u00fasica.</string>
     <string name="up_next">Próximo</string>
-    <string name="update">Atualizar</string>
     <string name="update_image">Atualizar imagem</string>
-    <string name="updated_artist_image">Imagem do artista atualizada.</string>
     <string name="updating">Atualizando...</string>
-    <string name="user_profile_summary">Alterar imagem de banner e perfil</string>
     <string name="version">Versão</string>
-    <string name="virtualizer_strength">Intensidade do Virtualizador</string>
-    <string name="volume_control">Controle de volume</string>
     <string name="web_search">Busca online</string>
     <string name="what_do_you_want_to_share">O que você quer compartilhar?</string>
     <string name="window">Janela</string>
     <string name="x_has_been_set_as_ringtone">Definir %1$s como toque do seu telefone.</string>
     <string name="x_selected">Seleção: %1$d</string>
     <string name="year">Ano</string>
-    <string name="you_have_to_select_at_least_one_category">Você precisa selecionar ao menos uma categoria</string>
 </resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 713fa261c..0ff15c2ae 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -8,7 +8,6 @@
     <string name="action_add_to_playlist">Adaugă la un playlist</string>
     <string name="action_clear_playing_queue">Curăță coada de redare</string>
     <string name="action_clear_playlist">Șterge playlist</string>
-    <string name="action_cycle_repeat">Mod repetare ciclică</string>
     <string name="action_delete">Șterge</string>
     <string name="action_delete_from_device">Șterge de pe dispozitiv</string>
     <string name="action_details">Detalii</string>
@@ -18,13 +17,11 @@
     <string name="action_grant">Acord</string>
     <string name="action_grid_size">Mărimea grilei</string>
     <string name="action_grid_size_land">Mărimea grilei (bază)</string>
-    <string name="action_new_playlist">Crează un playlist...</string>
     <string name="action_next">Următorul</string>
     <string name="action_play">Redați</string>
     <string name="action_play_next">Redă urmatorul</string>
     <string name="action_play_pause">Redați/Opriți</string>
     <string name="action_previous">Anterior</string>
-    <string name="action_re_download_artist_image">Înnoiește poza artist</string>
     <string name="action_remove_from_favorites">Șterge din favorite</string>
     <string name="action_remove_from_playing_queue">Șterge din coada de redare</string>
     <string name="action_remove_from_playlist">Șterge din playlist</string>
@@ -37,15 +34,10 @@
     <string name="action_set_as_start_directory">Setează ca registru principal</string>
     <string name="action_settings">"Setări"</string>
     <string name="action_share">Expediază</string>
-    <string name="action_show_lyrics">Arată versuri</string>
-    <string name="action_shuffle_album">Amestecă album</string>
     <string name="action_shuffle_all">Amestecă tot</string>
-    <string name="action_shuffle_artist">Amestecă artist</string>
     <string name="action_shuffle_playlist">Amestecă playlist</string>
     <string name="action_sleep_timer">Cronometru de somn</string>
     <string name="action_tag_editor">Redactor info</string>
-    <string name="action_toggle_favorite">Favorite</string>
-    <string name="action_toggle_shuffle">Amestecare</string>
     <string name="add_action">Adaugă</string>
     <string name="add_photo">Adaugă fotografie</string>
     <string name="add_playlist_title">"Adaugă la playlist"</string>
@@ -53,11 +45,9 @@
     <string name="added_x_titles_to_playing_queue">Adăugate %1$d titluri la coada de redare</string>
     <string name="album">Album</string>
     <string name="album_artist">Artistul albumului</string>
-    <string name="album_desc">Descriere album</string>
     <string name="album_or_artist_empty">Titlul ori numele artistului nu e completat</string>
     <string name="albums">Albume</string>
     <!-- Android Auto -->
-    <string name="albums_label">Albume</string>
     <string name="always">Mereu</string>
     <string name="app_share">Hey! încearcă acest music player la adresa: https://play.google.com/store/apps/details?id=%s</string>
     <!-- App Shortcuts -->
@@ -67,22 +57,15 @@
     <string name="app_shortcut_shuffle_all_short">Amestecă</string>
     <string name="app_shortcut_top_tracks_long">@string/my_top_tracks</string>
     <string name="app_shortcut_top_tracks_short">Top cântece</string>
-    <string name="app_summary">O aplicaţie cu design hibrid inspirat de iOS şi \"Material design\"</string>
     <string name="app_widget_big_name">Retro music - Mare</string>
-    <string name="app_widget_big_name_2">Retro music - Mare2</string>
     <string name="app_widget_card_name">Retro music - Card</string>
     <string name="app_widget_classic_name">Retro music - Classic</string>
     <string name="app_widget_small_name">Retro music - Mic</string>
     <string name="artist">Artist</string>
-    <string name="artist_desc">Desc. artist</string>
     <string name="artists">Artiști</string>
-    <string name="artists_label">Artişti</string>
-    <string name="at_least_one_category_must_be_enabled">Trebuie să fie activată cel puțin o categorie.</string>
     <string name="audio_focus_denied">Folcalizarea audio a fost respinsă.</string>
     <string name="audio_settings_summary">Ajustați setările de sunet și comenzile egalizatorului</string>
-    <string name="bass_boost_strength">Intensitate Bass Boost</string>
     <string name="biography">Biografie</string>
-    <string name="biography_unavailable">Biografia artistului nu a fost g\u0103sit\u0103.</string>
     <string name="black_theme_name">Negru</string>
     <string name="blacklist">Lista neagră</string>
     <string name="blur">Blur</string>
@@ -98,7 +81,6 @@
     <string name="clear_playlist_x"><![CDATA[Dori\u021bi s\u0103 \u0219terge\u021bi playlist-ul  <b>%1$s</b>? Aceast\u0103 ac\u021biune nu poate fi \u00eenapoiat\u0103!]]></string>
     <string name="color">Culoare</string>
     <string name="color_theme_name">Culoare</string>
-    <string name="colored_footers">Footer colorat</string>
     <string name="colors">Culori</string>
     <string name="could_not_create_playlist">Nu s-a putut crea playlist.</string>
     <string name="could_not_download_album_cover">"Nu s-a putut desc\u0103rca o copert\u0103 de album corespunz\u0103toare."</string>
@@ -107,36 +89,23 @@
     <string name="create_action">Crează</string>
     <string name="created_playlist_x">S-a creat playlist-ul %1$s.</string>
     <string name="currently_listening_to_x_by_x">Acum ascultați %1$s de %2$s.</string>
-    <string name="custom">Personalizat</string>
     <string name="dark_theme_name">Suriu</string>
-    <string name="date">Data</string>
     <string name="default_hint">Nu există versuri</string>
-    <string name="delete_action">Șterge</string>
     <string name="delete_playlist_title">Șterge playlist</string>
     <string name="delete_playlist_x"><![CDATA[Doriți să ștergeți playlist-ul <b>%1$s</b>?]]></string>
     <string name="delete_playlists_title">Șterge playlist-uri</string>
-    <string name="delete_song_title">Șterge cântec</string>
     <string name="delete_song_x"><![CDATA[Doriți să ștergeți cântecul <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Șterge melodii</string>
     <string name="delete_x_playlists"><![CDATA[Doriți să ștergeți <b>%1$d</b> playlist-uri?]]></string>
     <string name="delete_x_songs"><![CDATA[Doriți să ștergeți <b>%1$d</b> cântece?]]></string>
     <string name="deleted_x_songs">Au fost șterse %1$d cântece.</string>
-    <string name="deleting_songs">Ștergere melodii</string>
     <string name="do_you_want_to_clear_the_blacklist">Doriți să ștergeți lista neagră?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Doriți să ștergeți <b>%1$s</b> din lista neagră?]]></string>
     <string name="donate">Donează</string>
     <string name="donate_summary">Dacă ești de părere că merit să fiu plătit pentru munca mea,  poți să donezi aici.</string>
     <string name="donation_header">Cumpăraţi-mi o(un)</string>
     <string name="download_from_last_fm">Descarcă de pe Last.fm</string>
-    <string name="duration">Durata</string>
-    <string name="edit">Editare</string>
-    <string name="edit_categories">Editare categorii</string>
-    <string name="edit_tags">Editare tag-uri</string>
     <string name="empty">Gol</string>
     <string name="equalizer">Egalizator</string>
-    <string name="error_loading_lyrics_from_network">Eroare la încărcare din rețea</string>
-    <string name="experimental">Experimental</string>
-    <string name="failed_to_save_playlist">salvarea playlist-ului (%s) a eșuat.</string>
     <string name="favorites">Favorite</string>
     <string name="flat">Uniform</string>
     <string name="folders">Mape</string>
@@ -146,7 +115,6 @@
     <string name="general_settings_title">Aspect</string>
     <string name="genre">Gen muzical</string>
     <string name="genres">Genuri</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>
@@ -156,36 +124,24 @@
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
     <string name="history">Istoric</string>
-    <string name="history_label">Istoric</string>
-    <string name="holiday">Vacanţă</string>
     <string name="home">Acasă</string>
     <string name="inserted_x_songs_into_playlist_x">Au fost insertate %1$d cântece în playlist-ul %2$s.</string>
-    <string name="inspired_designs_by">Design inspirat de</string>
-    <string name="join_community">Alătură-te comunității Google Plus</string>
-    <string name="join_community_summary">Dacă ai nevoie de ajutor sau ai întrebări, îți recomandăm să vizitezi comunitatea Retro Music de pe Google Plus.</string>
     <string name="label_bit_rate">Bitrate</string>
-    <string name="label_details">Detalii</string>
     <string name="label_file_format">Format</string>
     <string name="label_file_name">Numele fișierului</string>
     <string name="label_file_path">Dosarul fișierului</string>
     <string name="label_file_size">Mărime</string>
     <string name="label_sampling_rate">Rata de eșantionare</string>
     <string name="label_track_length">Lungime</string>
-    <string name="language_contributors">Contribuitorii traducerilor</string>
     <string name="last_added">Adăugate recent</string>
     <string name="lets_play_something">Hai să ascultăm ceva</string>
     <string name="library">Biblioteca</string>
-    <string name="library_categories">Categorii bibliotecă</string>
     <string name="licenses">Licențe</string>
     <string name="light_theme_name">Alb</string>
     <string name="listing_files">Listarea fișierelor</string>
-    <string name="loading">Se încarcă...</string>
     <string name="loading_products">Se încarcă produsele...</string>
     <string name="lyrics">Versuri</string>
-    <string name="media_route_menu_title">Dispozitiv de difuzare</string>
-    <string name="more">Mai mult</string>
     <string name="my_name">Numele Meu</string>
-    <string name="my_playlists">Playlist-ul Meu</string>
     <string name="my_top_tracks">Top cântece redate</string>
     <string name="never">Niciodată</string>
     <string name="new_playlist_title">Playlist nou</string>
@@ -194,7 +150,6 @@
     <string name="no_artists">Niciun artist</string>
     <string name="no_audio_ID">"Mai întâi redă un cântec, apoi incearcă din nou."</string>
     <string name="no_equalizer">Nu a fost găsit nici un equalizer.</string>
-    <string name="no_files">Niciun fișier</string>
     <string name="no_genres">Niciun gen</string>
     <string name="no_lyrics_found">Nu a fost găsite versuri.</string>
     <string name="no_playlists">Niciun playlist</string>
@@ -219,52 +174,36 @@
     <string name="personalize_settings_summary">Personalizează UI si pagina de redare</string>
     <string name="pick_from_local_storage">Alegeți din spațiul de stocare local</string>
     <string name="plain">Simplu</string>
-    <string name="play">Redare</string>
-    <string name="play_all">Redare tot</string>
     <string name="playing_notification_description">Notificarea de redare oferă acțiuni de redare / pauză etc.</string>
     <string name="playing_notification_name">Notificarea de redare</string>
     <string name="playlist_empty_text">Playlist gol</string>
     <string name="playlist_is_empty">Playlist-ul este gol</string>
     <string name="playlist_name_empty">Numele playlist-ului</string>
     <string name="playlists">Playlist-uri</string>
-    <string name="playlists_label">Liste de redare</string>
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_general">General</string>
     <string name="pref_header_images">Imagini</string>
     <string name="pref_header_lockscreen">Ecran de blocare</string>
-    <string name="pref_header_now_playing_screen">Se redă</string>
     <string name="pref_header_playlists">Playlist-uri</string>
     <string name="pref_only_lollipop">"Valabil doar pe Lollipop"</string>
-    <string name="pref_only_nougat_mr1">"Valabil doar pe Nougat 7.1"</string>
-    <string name="pref_summary_about">Persoanele care au ajutat la proiect</string>
     <string name="pref_summary_album_art_on_lockscreen">Folosește coperta de album curentă ca imagine de fundal pe ecranul de blocare.</string>
     <string name="pref_summary_audio_ducking">Notificațiile, navigarea etc.</string>
     <string name="pref_summary_blurred_album_art">Spălăcește coperta de album pe ecranul de blocare. Poate cauza probleme cu alte aplcicatii sau widget-uri.</string>
     <string name="pref_summary_carousel_effect">Efectul carusel pentru coperţile de album în ecranul de redare. Rețineți că tema Card și Blur Card nu va funcționa</string>
-    <string name="pref_summary_circular_album_effect">Afișarea copertei albumului în cercuri în ecranul de redare, doar pentru unele teme</string>
     <string name="pref_summary_classic_notification">Folosește designul classic de notificare.</string>
     <string name="pref_summary_colored_app">Culoarea fundalului și a butonului de control se schimbă în dependență de coperta albumului din ecranul de redare</string>
     <string name="pref_summary_colored_app_shortcuts">Colorează comenzile rapide în culoarea de accent. De fiecare dată cînd schimbați culoarea, comutați această opțiune pentru effect</string>
     <string name="pref_summary_colored_navigation_bar">Colorează bara de navigare în culoarea primară.</string>
     <string name="pref_summary_colored_notification">"Coloreaz\u0103 notificarea dup\u0103 culoarea copertei de album."</string>
-    <string name="pref_summary_day_dream">Arată detaliile cântecului în regim \"Daydream\" când muzica este redată</string>
     <string name="pref_summary_dominant_color">Cea mai dominantă culoare va fi selectată din coperta albumului sau a artistului.</string>
-    <string name="pref_summary_exclude_songs">Exclude melodiile mai scurte decât 30 de secunde.</string>
     <string name="pref_summary_gapless_playback">"Poate cauza probleme de redare pe unele dispozitive."</string>
     <string name="pref_summary_ignore_media_store_artwork">Poate mări calitatea copertei de album, dar cauzează încărcarea mai lentă a imaginilor. Activați această opțiune doar dacă aveți probleme cu coperta de album cu rezoluție mică.</string>
-    <string name="pref_summary_language_en">Forțează limba aplicației în engleză (pentru testarea aplicației cu opțiunea limbajurilor multiple)</string>
-    <string name="pref_summary_library_categories">Configurați vizibilitatea și ordinea categoriilor bibliotecii.</string>
     <string name="pref_summary_lock_screen">Comenzi pe ecranul de blocare pentru Retro music.</string>
-    <string name="pref_summary_lock_screen_app">Arată controlul complet de pe ecranul de blocare</string>
     <string name="pref_summary_open_source_licences">Detalii privind licența pentru software open source</string>
     <string name="pref_summary_round_corners">Colțuri rotunjite pentru ecran, coperta de album etc.</string>
     <string name="pref_summary_tab_titles">Activare/Dezactivare file cu titluri de jos</string>
-    <string name="pref_summary_toggle_bottom_bar_titles">Dezactivează titlurile sub bara de navigare</string>
     <string name="pref_summary_toggle_full_screen">Mod imersiv</string>
-    <string name="pref_summary_toggle_genre">Dacă doriți să se afișeze fila genului în partea de jos a filelor</string>
     <string name="pref_summary_toggle_headset">Începe redarea imediat ce sunt conectate căștile.</string>
-    <string name="pref_summary_toggle_navigation_bar">Se ascunde numai bara de navigare</string>
-    <string name="pref_summary_toggle_status_bar">Se ascunde numai bara de stare</string>
     <string name="pref_summary_toggle_volume">Dacă aveți spațiu pe ecranul de redare, activați controalele de volum</string>
     <string name="pref_title_album_art_on_lockscreen">Afișați coperta albumului</string>
     <string name="pref_title_app_shortcuts">Comenzi rapide colorate</string>
@@ -274,30 +213,18 @@
     <string name="pref_title_classic_notification">Design classic de notificare</string>
     <string name="pref_title_colored_app">Culoare adaptivă</string>
     <string name="pref_title_colored_notification">Notificare colorată</string>
-    <string name="pref_title_day_dream">\"Daydream\"</string>
-    <string name="pref_title_exclude_songs">Exclude melodii</string>
-    <string name="pref_title_external_storage_access">Acordați accesul la spațiul de stocare extern</string>
     <string name="pref_title_gapless_playback">Redare \"Gapless\"</string>
     <string name="pref_title_general_theme">Temă</string>
-    <string name="pref_title_gradient_color">Alegeți culoarea</string>
     <string name="pref_title_ignore_media_store_artwork">Ignoră copertele de pe Magazinul Media</string>
     <string name="pref_title_last_added_interval">Ultimul interval de playlist adăugat</string>
     <string name="pref_title_lock_screen">Comenzi ecran complet</string>
-    <string name="pref_title_lock_screen_app">Ecran de blocare Retro</string>
-    <string name="pref_title_lyrics_options">Opţiuni pentru versuri</string>
     <string name="pref_title_navigation_bar">Bara de navigare colorată</string>
     <string name="pref_title_now_playing_screen_appearance">Aspect</string>
     <string name="pref_title_open_source_licences">Licențe open source</string>
     <string name="pref_title_round_corners">Colțuri rotunjite</string>
-    <string name="pref_title_toggle_bottom_bar_titles">Dezactivează titluri</string>
     <string name="pref_title_toggle_carousel_effect">Efect de carusel</string>
-    <string name="pref_title_toggle_circular_album_effect">Album circular</string>
     <string name="pref_title_toggle_dominant_color">Culoarea dominantă</string>
     <string name="pref_title_toggle_full_screen">Ecran complet</string>
-    <string name="pref_title_toggle_genre">Afișare gen</string>
-    <string name="pref_title_toggle_language_en">Limba engleză</string>
-    <string name="pref_title_toggle_navigation_bar">Bara de navigare</string>
-    <string name="pref_title_toggle_status_bar">Bara de stare</string>
     <string name="pref_title_toggle_tab_titles">Titlurile categoriior</string>
     <string name="pref_title_toggle_toggle_headset">Redare automată</string>
     <string name="pref_title_toggle_volume">Controale volum</string>
@@ -306,10 +233,8 @@
     <string name="primary_color_desc">Culoarea temei primare, implicită în gri albastru, pentru moment funcționează doar cu culori închise</string>
     <string name="purchase">Procurare</string>
     <string name="queue">Coadă</string>
-    <string name="queue_label">Coadă</string>
     <string name="rate_app">Evaluaţi aplicaţia</string>
     <string name="rate_on_google_play_summary">Dacă vă place această aplicație, anunțați-ne în magazinul Google Play pentru a oferi o experiență mai bună</string>
-    <string name="recent_activity">Activitate recentă</string>
     <string name="recent_albums">Albume recente</string>
     <string name="recent_artists">Artişti recenţi</string>
     <string name="remove_action">Eliminare</string>
@@ -319,112 +244,62 @@
     <string name="remove_song_x_from_playlist"><![CDATA[Eliminaţi melodia <b>%1$s</b> din lista de redare?]]></string>
     <string name="remove_songs_from_playlist_title">Eliminare melodii din lista de redare</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[Eliminaţi <b>%1$d</b> melodii din lista de redare?]]></string>
-    <string name="rename_action">Redenumire</string>
     <string name="rename_playlist_title">Redenumiţi lista de redare</string>
-    <string name="reset_action">Resetare</string>
     <string name="reset_artist_image">Reseteţi imaginea artistului</string>
     <string name="restore">Restabilire</string>
     <string name="restored_previous_purchase_please_restart">A fost restaurată achiziția anterioară. Reporniți aplicația pentru a utiliza toate funcțiile.</string>
     <string name="restored_previous_purchases">Au fost restabilite achizițiile anterioare.</string>
     <string name="restoring_purchase">Se restabilește achiziția...</string>
-    <string name="retro">Retro</string>
     <string name="retro_equalizer">Retro Egalizator</string>
-    <string name="saf_delete_failed">Ştergerea fişierului %s a eşuat</string>
     <!-- SAF -->
-    <string name="saf_error_uri">Nu se poate obține URI SAF</string>
-    <string name="saf_guide_slide1_description">Deschideți sertarul de navigare</string>
-    <string name="saf_guide_slide1_description_before_o">Activați \"Afișați cardul SD\" în meniu</string>
     <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s necesită acces cardul SD</string>
-    <string name="saf_guide_slide2_description">Trebuie să selectați directorul rădăcină al cardului SD</string>
-    <string name="saf_guide_slide2_title">Selectați cardul SD în sertarul de navigare</string>
-    <string name="saf_guide_slide3_description">Nu deschideți niciun subdosar</string>
-    <string name="saf_guide_slide3_title">Atingeți butonul \"Selectați\" din partea de jos a ecranului</string>
-    <string name="saf_pick_file">Este necesar accesul la fișiere. Alegeţi %s</string>
-    <string name="saf_pick_sdcard">Este necesară accesarea cardului SD. Alegeți directorul rădăcină al cardului SD</string>
-    <string name="saf_write_failed">Scrierea fişierului %s a eşuat</string>
     <string name="save_playlist_title">Salvare ca fişier</string>
     <string name="saved_playlist_to">Salvaţi lista de redare în %s.</string>
     <string name="saving_changes">Salvare modificări</string>
-    <string name="saving_tags">Salvare etichete</string>
-    <string name="saving_to_file">Salvare în fişier...</string>
     <string name="scanned_files">Au fost scanate %1$d din %2$d fişiere.</string>
     <string name="search_hint">Căutare în bibliotecă...</string>
-    <string name="see_all">Afişaţi tot</string>
-    <string name="select_preset">Selectaţi presetarea</string>
     <string name="set_artist_image">Setaţi imaginea artistului</string>
     <string name="shuffle">Amestecare</string>
     <string name="simple">Simplu</string>
     <string name="sleep_timer_canceled">Temporizatorul a fost anulat.</string>
     <string name="sleep_timer_set">Temporizatorul este setat pentru %d minute de acum.</string>
-    <string name="slide_unlock">Glisați pentru a debloca</string>
-    <string name="solid">Solid</string>
     <string name="song">Melodie</string>
     <string name="song_duration">Durată</string>
     <string name="songs">Melodii</string>
     <string name="sort_order">ordinea de sortare</string>
     <string name="speech_not_supported">Scuze! Dispozitivul tau nu suporta comenzi vocale</string>
     <string name="speech_prompt">Caută în colecția ta</string>
-    <string name="suggestions">Sugestii</string>
-    <string name="summary_material_design_city_wallpaper">Imagini de fundal în stil Material de pe site-ul www.techjuice.pk</string>
-    <string name="summary_material_design_icons">Pictograme de pe aceste site-uri: www.flaticon.com sau www.materialdesignicons.com</string>
     <string name="summary_user_info">Numele tău va fi afișat pe ecranul de pornire</string>
     <string name="support_development">Susţineţi dezvoltarea</string>
-    <string name="support_development_summary">Dacă vă place să utilizaţi Retro Music Player, considerați acordarea unei donații ca sprijin pentru munca mea.</string>
     <!-- Message displayed when tag editing fails -->
-    <string name="tag_edit_error">A apărut o eroare la editarea etichetelor.</string>
-    <string name="tag_editor_check_permission">Verificare permisiuni</string>
-    <string name="tag_editor_document_tree_message">Selectați directorul de stocare extern</string>
-    <string name="tag_editor_document_tree_permission_failed">Se pare că nu avem permisiunea de a edita fișierele. Verificați încă odată directorul din selectorul de fișiere.</string>
-    <string name="tag_error_kitkat">A apărut o eroare la editarea etichetelor. Este fișierul stocat pe un card SD? Dacă da, Google a făcut imposibilă editarea etichetelor pentru acest fișier.</string>
-    <string name="tag_error_lollipop">A apărut o eroare la editarea etichetelor. Dacă fișierul este stocat pe un card SD, este posibil ca Retro Music să nu aibă permisiunea de accesare a acestuia.</string>
-    <string name="tag_retrieve_error">A apărut o eroare la preluarea etichetelor.</string>
-    <string name="text">Text</string>
     <string name="thank_you">Mulțumesc!</string>
     <string name="the_audio_file">Fișier audio</string>
     <string name="this_month">Luna aceasta</string>
     <string name="this_week">Săptămâna aceasta</string>
     <string name="this_year">Anul acesta</string>
     <string name="tiny">Mic</string>
-    <string name="title">Titlu</string>
     <string name="title_dashboard">Tablou de bord</string>
-    <string name="title_desc">Descriere titlu</string>
     <string name="title_good_afternoon">Bună ziua</string>
     <string name="title_good_day">O zi bună</string>
     <string name="title_good_evening">Bună seara</string>
     <string name="title_good_morning">Bună dimineaţa</string>
     <string name="title_good_night">Noapte bună</string>
-    <string name="title_home">Acasă</string>
-    <string name="title_material_design_city_wallpaper">Imagini de fundal oraș</string>
-    <string name="title_material_design_icons">Pictograme</string>
-    <string name="title_notifications">Notificări</string>
     <string name="title_user_info">Numele dvs.</string>
     <string name="today">Astăzi</string>
-    <string name="toggle_lyrics_size">Schimbați dimensiunea versurilor</string>
-    <string name="tool_tip_see_all">Vedeți toate melodiile</string>
     <string name="top_albums">Albume de top</string>
     <string name="top_artists">Artişti de top</string>
-    <string name="top_tracks">Melodii de top</string>
-    <string name="top_tracks_label">Melodii de top</string>
     <string name="track_hint">"Melodie (2 pentru melodia 2 sau 3004 pentru CD3 melodia 4)"</string>
     <string name="track_list">Numărul piesei</string>
     <string name="translate">Traducere</string>
-    <string name="translate_summary">Ajutați la traducerea Retro music în limba dvs maternă.</string>
     <string name="unplayable_file">Nu s-a putut reda aceast\u0103 melodie.</string>
     <string name="up_next">Urmează</string>
-    <string name="update">Actualizare</string>
     <string name="update_image">Actualizare imagine</string>
-    <string name="updated_artist_image">Imaginea artistului a fost actualizată.</string>
     <string name="updating">Se actualizează...</string>
-    <string name="user_profile_summary">Schimbă banner-ul și imaginea de profil</string>
     <string name="version">Versiune</string>
-    <string name="virtualizer_strength">Intensitate virtualizare</string>
-    <string name="volume_control">Control volum</string>
     <string name="web_search">Căutare pe internet</string>
     <string name="what_do_you_want_to_share">Ce doriți să expediați?</string>
     <string name="window">Fereastră</string>
     <string name="x_has_been_set_as_ringtone">Setează %1$s ca ton de apel</string>
     <string name="x_selected">%1$d selectat</string>
     <string name="year">Anul</string>
-    <string name="you_have_to_select_at_least_one_category">Trebuie să selectați cel puțin o categorie</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index a1f1ea2e5..12813609d 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -8,7 +8,6 @@
     <string name="action_add_to_playlist">В плейлист...</string>
     <string name="action_clear_playing_queue">Очистить очередь</string>
     <string name="action_clear_playlist">Очистить плейлист</string>
-    <string name="action_cycle_repeat">Режим повтора</string>
     <string name="action_delete">Удалить</string>
     <string name="action_delete_from_device">"Удалить с устройства "</string>
     <string name="action_details">Информация о файле</string>
@@ -18,13 +17,11 @@
     <string name="action_grant">Предоставить</string>
     <string name="action_grid_size">Размер сетки</string>
     <string name="action_grid_size_land">Размер сетки (ландшафтный)</string>
-    <string name="action_new_playlist">Новый плейлист…</string>
     <string name="action_next">Следующий</string>
     <string name="action_play">Воспроизвести</string>
     <string name="action_play_next">Воспроизвести следующим</string>
     <string name="action_play_pause">Воспроизвести/Пауза</string>
     <string name="action_previous">Предыдущий</string>
-    <string name="action_re_download_artist_image">Обновить изображение исполнителя</string>
     <string name="action_remove_from_favorites">Удалить из избранного</string>
     <string name="action_remove_from_playing_queue">Удалить из очередь воспроизведения</string>
     <string name="action_remove_from_playlist">Удалить из плейлиста</string>
@@ -37,15 +34,10 @@
     <string name="action_set_as_start_directory">Установить как домашний каталог</string>
     <string name="action_settings">"Настройки"</string>
     <string name="action_share">Поделиться</string>
-    <string name="action_show_lyrics">Показать слова</string>
-    <string name="action_shuffle_album">Перемешать альбом</string>
     <string name="action_shuffle_all">Перемешать все</string>
-    <string name="action_shuffle_artist">Перемешать исполнителей</string>
     <string name="action_shuffle_playlist">Перемешать плейлист</string>
     <string name="action_sleep_timer">Таймер сна</string>
     <string name="action_tag_editor">Редактор тегов</string>
-    <string name="action_toggle_favorite">Кнопка \"любимые\"</string>
-    <string name="action_toggle_shuffle">Кнопка \"перемешать\"</string>
     <string name="add_action">Добавить</string>
     <string name="add_photo">Добавить \nфото</string>
     <string name="add_playlist_title">"Добавить в плейлист"</string>
@@ -53,11 +45,9 @@
     <string name="added_x_titles_to_playing_queue">Добавлено в очередь: %1$d</string>
     <string name="album">Альбом</string>
     <string name="album_artist">Исполнитель альбома</string>
-    <string name="album_desc">Альбом по убыв.</string>
     <string name="album_or_artist_empty">Название или исполнитель отсутствуют</string>
     <string name="albums">Альбомы</string>
     <!-- Android Auto -->
-    <string name="albums_label">Альбомы</string>
     <string name="always">Всегда</string>
     <string name="app_share">Хей! Попробуй этот клёвый музыкальный плеер тут:
 https://play.google.com/store/apps/details?id=%s</string>
@@ -68,22 +58,15 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="app_shortcut_shuffle_all_short">Перемешать</string>
     <string name="app_shortcut_top_tracks_long">Мои лучшие треки</string>
     <string name="app_shortcut_top_tracks_short">Лучшие треки</string>
-    <string name="app_summary">Гибридное приложение, сочетающее в себе Material Design и дизайн iOS.</string>
     <string name="app_widget_big_name">Большой</string>
-    <string name="app_widget_big_name_2">Большой 2</string>
     <string name="app_widget_card_name">Retro music - Карточка</string>
     <string name="app_widget_classic_name">Классика</string>
     <string name="app_widget_small_name">Маленький</string>
     <string name="artist">Исполнитель</string>
-    <string name="artist_desc">Исполнитель (по убыв.)</string>
     <string name="artists">Исполнители</string>
-    <string name="artists_label">Исполнители</string>
-    <string name="at_least_one_category_must_be_enabled">Как минимум одна категория должна быть включена.</string>
     <string name="audio_focus_denied">Аудио фокус отключен</string>
     <string name="audio_settings_summary">Регулировка звука и эквалайзер</string>
-    <string name="bass_boost_strength">Степень мощности басов</string>
     <string name="biography">Биография</string>
-    <string name="biography_unavailable">\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043d\u0430\u0439\u0442\u0438 \u0431\u0438\u043e\u0433\u0440\u0430\u0444\u0438\u044e \u0438\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044f</string>
     <string name="black_theme_name">Чёрная</string>
     <string name="blacklist">Исключения</string>
     <string name="blur">Размытая</string>
@@ -99,7 +82,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="clear_playlist_x"><![CDATA[\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c \u043f\u043b\u0435\u0439\u043b\u0438\u0441\u0442 <b>%1$s</b>? \u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u043d\u0435\u043b\u044c\u0437\u044f!]]></string>
     <string name="color">Цвет</string>
     <string name="color_theme_name">Цвет</string>
-    <string name="colored_footers">Цветные нижние колонтитулы</string>
     <string name="colors">Цвета</string>
     <string name="could_not_create_playlist">\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0441\u043e\u0437\u0434\u0430\u0442\u044c \u043f\u043b\u0435\u0439\u043b\u0438\u0441\u0442.</string>
     <string name="could_not_download_album_cover">"\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u044e\u0449\u0443\u044e \u043e\u0431\u043b\u043e\u0436\u043a\u0443 \u0430\u043b\u044c\u0431\u043e\u043c\u0430"</string>
@@ -108,36 +90,23 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="create_action">Создать</string>
     <string name="created_playlist_x">Создан плейлист %1$s</string>
     <string name="currently_listening_to_x_by_x">Сейчас играет %1$s от %2$s</string>
-    <string name="custom">Пользовательский</string>
     <string name="dark_theme_name">Тёмная</string>
-    <string name="date">Дата</string>
     <string name="default_hint">Нет слов</string>
-    <string name="delete_action">Удалить</string>
     <string name="delete_playlist_title">Удалить плейлист</string>
     <string name="delete_playlist_x"><![CDATA[Удалить плейлист <b>%1$s</b>?]]></string>
     <string name="delete_playlists_title">Удалить плейлисты</string>
-    <string name="delete_song_title">Удалить песню</string>
     <string name="delete_song_x"><![CDATA[Удалить песню <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Удалить песни</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="deleting_songs">Удаление песен</string>
     <string name="do_you_want_to_clear_the_blacklist">Вы хотите очистить исключения?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Вы действительно хотите убрать <b>%1$s</b> из исключений?]]></string>
     <string name="donate">Дать копеечку</string>
     <string name="donate_summary">Если вы думаете, что я не зря поработал, оставьте мне пару долларов здесь.</string>
     <string name="donation_header">Купи мне</string>
     <string name="download_from_last_fm">Скачать с Last.fm</string>
-    <string name="duration">Длительность</string>
-    <string name="edit">Редактировать</string>
-    <string name="edit_categories">Редактировать категории</string>
-    <string name="edit_tags">Редактировать теги</string>
     <string name="empty">Пусто</string>
     <string name="equalizer">Эквалайзер</string>
-    <string name="error_loading_lyrics_from_network">Ошибка загрузки из сети</string>
-    <string name="experimental">Тестовые</string>
-    <string name="failed_to_save_playlist">Не удалось сохранить плейлист  (%s).</string>
     <string name="favorites">Избранные</string>
     <string name="flat">Плоская</string>
     <string name="folders">Папки</string>
@@ -147,7 +116,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="general_settings_title">Внешний вид и ощущения</string>
     <string name="genre">Жанр</string>
     <string name="genres">Жанры</string>
-    <string name="gradient">Градиент</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -157,36 +125,24 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
     <string name="history">История</string>
-    <string name="history_label">История</string>
-    <string name="holiday">Праздничная</string>
     <string name="home">Главная</string>
     <string name="inserted_x_songs_into_playlist_x">Вложено %1$d песен в список воспроизведения %2$s.</string>
-    <string name="inspired_designs_by">Вдохновленный дизайном</string>
-    <string name="join_community">Вступайте в сообщество в Google Plus</string>
-    <string name="join_community_summary">Если вам нужна помощь или есть какие-то вопросы, сообщество Retro Music на Google Plus - то, что вам нужно.</string>
     <string name="label_bit_rate">Битрейт</string>
-    <string name="label_details">Подробнее</string>
     <string name="label_file_format">Формат</string>
     <string name="label_file_name">Имя файла</string>
     <string name="label_file_path">Путь к файлу</string>
     <string name="label_file_size">Размер</string>
     <string name="label_sampling_rate">Частота дискретизации</string>
     <string name="label_track_length">Длина</string>
-    <string name="language_contributors">Переводчики</string>
     <string name="last_added">Недавно добавлено</string>
     <string name="lets_play_something">Давайте послушаем что-нибудь</string>
     <string name="library">Библиотека</string>
-    <string name="library_categories">Категории библиотеки</string>
     <string name="licenses">Лицензии</string>
     <string name="light_theme_name">Светлая</string>
     <string name="listing_files">Список файлов</string>
-    <string name="loading">Загрузка...</string>
     <string name="loading_products">Загрузка продуктов...</string>
     <string name="lyrics">Слова</string>
-    <string name="media_route_menu_title">Тип устройства</string>
-    <string name="more">Подробнее</string>
     <string name="my_name">Моё имя</string>
-    <string name="my_playlists">Мой плейлист</string>
     <string name="my_top_tracks">Мои лучшие треки</string>
     <string name="never">Никогда</string>
     <string name="new_playlist_title">Новый плейлист</string>
@@ -195,7 +151,6 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="no_artists">Нет исполнителей</string>
     <string name="no_audio_ID">"Сначала воспроизведите песню, затем повторите попытку."</string>
     <string name="no_equalizer">Эквалайзер не найден.</string>
-    <string name="no_files">Нет файлов</string>
     <string name="no_genres">Жанры отсутствуют</string>
     <string name="no_lyrics_found">Не найдены слова песни</string>
     <string name="no_playlists">Плейлисты отсутствуют</string>
@@ -220,52 +175,36 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="personalize_settings_summary">Отредактировать ваш текущий экран проигрывания и интерфейс</string>
     <string name="pick_from_local_storage">Из локального хранилища</string>
     <string name="plain">Гладкая</string>
-    <string name="play">Воспроизвести</string>
-    <string name="play_all">Воспроизвести все</string>
     <string name="playing_notification_description">Уведомление предоставляет действия для воспроизведения/паузы и т.д.</string>
     <string name="playing_notification_name">Проигрываемое уведомление</string>
     <string name="playlist_empty_text">Пустой плейлист</string>
     <string name="playlist_is_empty">Плейлист пуст</string>
     <string name="playlist_name_empty">Имя плейлиста</string>
     <string name="playlists">Плейлисты</string>
-    <string name="playlists_label">Плейлисты</string>
     <string name="pref_header_audio">Аудио</string>
     <string name="pref_header_general">Основная</string>
     <string name="pref_header_images">Изображения</string>
     <string name="pref_header_lockscreen">Экран блокировки</string>
-    <string name="pref_header_now_playing_screen">Сейчас играет</string>
     <string name="pref_header_playlists">Плейлисты</string>
     <string name="pref_only_lollipop">"Доступно только на Android L и выше"</string>
-    <string name="pref_only_nougat_mr1">"Доступно только на Android Nougat 7.1."</string>
-    <string name="pref_summary_about">Люди, которые помогали в проекте</string>
     <string name="pref_summary_album_art_on_lockscreen">Использует текущую обложку альбома в качестве обоев экрана.</string>
     <string name="pref_summary_audio_ducking">Уведомления, навигация и т.д.</string>
     <string name="pref_summary_blurred_album_art">Размывает обложку альбома на заблокированном экране. Может вызвать проблемы со сторонними приложениями и виджетами.</string>
     <string name="pref_summary_carousel_effect">Эффект карусели на обложке в экране проигрывания. Учтите, что темы Карточка и Размытая не будут работать</string>
-    <string name="pref_summary_circular_album_effect">Показывать круглую обложку на экране \"сейчас играет\". Работает не на всех темах</string>
     <string name="pref_summary_classic_notification">Использовать классический дизайн уведомлений.</string>
     <string name="pref_summary_colored_app">Фон и кнопка управления на экране проигрывания меняют цвета под обложку альбома</string>
     <string name="pref_summary_colored_app_shortcuts">Цвета ярлыков приложений в второстепенном цвете. Каждый раз, когда меняете цвет, переключайте это действие</string>
     <string name="pref_summary_colored_navigation_bar">Цвета на панели навигации в основном цвете.</string>
     <string name="pref_summary_colored_notification">"\u0426\u0432\u0435\u0442\u0430: \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435 \u0432 \u0430\u043b\u044c\u0431\u043e\u043c\u0435 \u043e\u0445\u0432\u0430\u0442\u044b\u0432\u0430\u0435\u0442 \u044f\u0440\u043a\u0438\u0439 \u0446\u0432\u0435\u0442"</string>
-    <string name="pref_summary_day_dream">Показывает детали песни во время проигрывания музыки</string>
     <string name="pref_summary_dominant_color">Самый преобладающий цвет будет выбран в качестве обложки альбома или исполнителя</string>
-    <string name="pref_summary_exclude_songs">Исключить песни короче 30-ти секунд</string>
     <string name="pref_summary_gapless_playback">"Может вызвать проблемы с воспроизведением на некоторых устройствах."</string>
     <string name="pref_summary_ignore_media_store_artwork">Может повысить качество обложки альбома, но приводит к более медленному времени загрузки изображения. Включите это только в том случае, если у вас проблемы с картинками с низким разрешением.</string>
-    <string name="pref_summary_language_en">Принудительно изменить язык приложения на английский</string>
-    <string name="pref_summary_library_categories">Задать видимость и чередовать категории библиотеки</string>
     <string name="pref_summary_lock_screen">Элементы управления на экране блокировки от Retro Music</string>
-    <string name="pref_summary_lock_screen_app">Показывать элементы управления из экрана блокировки</string>
     <string name="pref_summary_open_source_licences">Сведения о лицензии для ПО с открытым исходным кодом</string>
     <string name="pref_summary_round_corners">Скруглённые края для окна, обложки альбома и т.д.</string>
     <string name="pref_summary_tab_titles">Отображение названий вкладок в нижней части экрана</string>
-    <string name="pref_summary_toggle_bottom_bar_titles">Выключить названия из навигационной строки</string>
     <string name="pref_summary_toggle_full_screen">Режим погружения</string>
-    <string name="pref_summary_toggle_genre">Не хотите,чтобы показывался жанр? Скройте его</string>
     <string name="pref_summary_toggle_headset">Начать воспроизведение при подключении наушников</string>
-    <string name="pref_summary_toggle_navigation_bar">Скрыть только навигационную панель</string>
-    <string name="pref_summary_toggle_status_bar">Скрыть только статус-бар</string>
     <string name="pref_summary_toggle_volume">Показывает переключатели громкости если есть свободное место на экране воспроизведения</string>
     <string name="pref_title_album_art_on_lockscreen">Показать обложку альбома</string>
     <string name="pref_title_app_shortcuts">Цветные ярлыки</string>
@@ -275,30 +214,18 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="pref_title_classic_notification">Классический стиль уведомлений</string>
     <string name="pref_title_colored_app">Адаптивный цвет</string>
     <string name="pref_title_colored_notification">Цветное уведомление</string>
-    <string name="pref_title_day_dream">Грёзы</string>
-    <string name="pref_title_exclude_songs">Исключение песен</string>
-    <string name="pref_title_external_storage_access">Дать доступ к внешнему накопителю</string>
     <string name="pref_title_gapless_playback">Непрерывное воспроизведение</string>
     <string name="pref_title_general_theme">Основная тема</string>
-    <string name="pref_title_gradient_color">Выбрать цвет</string>
     <string name="pref_title_ignore_media_store_artwork">Игнорировать обложки из хранилища мультимедиа</string>
     <string name="pref_title_last_added_interval">Интервал последних добавленных треков</string>
     <string name="pref_title_lock_screen">Полноэкранный режим</string>
-    <string name="pref_title_lock_screen_app">Экран блокировки приложения</string>
-    <string name="pref_title_lyrics_options">Опции слов</string>
     <string name="pref_title_navigation_bar">Цветная панель навигации</string>
     <string name="pref_title_now_playing_screen_appearance">Внешний вид</string>
     <string name="pref_title_open_source_licences">Лицензии ПО с открытым исходным кодом</string>
     <string name="pref_title_round_corners">Скруглённые края</string>
-    <string name="pref_title_toggle_bottom_bar_titles">Отключить заголовки</string>
     <string name="pref_title_toggle_carousel_effect">Эффект карусели</string>
-    <string name="pref_title_toggle_circular_album_effect">Круглый альбом</string>
     <string name="pref_title_toggle_dominant_color">Преобладающий цвет</string>
     <string name="pref_title_toggle_full_screen">Полноэкранный режим</string>
-    <string name="pref_title_toggle_genre">Показать жанр</string>
-    <string name="pref_title_toggle_language_en">Английский язык</string>
-    <string name="pref_title_toggle_navigation_bar">Панель навигации</string>
-    <string name="pref_title_toggle_status_bar">Строка состояния</string>
     <string name="pref_title_toggle_tab_titles">Название вкладок</string>
     <string name="pref_title_toggle_toggle_headset">Автоматическое воспроизведение</string>
     <string name="pref_title_toggle_volume">Переключатели громкости</string>
@@ -307,10 +234,8 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="primary_color_desc">Основной цвет темы по умолчанию - сине-серый</string>
     <string name="purchase">Покупка</string>
     <string name="queue">Очередь</string>
-    <string name="queue_label">Очередь</string>
     <string name="rate_app">Оценить приложение</string>
     <string name="rate_on_google_play_summary">Если тебе понравилось приложение - дай нам знать об этом в Google Play, чтобы улучшить приложение.</string>
-    <string name="recent_activity">Недавняя активность</string>
     <string name="recent_albums">Последние альбомы</string>
     <string name="recent_artists">Последние исполнители</string>
     <string name="remove_action">Удалить</string>
@@ -320,112 +245,62 @@ https://play.google.com/store/apps/details?id=%s</string>
     <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_action">Переименовать</string>
     <string name="rename_playlist_title">Переименование плейлиста</string>
-    <string name="reset_action">Сбросить</string>
     <string name="reset_artist_image">Восстановить изображение исполнителя</string>
     <string name="restore">Восстановить</string>
     <string name="restored_previous_purchase_please_restart">Восстановлена предыдущая покупка. Пожалуйста перезапустите приложение для использование всех возможностей.</string>
     <string name="restored_previous_purchases">Восстановленные предыдущие покупки.</string>
     <string name="restoring_purchase">Восстановление покупки...</string>
-    <string name="retro">Retro</string>
     <string name="retro_equalizer">Retro - Эквалайзер</string>
-    <string name="saf_delete_failed">Не удалось удалить файл: %s</string>
     <!-- SAF -->
-    <string name="saf_error_uri">Не удается получить SAF URI</string>
-    <string name="saf_guide_slide1_description">Открыть навигационный ящик</string>
-    <string name="saf_guide_slide1_description_before_o">Включите \'Показать SD - карту\' в меню перезаполения</string>
     <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s нуждается в доступе к SD - карте</string>
-    <string name="saf_guide_slide2_description">Вам нужно выбрать Root - каталог вашей SD - карты</string>
-    <string name="saf_guide_slide2_title">Выберите свою SD - карту в навигационном ящике</string>
-    <string name="saf_guide_slide3_description">Не открывать любые подпапки</string>
-    <string name="saf_guide_slide3_title">Нажмите \'выбрать\' внизу экрана</string>
-    <string name="saf_pick_file">Доступ к файлу обязателен. Выберите %s</string>
-    <string name="saf_pick_sdcard">Доступ к SD - карте обязателен.  Пожалуйста,выберите Root - каталог SD - карты</string>
-    <string name="saf_write_failed">Запись файла не удалась: %s</string>
     <string name="save_playlist_title">Сохранить как файл</string>
     <string name="saved_playlist_to">Сохроненный плейлист в %s</string>
     <string name="saving_changes">Сохранение изменений</string>
-    <string name="saving_tags">Сохранение тегов</string>
-    <string name="saving_to_file">Сохранение в файл...</string>
     <string name="scanned_files">Отсканированные файлы %1$d из %2$d.</string>
     <string name="search_hint">Поиск в библиотеке</string>
-    <string name="see_all">Просмотреть все</string>
-    <string name="select_preset">Выбрать предустановки</string>
     <string name="set_artist_image">Установить изображение исполнителя</string>
     <string name="shuffle">Перемешать</string>
     <string name="simple">Простенькая</string>
     <string name="sleep_timer_canceled">Таймер отключения отменен</string>
     <string name="sleep_timer_set">Таймер сна установлен на %d минут.</string>
-    <string name="slide_unlock">Слайд вверх,чтобы разблокировать</string>
-    <string name="solid">Сплошной</string>
     <string name="song">Песня</string>
     <string name="song_duration">Длительность</string>
     <string name="songs">Песни</string>
     <string name="sort_order">Порядок сортировки</string>
     <string name="speech_not_supported">Простите, ваше устройство не поддерживает голосовой ввод</string>
     <string name="speech_prompt">Поиск в библиотеке</string>
-    <string name="suggestions">Предложения</string>
-    <string name="summary_material_design_city_wallpaper">Обои городов в стиле \"Material\" взяты с сайта www.techjuice.pk</string>
-    <string name="summary_material_design_icons">Все иконки использованы с сайта materialdesignicons.com</string>
     <string name="summary_user_info">Ваше имя будет отображаться на главном экране</string>
     <string name="support_development">Поддержка разработки</string>
-    <string name="support_development_summary">Если вам кайфово пользоваться Retro Music,то скиньте рубль в поддержку моей работы.</string>
     <!-- Message displayed when tag editing fails -->
-    <string name="tag_edit_error">Произошла ошибка при редактировании тегов</string>
-    <string name="tag_editor_check_permission">Проверяем начилие разрешений</string>
-    <string name="tag_editor_document_tree_message">Выберите каталог внешнего хранилища</string>
-    <string name="tag_editor_document_tree_permission_failed">Похоже,мы не получили разрешения на редактирование файлов. Дважды проверьте каталог в файловом менеджере.</string>
-    <string name="tag_error_kitkat">Произошла ошибка при редактировании тегов. Файл расположен в SD - карте? Если так,то Google сделал невозможным редактирование тегов для этого файла.</string>
-    <string name="tag_error_lollipop">Произошла ошибка при редактировании тегов. Если файл расположен в SD - карте,значит Retro Music не получил разрешения на доступ к ней.</string>
-    <string name="tag_retrieve_error">Произошла ошибка при извлечении тегов.</string>
-    <string name="text">Текст</string>
     <string name="thank_you">Спасибо!</string>
     <string name="the_audio_file">Аудио-файл</string>
     <string name="this_month">В этом месяце</string>
     <string name="this_week">На этой неделе</string>
     <string name="this_year">В этом году</string>
     <string name="tiny">Крохотная</string>
-    <string name="title">Название</string>
     <string name="title_dashboard">Доска инструментов</string>
-    <string name="title_desc">Название (по убыв.)</string>
     <string name="title_good_afternoon">Добрый день</string>
     <string name="title_good_day">Добрый день</string>
     <string name="title_good_evening">Добрый вечер</string>
     <string name="title_good_morning">Доброе утро</string>
     <string name="title_good_night">Доброй ночи</string>
-    <string name="title_home">Главная</string>
-    <string name="title_material_design_city_wallpaper">Обои городов</string>
-    <string name="title_material_design_icons">Иконки</string>
-    <string name="title_notifications">Уведомления</string>
     <string name="title_user_info">Как вас зовут?</string>
     <string name="today">Сегодня</string>
-    <string name="toggle_lyrics_size">Переключить размер текстов</string>
-    <string name="tool_tip_see_all">Просмотреть все песни</string>
     <string name="top_albums">Топ альбомы</string>
     <string name="top_artists">Топ исполнители</string>
-    <string name="top_tracks">Популярные треки</string>
-    <string name="top_tracks_label">Лучшие треки</string>
     <string name="track_hint">"Трек (2 для трека 2 или 3004 для CD3 трека 4)"</string>
     <string name="track_list">Номер трека</string>
     <string name="translate">Перевод</string>
-    <string name="translate_summary">Помогите перевести Retro Music на ваш родной язык.</string>
     <string name="unplayable_file">\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0441\u0442\u0438 \u044d\u0442\u0443 \u043f\u0435\u0441\u043d\u044e.</string>
     <string name="up_next">Следующий</string>
-    <string name="update">Обновить</string>
     <string name="update_image">Обновить изображение</string>
-    <string name="updated_artist_image">Изображение исполнителя обновлено</string>
     <string name="updating">Обновление...</string>
-    <string name="user_profile_summary">Изменить профиль и изображение баннера</string>
     <string name="version">Версия</string>
-    <string name="virtualizer_strength">Сила виртуализатора</string>
-    <string name="volume_control">Управление громкостью</string>
     <string name="web_search">Веб поиск</string>
     <string name="what_do_you_want_to_share">"Чем вы хотите поделиться? "</string>
     <string name="window">Окно</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">Вам следует выбрать как минимум одну категорию</string>
 </resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 6ab40d160..9f6620e37 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -17,13 +17,11 @@
     <string name="action_grant">.</string>
     <string name="action_grid_size">Velicina kartica</string>
     <string name="action_grid_size_land">.</string>
-    <string name="action_new_playlist">Nova plejlista</string>
     <string name="action_next">Sledece</string>
     <string name="action_play">Pusti</string>
     <string name="action_play_next">Pusti sledeće</string>
     <string name="action_play_pause">Pusti/pauziraj</string>
     <string name="action_previous">Prethodno</string>
-    <string name="action_re_download_artist_image">Izmeni sliku izvodjaca</string>
     <string name="action_remove_from_favorites">Izbrisi iz favorita</string>
     <string name="action_remove_from_playing_queue">Izbrisi iz trenutne plajliste za slusanje</string>
     <string name="action_remove_from_playlist">Obrisi sa plejliste</string>
@@ -36,10 +34,7 @@
     <string name="action_set_as_start_directory">Postavi kao pocetni direktorijum</string>
     <string name="action_settings">"Podesavanja"</string>
     <string name="action_share">Podeli</string>
-    <string name="action_show_lyrics">Prikazi tekst pesme</string>
-    <string name="action_shuffle_album">Nasumicno pusti album</string>
     <string name="action_shuffle_all">Nasumicno pusti</string>
-    <string name="action_shuffle_artist">Nasumicno pusti izvodjaca</string>
     <string name="action_shuffle_playlist">Nasumicno pusti plejlistu</string>
     <string name="action_sleep_timer">Tajmer za iskljucivanje</string>
     <string name="action_tag_editor">Uredjivac tagova</string>
@@ -50,26 +45,20 @@
     <string name="added_x_titles_to_playing_queue">Dodato %1$d pesama na plejlistu</string>
     <string name="album">Album</string>
     <string name="album_artist">Izvodjac albuma</string>
-    <string name="album_desc">Opis albuma</string>
     <string name="album_or_artist_empty">Naziv ili izvodjac su nepoznati</string>
     <string name="albums">Albumi</string>
     <string name="always">Uvek</string>
     <string name="app_share">Isprobaj ovaj fantastican plejer na: https://play.google.com/store/apps/details?id=%s</string>
     <string name="app_shortcut_shuffle_all_short">Reprodukuj nasumicno</string>
     <string name="app_shortcut_top_tracks_short">Najvise slusano</string>
-    <string name="app_summary">Hibridna aplikacija sa jednostavnim i iOS stilom</string>
     <string name="app_widget_big_name">Retro Music - Big</string>
-    <string name="app_widget_big_name_2">Retro music - Big2</string>
     <string name="app_widget_card_name">Retro music - Card</string>
     <string name="app_widget_classic_name">Retro music - Classic</string>
     <string name="app_widget_small_name">Retro Music - Small</string>
     <string name="artist">Izvodjac</string>
-    <string name="artist_desc">O izvodjacu</string>
     <string name="artists">Izvodjac</string>
     <string name="audio_focus_denied">Zvuk se vec reprodukuje</string>
-    <string name="bass_boost_strength">Pojacivac basa</string>
     <string name="biography">Biografija</string>
-    <string name="biography_unavailable">Nije moguce pronaci biografiju izvodjaca</string>
     <string name="black_theme_name">Perfektno crna</string>
     <string name="blacklist">Ne trazi muziku u...</string>
     <string name="cancel_current_timer">Otkazi trenutni tajmer</string>
@@ -79,7 +68,6 @@
     <string name="clear_blacklist">Ocisti listu za ignorisanje foldera</string>
     <string name="clear_playlist_title">Ocisti plejlistu</string>
     <string name="clear_playlist_x"><![CDATA[Ocisti plejlistu <b>%1$s</b>? Izmene se nece moci opozvati!]]></string>
-    <string name="colored_footers">Oboji kartice bojama</string>
     <string name="colors">Boje</string>
     <string name="could_not_create_playlist">Nemoguce je napraviti plejlistu</string>
     <string name="could_not_download_album_cover">"Nemoguce je preuzeti odgovarajucu pozadinu albuma"</string>
@@ -87,16 +75,11 @@
     <string name="create_action">Napravi</string>
     <string name="created_playlist_x">Plejlista %1$s je napravljena</string>
     <string name="currently_listening_to_x_by_x">Trenutno se reprodukuje %1$s izvodjaca %2$s</string>
-    <string name="custom">Prilagodjeno</string>
-    <string name="date">Datum</string>
     <string name="default_hint">Nema pronadjenih tekstova</string>
-    <string name="delete_action">Izbrisi</string>
     <string name="delete_playlist_title">Izbrisi plejlistu</string>
     <string name="delete_playlist_x"><![CDATA[Izbrisi <b>%1$s</b> plejlistu?]]></string>
     <string name="delete_playlists_title">Izbrisi plejlistu</string>
-    <string name="delete_song_title">Izbrisi numeru</string>
     <string name="delete_song_x"><![CDATA[Izbrisi <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Izbrisi numere</string>
     <string name="delete_x_playlists"><![CDATA[Izbrisi <b>%1$d</b> plejliste?]]></string>
     <string name="delete_x_songs"><![CDATA[Izbrisi <b>%1$d</b> numere?]]></string>
     <string name="deleted_x_songs">Izbrisi %1$d numere.</string>
@@ -105,11 +88,8 @@
     <string name="donate">Doniraj</string>
     <string name="donate_summary">Ako mislis da zasluzujem da budem placen za ovaj posao, mozes mi poslati par dolara</string>
     <string name="download_from_last_fm">Preuzmi sa Last.fm</string>
-    <string name="duration">Trajanje</string>
     <string name="empty">Nema pesama</string>
     <string name="equalizer">Ekvilajzer</string>
-    <string name="error_loading_lyrics_from_network">Nije moguce ucitati sa interneta</string>
-    <string name="failed_to_save_playlist">Nije moguce sacuvati (%s) plejlistu.</string>
     <string name="favorites">Favoriti</string>
     <string name="flat">Ravno</string>
     <string name="folders">Folderi</string>
@@ -125,15 +105,9 @@
     <string name="history">Istorija reprodukovanja</string>
     <string name="home">Pocetak</string>
     <string name="full">Ispunjen</string>
-    <string name="pref_title_day_dream">Sanjarenje</string>
-    <string name="pref_summary_day_dream">Prikazi informacije o pesmi kada je aktivno sanjarenje</string>
     <string name="inserted_x_songs_into_playlist_x">Ubaceno %1$d pesama u plejlistu %2$s.</string>
-    <string name="inspired_designs_by">Dizajn je inspirisan od strane</string>
-    <string name="join_community">Pridruzi se nasoj Google+ zajednici</string>
-    <string name="join_community_summary">Ako imas neka pitanja ili ti je potrebna pomoc, Retro Music zajednica na Google+ je pravo mesto za to</string>
     <string name="summary_user_info">Prikazuje tvoje ima na pocetnom ekranu</string>
     <string name="label_bit_rate">Bitrate</string>
-    <string name="label_details">Detalji</string>
     <string name="label_file_format">Formatiraj</string>
     <string name="label_file_name">Naziv datoteke</string>
     <string name="label_file_path">Lokacija datoteke</string>
@@ -146,12 +120,9 @@
     <string name="licenses">Licence</string>
     <string name="light_theme_name">Perfektno bela</string>
     <string name="listing_files">Pronalazenje pesama</string>
-    <string name="loading">Ucitavanje...</string>
     <string name="loading_products">Ucitavanje datoteka...</string>
     <string name="lyrics">Tekst pesme</string>
-    <string name="more">Jos</string>
     <string name="my_name">Moje ime je</string>
-    <string name="my_playlists">Moja plejlista</string>
     <string name="my_top_tracks">Najslusanije numere</string>
     <string name="never">Nikada</string>
     <string name="new_playlist_title">Nova plejlista</string>
@@ -160,7 +131,6 @@
     <string name="no_artists">Nema izvodjaca</string>
     <string name="no_audio_ID">"Prvo pusti pesmu, a onda pokusaj opet"</string>
     <string name="no_equalizer">Nije pronadjen ni jedan ekvilajzer</string>
-    <string name="no_files">Nema fajlova</string>
     <string name="no_lyrics_found">Nema pronadjenog teksta pesme</string>
     <string name="no_playlists">Nema plejliste</string>
     <string name="no_results">Nema rezultata</string>
@@ -177,7 +147,6 @@
     <string name="permission_external_storage_denied">Dozvola za pristup spoljasnjem skladistu je odbijena</string>
     <string name="permissions_denied">Dozvola odbijena.</string>
     <string name="pick_from_local_storage">Izaberi iz unutrasnjeg skladista</string>
-    <string name="play">Pusti</string>
     <string name="playing_notification_description">Obavestenja obezbedjuju komande za pustanje/pauziranje itd.</string>
     <string name="playing_notification_name">Obavestenja o reprodukciji</string>
     <string name="playlist_empty_text">Isprazni plejlistu</string>
@@ -187,11 +156,8 @@
     <string name="pref_header_audio">Zvuk</string>
     <string name="pref_header_images">Slike</string>
     <string name="pref_header_lockscreen">Zakljucan ekran</string>
-    <string name="pref_header_now_playing_screen">Trenutno se pusta</string>
     <string name="pref_header_playlists">Plejliste</string>
     <string name="pref_only_lollipop">"Dostupno samo na Android Lollipop-u"</string>
-    <string name="pref_only_nougat_mr1">"Dostupno samo na Android Nougat-u (verzije 7.1.)"</string>
-    <string name="pref_summary_about">Ljudi koji su mi pomogli oko ovog projekta</string>
     <string name="pref_summary_album_art_on_lockscreen">Koristi omot albuma kao pozadinu kada se reprodukuje muzika</string>
     <string name="pref_summary_audio_ducking">Obavestenja, navigacija itd.</string>
     <string name="pref_summary_blurred_album_art">Zamuti omot albuma na zakljucanom ekranu. (moze izazvati probleme sa drugim aplikacijama i vidzetima)</string>
@@ -200,13 +166,10 @@
     <string name="pref_summary_colored_app_shortcuts">Oboj precice aplikacije u akcentovanu boju. Svaki puta kada promenis boju molim te omoguci ovo opet kako bi imalo efekta</string>
     <string name="pref_summary_colored_navigation_bar">Oboj navigacijski bar u primarnu boju</string>
     <string name="pref_summary_colored_notification">"Oboj obavestenja u boju omota albuma"</string>
-    <string name="pref_summary_exclude_songs">Zanemari datoteke krace od 30 sekundi</string>
     <string name="pref_summary_gapless_playback">"Moze prouzrokovati probleme na pojedinim uredjajima."</string>
     <string name="pref_summary_ignore_media_store_artwork">oze poboljsati kvalitet omota albuma ali uzrokuje njegovo sporije ucitavanje. Omoguci ovo samo ukoliko imas problema sa losim kvalitetom slike omota albuma.</string>
-    <string name="pref_summary_lock_screen_app">Prikazi kontrole na zakljucanom ekranu</string>
     <string name="pref_summary_open_source_licences">Detalji o licencama za softver otvorenog izvora</string>
     <string name="pref_summary_round_corners">Zaobl ivice ekrana, omota albuma itd.</string>
-    <string name="pref_summary_toggle_bottom_bar_titles">Onemoguci kartice sa donjeg navigacionog bara.</string>
     <string name="pref_summary_toggle_full_screen">Omoguci ovo za impresivan mod.</string>
     <string name="pref_summary_toggle_volume">Ukoliko imas prostora na ekranu za pustanje omoguci kontroler jacine zvuka.</string>
     <string name="pref_title_album_art_on_lockscreen">Prikazi omot albuma</string>
@@ -218,19 +181,15 @@
     <string name="pref_title_colored_app">Prilagodive boje</string>
     <string name="dark_theme_name">Kao tamno</string>
     <string name="pref_title_colored_notification">Obojena obavestenja</string>
-    <string name="pref_title_exclude_songs">Zanemari pesme</string>
     <string name="pref_title_gapless_playback">Neuznemiravano reprodukovanje</string>
     <string name="pref_title_general_theme">Opsta tema</string>
-    <string name="pref_title_gradient_color">Izaberi boju</string>
     <string name="pref_title_ignore_media_store_artwork">Ignorisi omote sa prodavnice</string>
     <string name="pref_title_last_added_interval">Interval plejliste poslednje dodato</string>
     <string name="pref_title_lock_screen">Kontrole preko celog ekrana</string>
-    <string name="pref_title_lock_screen_app">Retro zakljucani ekran</string>
     <string name="pref_title_navigation_bar">Obojeni navigacioni bar</string>
     <string name="pref_title_now_playing_screen_appearance">Izgled</string>
     <string name="pref_title_open_source_licences">Otvoren izvor licenca</string>
     <string name="pref_title_round_corners">Zaobli ivice</string>
-    <string name="pref_title_toggle_bottom_bar_titles">Onemoguci kartice</string>
     <string name="pref_title_toggle_full_screen">Aplikacija preko celog ekrana</string>
     <string name="pref_title_toggle_volume">Kontroler jacine zvuka</string>
     <string name="pref_title_user_info">Podaci o korisniku</string>
@@ -238,7 +197,6 @@
     <string name="queue">Trenutno</string>
     <string name="rate_app">Oceni aplikaciju</string>
     <string name="rate_on_google_play_summary">Volis ovu aplikaciju? Obavesti nas u Google Play Prodavnici</string>
-    <string name="recent_activity">Skorasnje aktivnosti</string>
     <string name="remove_action">Izbrisi</string>
     <string name="remove_cover">Izbrisi omot albuma</string>
     <string name="remove_from_blacklist">Izbrisi sa liste za ignorisanje foldera</string>
@@ -246,18 +204,14 @@
     <string name="remove_song_x_from_playlist"><![CDATA[Obrisi <b>%1$s</b> sa plejliste?]]></string>
     <string name="remove_songs_from_playlist_title">Izbrisi pesme sa plejliste</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[Izbrisi <b>%1$d</b> pesama sa plejliste?]]></string>
-    <string name="rename_action">Promeni naziv</string>
     <string name="rename_playlist_title">Promeni ime plejliste</string>
     <string name="restored_previous_purchases">Obnovljene su prethodne kupovine</string>
-    <string name="retro">Retro</string>
     <string name="retro_equalizer">Retro ekvalajzer</string>
     <string name="save_playlist_title">Sacuvaj kao fajl</string>
     <string name="saved_playlist_to">Plej lista sacuvana u %s.</string>
     <string name="saving_changes">Cuvanje izmena</string>
-    <string name="saving_to_file">Cuvanje fajla...</string>
     <string name="scanned_files">Skenirano %1$d od %2$d fajlova</string>
     <string name="search_hint">Pretrazi svoju biblioteku...</string>
-    <string name="select_preset">Selektuj</string>
     <string name="shuffle">Nasumicno pusti</string>
     <string name="sleep_timer_canceled">Tajmer za iskljucivanje je otkazan</string>
     <string name="sleep_timer_set">Tajmer za iskljucivanje je podesen za %d od sad.</string>
@@ -267,36 +221,22 @@
     <string name="sort_order">Nacin sortiranja</string>
     <string name="speech_not_supported">Izvini! Tvoj uredjaj ne podrzava unos govorom</string>
     <string name="speech_prompt">Pretrazi svoju biblioteku</string>
-    <string name="summary_material_design_city_wallpaper">Slike gradova preuzete sa www.techjuice.pk website</string>
-    <string name="summary_material_design_icons">Sve ikone koriscene na ovom sajtu su sa www.flaticon.com or www.materialdesignicons.com</string>
     <string name="support_development">Podrzi programera</string>
     <string name="thank_you">Hvala!</string>
     <string name="the_audio_file">Audio fajl</string>
     <string name="this_month">Ovog meseca</string>
     <string name="this_week">Ove nedelje</string>
     <string name="this_year">Ove godine</string>
-    <string name="title">Naziv</string>
     <string name="title_dashboard">Komandna tabla</string>
-    <string name="title_desc">Opis naziva</string>
-    <string name="title_home">Pocetak</string>
-    <string name="title_material_design_city_wallpaper">Slika grada</string>
-    <string name="title_material_design_icons">Ikone</string>
-    <string name="title_notifications">Obavestenja</string>
     <string name="today">Danas</string>
-    <string name="top_tracks">Najcesce slusano</string>
     <string name="track_hint">"Redni broj (2 za redni broj 2 ili 3004 za CD3 redni broj 4)"</string>
     <string name="track_list">Redni broj</string>
     <string name="translate">Prevod</string>
-    <string name="translate_summary">Pomozi da prevedemo aplikaciju na tvoj jezik!</string>
     <string name="unplayable_file">Nije moguce pustiti pesmu.</string>
     <string name="up_next">Sledece</string>
-    <string name="update">Azuriraj</string>
     <string name="update_image">Azuriraj sliku</string>
-    <string name="updated_artist_image">Slika izvodjaca azurirana</string>
     <string name="updating">Azurira se...</string>
     <string name="version">Verzija</string>
-    <string name="virtualizer_strength">Jacina virtualizer-a</string>
-    <string name="volume_control">Jacina zvuka</string>
     <string name="web_search">Web pretraga</string>
     <string name="what_do_you_want_to_share">Sta zelis da podelis?</string>
     <string name="title_user_info">Kako se zoves?</string>
@@ -305,33 +245,22 @@
     <string name="year">Godina</string>
     <string name="reset_artist_image">Resetuj sliku izvodjaca</string>
     <string name="set_artist_image">Postavi sliku izvodjaca</string>
-    <string name="edit">Izmeni</string>
     <string name="donation_header">Kupi mi</string>
     <string name="plain">Jednostavan</string>
-    <string name="tool_tip_see_all">Pogledaj sve pesme</string>
-    <string name="toggle_lyrics_size">Promeni velicinu slova teksta</string>
     <string name="title_good_night">Laku noc</string>
     <string name="title_good_evening">Dobro vece</string>
     <string name="title_good_afternoon">Dobar dan</string>
     <string name="title_good_morning">Dobro jutro</string>
     <string name="title_good_day">Dobar dan</string>
-    <string name="language_contributors">Prevodioci</string>
     <string name="simple">Jednostavan</string>
     <string name="pref_summary_toggle_headset">Kada se prikljuce slusalice automatki pusti pesme</string>
     <string name="pref_title_toggle_toggle_headset">Automatsko reprodukovanje</string>
     <string name="pref_summary_tab_titles">Omoguci/ iskljuci nazive kartica</string>
     <string name="pref_title_toggle_tab_titles">Nazivi kartica</string>
-    <string name="pref_summary_language_en">Promeni jezik u Engleski (ovo je testiranje za visejezicnu opciju)</string>
-    <string name="pref_title_toggle_language_en">Engleski jezik</string>
-    <string name="see_all">Vidi sve</string>
     <string name="for_you">Za tebe</string>
-    <string name="play_all">Pusti sve</string>
     <string name="normal">Normalno</string>
-    <string name="experimental">Eksperimentalno</string>
     <string name="pref_summary_lock_screen">Prikazuj kontrole na zakljucanom ekranu</string>
-    <string name="slide_unlock">Prevuci da otkljucas</string>
     <string name="primary_color_desc">Primarna boja, podrazumevna je bela</string>
-    <string name="media_route_menu_title">pusti na drugom uredjaju</string>
     <string name="tiny">Sitno</string>
     <!-- SAF -->
     <!-- SAF guide -->
diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
index 5a23938ed..507db6dc2 100644
--- a/app/src/main/res/values-sw600dp-land/dimens.xml
+++ b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="header_image_height">420dp</dimen>
     <dimen name="horizontal_margin">128dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index 7eb140f2e..4d9eb74eb 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="header_image_height">600dp</dimen>
-</resources>
+    <dimen name="bottom_sheet_width">600dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 92bc26ca9..6b3cbef1d 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -17,13 +17,11 @@
     <string name="action_grant">İzin Ver</string>
     <string name="action_grid_size">Izgara boyutu</string>
     <string name="action_grid_size_land">Izgara boyutu (yatay)</string>
-    <string name="action_new_playlist">Yeni Çalma listesi</string>
     <string name="action_next">Sonraki</string>
     <string name="action_play">Oynat</string>
     <string name="action_play_next">Bundan sonra oynat</string>
     <string name="action_play_pause">Oynat/Duraklat</string>
     <string name="action_previous">Önceki</string>
-    <string name="action_re_download_artist_image">Sanatçı resmi güncelle</string>
     <string name="action_remove_from_favorites">Favorilerden kaldır</string>
     <string name="action_remove_from_playing_queue">Oynatma kuyruğundan kaldır</string>
     <string name="action_remove_from_playlist">Çalma listesinden kaldır</string>
@@ -36,14 +34,10 @@
     <string name="action_set_as_start_directory">Başlangıç dizini olarak ayarla</string>
     <string name="action_settings">"Ayarlar"</string>
     <string name="action_share">Paylaş</string>
-    <string name="action_show_lyrics">Şarkı sözlerini göster</string>
-    <string name="action_shuffle_album">Albümü karıştır</string>
     <string name="action_shuffle_all">Tümünü karıştır</string>
-    <string name="action_shuffle_artist">Sanatçının şarkılarını karıştır</string>
     <string name="action_shuffle_playlist">Çalma listesini karıştır</string>
     <string name="action_sleep_timer">Uyku zamanlayıcısı</string>
     <string name="action_tag_editor">Etiket düzenleyicisi</string>
-    <string name="action_toggle_shuffle">Karıştırma modunu aç/kapat</string>
     <string name="add_action">Ekle</string>
     <string name="add_photo">Fotoğraf \nekle</string>
     <string name="add_playlist_title">"Çalma listesine ekle"</string>
@@ -51,11 +45,9 @@
     <string name="added_x_titles_to_playing_queue">%1$d şarkı oynatma kuyruğuna eklendi.</string>
     <string name="album">Albüm</string>
     <string name="album_artist">Albüm sanatçısı</string>
-    <string name="album_desc">Haygayssd</string>
     <string name="album_or_artist_empty">Başlık veya sanatçı boş.</string>
     <string name="albums">Albümler</string>
     <!-- Android Auto -->
-    <string name="albums_label">Albümler</string>
     <string name="always">Her zaman</string>
     <string name="app_share">Hey şu harika müzik çalara göz at: https://play.google.com/store/apps/details?id=%s</string>
     <!-- App Shortcuts -->
@@ -65,22 +57,15 @@
     <string name="app_shortcut_shuffle_all_short">Karıştır</string>
     <string name="app_shortcut_top_tracks_long">@string/my_top_tracks</string>
     <string name="app_shortcut_top_tracks_short">En İyi Parçalar</string>
-    <string name="app_summary">Materyal tasarım ve iOS\'un Karışımı bir uygulama.</string>
     <string name="app_widget_big_name">Retro music - Büyük</string>
-    <string name="app_widget_big_name_2">Retro music - Büyük 2</string>
     <string name="app_widget_card_name">Retro music - Kart</string>
     <string name="app_widget_classic_name">Retro music - Klasik</string>
     <string name="app_widget_small_name">Retro music - Küçük</string>
     <string name="artist">Sanatçı</string>
-    <string name="artist_desc">Sanatçı (Z-A)</string>
     <string name="artists">Sanatçılar</string>
-    <string name="artists_label">Sanatçılar</string>
-    <string name="at_least_one_category_must_be_enabled">En az bir kategori etkinleştirilmelidir.</string>
     <string name="audio_focus_denied">Ses odaklaması reddedildi.</string>
     <string name="audio_settings_summary">Ses ayarlarını ve ekolayzır kontrollerini ayarlayın</string>
-    <string name="bass_boost_strength">Bas Yükseltme Gücü</string>
     <string name="biography">Biyografi</string>
-    <string name="biography_unavailable">Sanat\u00e7\u0131n\u0131n biyografisi bulunamad\u0131.</string>
     <string name="black_theme_name">Siyah</string>
     <string name="blacklist">Kara liste</string>
     <string name="blur">Bulanık</string>
@@ -96,7 +81,6 @@
     <string name="clear_playlist_x"><![CDATA[<b>%1$s</b> adl\u0131 \u00e7alma listesi temizlensin mi? Bu geri al\u0131namaz!]]></string>
     <string name="color">Renkli</string>
     <string name="color_theme_name">Renkli</string>
-    <string name="colored_footers">Renkli altbilgiler</string>
     <string name="colors">Renkler</string>
     <string name="could_not_create_playlist">\u00c7alma listesi olu\u015fturulamad\u0131.</string>
     <string name="could_not_download_album_cover">"E\u015fle\u015fen bir alb\u00fcm kapa\u011f\u0131 indirilemedi."</string>
@@ -105,36 +89,23 @@
     <string name="create_action">Oluştur</string>
     <string name="created_playlist_x">%1$s adlı çalma listesi oluşturuldu.</string>
     <string name="currently_listening_to_x_by_x">Şu anda %2$s - %1$s dinliyorum.</string>
-    <string name="custom">Özel</string>
     <string name="dark_theme_name">Koyu</string>
-    <string name="date">Tarih</string>
     <string name="default_hint">Şarkı Sözleri Yok</string>
-    <string name="delete_action">Sil</string>
     <string name="delete_playlist_title">Çalma listesini sil</string>
     <string name="delete_playlist_x"><![CDATA[<b>%1$s</b> adlı çalma listesi silinsin mi?]]></string>
     <string name="delete_playlists_title">Çalma listelerini sil</string>
-    <string name="delete_song_title">Şarkıyı sil</string>
     <string name="delete_song_x"><![CDATA[<b>%1$s</b> şarkısı silinsin mi?]]></string>
-    <string name="delete_songs_title">Şarkıları sil</string>
     <string name="delete_x_playlists"><![CDATA[<b>%1$d</b> çalma listesi silinsin mi?]]></string>
     <string name="delete_x_songs"><![CDATA[<b>%1$d</b> şarkı silinsin mi?]]></string>
     <string name="deleted_x_songs">%1$d şarkı silindi.</string>
-    <string name="deleting_songs">Şarkılar siliniyor</string>
     <string name="do_you_want_to_clear_the_blacklist">Kara listeyi temizlemek istiyor musunuz?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[<b>%1$s</b> klasörünü kara listeden kaldırmak istiyor musunuz?]]></string>
     <string name="donate">Bağış Yap</string>
     <string name="donate_summary">Çalışmalarım için bir ödül hak ettiğimi düşünüyorsanız, bana buradan biraz para gönderebilirsiniz.</string>
     <string name="donation_header">Bana bir şeyler alın</string>
     <string name="download_from_last_fm">Last.fm\'den indir</string>
-    <string name="duration">Süre</string>
-    <string name="edit">Düzenle</string>
-    <string name="edit_categories">Kategorileri düzenle</string>
-    <string name="edit_tags">Etiketleri düzenle</string>
     <string name="empty">Boş</string>
     <string name="equalizer">Ekolayzır</string>
-    <string name="error_loading_lyrics_from_network">Ağdan yüklenirken hata oluştu</string>
-    <string name="experimental">Deneysel</string>
-    <string name="failed_to_save_playlist">Çalma listesi kaydedilemedi (%s).</string>
     <string name="favorites">Favoriler</string>
     <string name="flat">Düz</string>
     <string name="folders">Klasörler</string>
@@ -153,36 +124,24 @@
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
     <string name="history">Geçmiş</string>
-    <string name="history_label">Geçmiş</string>
-    <string name="holiday">Yılbaşı</string>
     <string name="home">Ana Sayfa</string>
     <string name="inserted_x_songs_into_playlist_x">%1$d şarkı %2$s çalma listesine eklendi.</string>
-    <string name="inspired_designs_by">Tasarımlarından esinlendiklerim</string>
-    <string name="join_community">Google+ topluluğuna katıl</string>
-    <string name="join_community_summary">Yardıma ihtiyacınız veya sorularınız varsa, Google+\'daki Retro Music topluluğunu ziyaret edebilirsiniz.</string>
     <string name="label_bit_rate">Bit hızı</string>
-    <string name="label_details">Ayrıntılar</string>
     <string name="label_file_format">Biçim</string>
     <string name="label_file_name">Dosya adı</string>
     <string name="label_file_path">Dosya yolu</string>
     <string name="label_file_size">Boyut</string>
     <string name="label_sampling_rate">Örnekleme hızı</string>
     <string name="label_track_length">Uzunluk</string>
-    <string name="language_contributors">Çevirmenler</string>
     <string name="last_added">Son eklenen</string>
     <string name="lets_play_something">Haydi bir şeyler çalalım</string>
     <string name="library">Kütüphane</string>
-    <string name="library_categories">Kütüphane kategorileri</string>
     <string name="licenses">Lisanslar</string>
     <string name="light_theme_name">Beyaz</string>
     <string name="listing_files">Dosyalar listeleniyor</string>
-    <string name="loading">Yükleniyor...</string>
     <string name="loading_products">Ürünler yükleniyor…</string>
     <string name="lyrics">Şarkı Sözleri</string>
-    <string name="media_route_menu_title">Aktarım cihazı</string>
-    <string name="more">Daha Fazla</string>
     <string name="my_name">Adım</string>
-    <string name="my_playlists">Çalma listem</string>
     <string name="my_top_tracks">En iyi parçalarım</string>
     <string name="never">Asla</string>
     <string name="new_playlist_title">Yeni çalma listesi</string>
@@ -191,7 +150,6 @@
     <string name="no_artists">Sanatçı yok</string>
     <string name="no_audio_ID">"Önce bir şarkı oynatın, ardından tekrar deneyin."</string>
     <string name="no_equalizer">Ekolayzır bulunamadı.</string>
-    <string name="no_files">Dosya yok</string>
     <string name="no_genres">Tarz yok</string>
     <string name="no_lyrics_found">Şarkı sözleri bulunamadı</string>
     <string name="no_playlists">Çalma listesi yok</string>
@@ -216,51 +174,35 @@
     <string name="personalize_settings_summary">Şimdi oynatılıyoru ve kullanıcı arayüzünüzünü özelleştirin</string>
     <string name="pick_from_local_storage">Yerel depolama alanından seç</string>
     <string name="plain">Sade</string>
-    <string name="play">Oynat</string>
-    <string name="play_all">Tümünü oynat</string>
     <string name="playing_notification_description">Oynatma bildirimi, oynat/duraklat vb. işlemleri yapmayı sağlar.</string>
     <string name="playing_notification_name">Oynatma bildirimi</string>
     <string name="playlist_empty_text">Çalma listesi boş</string>
     <string name="playlist_is_empty">Çalma listesi boş</string>
     <string name="playlist_name_empty">Çalma listesi adı</string>
     <string name="playlists">Çalma listeleri</string>
-    <string name="playlists_label">Çalma listeleri</string>
     <string name="pref_header_audio">Ses</string>
     <string name="pref_header_general">Genel</string>
     <string name="pref_header_images">Resimler</string>
     <string name="pref_header_lockscreen">Kilit ekranı</string>
-    <string name="pref_header_now_playing_screen">Şimdi oynatılıyor</string>
     <string name="pref_header_playlists">Çalma listeleri</string>
     <string name="pref_only_lollipop">"Sadece Lollipop'ta kullanılabilir."</string>
-    <string name="pref_only_nougat_mr1">"Sadece Nougat 7.1'de kullanılabilir."</string>
-    <string name="pref_summary_about">Projeye yardım eden insanlar</string>
     <string name="pref_summary_album_art_on_lockscreen">Geçerli şarkının albüm kapağını kilit ekranı duvar kağıdı olarak kullanır.</string>
     <string name="pref_summary_audio_ducking">Bildirimler, gezinme vb.</string>
     <string name="pref_summary_blurred_album_art">Kilit ekranındaki albüm kapağını bulanıklaştırır. Üçüncü taraf uygulamalar ve witget\'lar ile ilgili sorunlara neden olabilir.</string>
-    <string name="pref_summary_circular_album_effect">Şimdi oynatılıyor ekran temasında dairesel albüm kapağını gösterin. Tüm temalarda çalışmaz.</string>
     <string name="pref_summary_classic_notification">Klasik bildirim tasarımını kullanın.</string>
     <string name="pref_summary_colored_app">Arka plan, Kontrol düğmesi rengini, albüm resmine göre otomatik olarak değişir</string>
     <string name="pref_summary_colored_app_shortcuts">Uygulama kısayollarını vurgu renginde renklendirir. Vurgu rengini her değiştirdiğinizde bunun etkili olması için bu seçeneği kapatıp açın</string>
     <string name="pref_summary_colored_navigation_bar">Gezinme çubuğunu ana renkte renklendirir.</string>
     <string name="pref_summary_colored_notification">"Alb\u00fcm kapa\u011f\u0131n\u0131n canl\u0131 renkleriyle bildirimi renklendirir."</string>
-    <string name="pref_summary_day_dream">Müzik çalınırken  şarkı ayrıntılarını gösterir</string>
     <string name="pref_summary_dominant_color">En baskın renk, albüm veya sanatçı kapağından seçilecektir.</string>
-    <string name="pref_summary_exclude_songs">30 saniyeden kısa şarkıları hariç tut.</string>
     <string name="pref_summary_gapless_playback">"Bazı cihazlarda oynatma sorunlarına neden olabilir."</string>
     <string name="pref_summary_ignore_media_store_artwork">Albüm kapağı kalitesini artırabilir, ancak resim yükleme sürelerinin yavaşlamasına neden olabilir. Düşük çözünürlüklü resimlerle ilgili sorunlarınız varsa o zaman bunu etkinleştirin.</string>
-    <string name="pref_summary_language_en">Uygulama dilini zorla ingilizce olarak değiştirin (çoklu dil seçeneği test ediliyor)</string>
-    <string name="pref_summary_library_categories">Kütüphane kategorilerinin görünürlüğünü ve sırasını yapılandırın.</string>
     <string name="pref_summary_lock_screen">Retro music için kilit ekranı kontrolleri</string>
-    <string name="pref_summary_lock_screen_app">Kilit ekranında tam ekran kontrollerini gösterin</string>
     <string name="pref_summary_open_source_licences">Açık kaynaklı yazılımlar için lisans ayrıntıları</string>
     <string name="pref_summary_round_corners">Pencere, albüm resmi vs. için köşe kenarları.</string>
     <string name="pref_summary_tab_titles">Alt sekme başlıklarını etkinleştirin/devre dışı bırakın.</string>
-    <string name="pref_summary_toggle_bottom_bar_titles">Alt gezinme çubuğundaki sekme adlarını devre dışı bırakın</string>
     <string name="pref_summary_toggle_full_screen">Sürükleyici mod</string>
-    <string name="pref_summary_toggle_genre">Sekmelerin altında tarz sekmesini gösterin</string>
     <string name="pref_summary_toggle_headset">Kulaklık takıldığında hemen müziği çalmayı başlatın.</string>
-    <string name="pref_summary_toggle_navigation_bar">Sadece gezinme çubuğunu gizle</string>
-    <string name="pref_summary_toggle_status_bar">Sadece durum çubuğunu gizle</string>
     <string name="pref_summary_toggle_volume">Şimdi oynatılıyor ekranında boş yer varsa ses kontrollerini etkinleştirin</string>
     <string name="pref_title_album_art_on_lockscreen">Albüm kapağını göster</string>
     <string name="pref_title_app_shortcuts">Renkli uygulama kısayolları</string>
@@ -270,29 +212,17 @@
     <string name="pref_title_classic_notification">Klasik bildirim tasarımı</string>
     <string name="pref_title_colored_app">Uyarlanabilir renk</string>
     <string name="pref_title_colored_notification">Renkli bildirim</string>
-    <string name="pref_title_day_dream">Gündüz hayali</string>
-    <string name="pref_title_exclude_songs">Dışlanan şarkılar</string>
-    <string name="pref_title_external_storage_access">Harici depolama alanına erişim izni verin</string>
     <string name="pref_title_gapless_playback">Aralıksız oynatma</string>
     <string name="pref_title_general_theme">Genel tema</string>
-    <string name="pref_title_gradient_color">Renk seç</string>
     <string name="pref_title_ignore_media_store_artwork">Medya Depolama kapaklarını yoksay</string>
     <string name="pref_title_last_added_interval">Son eklenen çalma listesi zaman aralığı</string>
     <string name="pref_title_lock_screen">Tam ekran kontrolleri</string>
-    <string name="pref_title_lock_screen_app">Retro kilit ekranı</string>
-    <string name="pref_title_lyrics_options">Şarkı sözü seçenekleri</string>
     <string name="pref_title_navigation_bar">Renkli gezinme çubuğu</string>
     <string name="pref_title_now_playing_screen_appearance">Görünüm</string>
     <string name="pref_title_open_source_licences">Açık kaynak lisansları</string>
     <string name="pref_title_round_corners">Köşe kenarları</string>
-    <string name="pref_title_toggle_bottom_bar_titles">Başlıkları devre dışı bırak</string>
-    <string name="pref_title_toggle_circular_album_effect">Dairesel albüm</string>
     <string name="pref_title_toggle_dominant_color">Baskın renk</string>
     <string name="pref_title_toggle_full_screen">Tam ekran uygulama</string>
-    <string name="pref_title_toggle_genre">Tarzı göster</string>
-    <string name="pref_title_toggle_language_en">İngilizce dil</string>
-    <string name="pref_title_toggle_navigation_bar">Gezinme çubuğu</string>
-    <string name="pref_title_toggle_status_bar">Durum çubuğu</string>
     <string name="pref_title_toggle_tab_titles">Sekme adları</string>
     <string name="pref_title_toggle_toggle_headset">Otomatik oynatma</string>
     <string name="pref_title_toggle_volume">Ses kontrolleri</string>
@@ -301,10 +231,8 @@
     <string name="primary_color_desc">Ana tema rengi, varsayılan olarak mavi gridir.</string>
     <string name="purchase">Satın Al</string>
     <string name="queue">Kuyruk</string>
-    <string name="queue_label">Kuyruk</string>
     <string name="rate_app">Uygulamayı değerlendir</string>
     <string name="rate_on_google_play_summary">Bu uygulamayı sevdiniz mi? Daha iyi bir deneyim sağlamak için Google Play Store\'da bizi değerlendirin</string>
-    <string name="recent_activity">Son etkinlikler</string>
     <string name="recent_albums">Son albümler</string>
     <string name="recent_artists">Son sanatçılar</string>
     <string name="remove_action">Kaldır</string>
@@ -314,111 +242,62 @@
     <string name="remove_song_x_from_playlist"><![CDATA[<b>%1$s</b> şarkısı çalma listesinden kaldırılsın mı?]]></string>
     <string name="remove_songs_from_playlist_title">Şarkıları çalma listesinden kaldır</string>
     <string name="remove_x_songs_from_playlist"><![CDATA[<b>%1$d</b> şarkı çalma listesinden kaldırılsın mı?]]></string>
-    <string name="rename_action">Yeniden adlandır</string>
     <string name="rename_playlist_title">Çalma listesini yeniden adlandır</string>
-    <string name="reset_action">Sıfırla</string>
     <string name="reset_artist_image">Sanatçı resmini sıfırla</string>
     <string name="restore">Geri Yükle</string>
     <string name="restored_previous_purchase_please_restart">Önceki satın alma geri yüklendi. Lütfen tüm özellikleri kullanmak için uygulamayı yeniden başlatın.</string>
     <string name="restored_previous_purchases">Önceki satın alımları geri yükledi.</string>
     <string name="restoring_purchase">Satın alma geri yükleniyor…</string>
-    <string name="retro">Retro</string>
     <string name="retro_equalizer">Retro Ekolayzır</string>
-    <string name="saf_delete_failed">Dosya silinemedi: %s</string>
     <!-- SAF -->
-    <string name="saf_error_uri">SAF URI\'si alınamadı</string>
-    <string name="saf_guide_slide1_description">Gezinme çekmecesini aç</string>
-    <string name="saf_guide_slide1_description_before_o">Menüden \'SD kartı göster\'i etkinleştirin</string>
     <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s için SD kart erişim izni gerekiyor</string>
-    <string name="saf_guide_slide2_description">SD kartınızın kök dizinini seçmeniz gerekiyor</string>
-    <string name="saf_guide_slide2_title">SD kartınızı gezinme çekmecesinden seçin</string>
-    <string name="saf_guide_slide3_description">Herhangi bir alt klasörü açmayın</string>
-    <string name="saf_guide_slide3_title">Ekranın altındaki \'seç\' düğmesine dokunun</string>
-    <string name="saf_pick_file">Dosya erişimi gerekli. %s seçin</string>
-    <string name="saf_pick_sdcard">SD kart erişimi gerekiyor. Lütfen SD kartın kök dizinini seçin</string>
-    <string name="saf_write_failed">Dosya yazılamadı: %s</string>
     <string name="save_playlist_title">Dosya olarak kaydet</string>
     <string name="saved_playlist_to">Çalma listesi %s klasörüne kaydedildi.</string>
     <string name="saving_changes">Değişiklikler kaydediliyor</string>
-    <string name="saving_tags">Etiketler kaydediliyor</string>
-    <string name="saving_to_file">Dosyaya kaydediliyor…</string>
     <string name="scanned_files">%1$d / %2$d dosya tarandı.</string>
     <string name="search_hint">Kütüphanenizde arayın…</string>
-    <string name="see_all">Tümünü gör</string>
-    <string name="select_preset">Ön Ayar Seç</string>
     <string name="set_artist_image">Sanatçı resmi ayarla</string>
     <string name="shuffle">Karıştır</string>
     <string name="simple">Basit</string>
     <string name="sleep_timer_canceled">Uyku zamanlayıcısı iptal edildi.</string>
     <string name="sleep_timer_set">Uyku zamanlayıcısı bundan %d dakika sonrasına ayarlandı.</string>
-    <string name="slide_unlock">Kilidi açmak için kaydırın</string>
     <string name="song">Şarkı</string>
     <string name="song_duration">Şarkı süresi</string>
     <string name="songs">Şarkı</string>
     <string name="sort_order">Sırala</string>
     <string name="speech_not_supported">Üzgünüz! Cihazınız ses girişini desteklemiyor</string>
     <string name="speech_prompt">Kütüphanenizde arayın</string>
-    <string name="suggestions">Öneriler</string>
-    <string name="summary_material_design_city_wallpaper">Materyal tasarım şehir duvar kağıtları www.techjuice.pk sitesinden alınmıştır</string>
-    <string name="summary_material_design_icons">Uygulamada kullandığımız tüm simgeler www.flaticon.com ve www.materialdesignicons.com sitelerinden alınmıştır</string>
     <string name="summary_user_info">Ana ekranda adınızı gösterin</string>
     <string name="support_development">Geliştirmeyi Destekle</string>
-    <string name="support_development_summary">Retro Music Player\'ı kullanmaktan hoşlanıyorsanız, beni desteklemek için lütfen bağış yapın.</string>
     <!-- Message displayed when tag editing fails -->
-    <string name="tag_edit_error">Etiketler düzenlenirken bir hata oluştu.</string>
-    <string name="tag_editor_check_permission">İzinler kontrol ediliyor</string>
-    <string name="tag_editor_document_tree_message">Harici depolama dizini seçin</string>
-    <string name="tag_editor_document_tree_permission_failed">Görünüşe göre dosyaları düzenleme iznimiz yok. Dosya seçicideki dizini kontrol edin.</string>
-    <string name="tag_error_kitkat">Etiketler düzenlenirken bir hata oluştu. Dosya bir SD Kartta mı saklanıyor? Eğer öyleyse, Google bu dosyanın etiket düzenlemesini imkansız hâle getirmiştir.</string>
-    <string name="tag_error_lollipop">Etiketler düzenlenirken bir hata oluştu. Dosya bir SD Kartta saklanıyorsa, Retro Music\'in dosyaya erişim izni olmayabilir.</string>
-    <string name="tag_retrieve_error">Etiketler alınırken bir hata oluştu.</string>
-    <string name="text">Metin</string>
     <string name="thank_you">Teşekkür ederiz!</string>
     <string name="the_audio_file">Ses dosyasını</string>
     <string name="this_month">Bu ay</string>
     <string name="this_week">Bu hafta</string>
     <string name="this_year">Bu yıl</string>
     <string name="tiny">Küçük</string>
-    <string name="title">Başlık</string>
     <string name="title_dashboard">Kontrol paneli</string>
-    <string name="title_desc">Başlık (Z-A)</string>
     <string name="title_good_afternoon">İyi günler</string>
     <string name="title_good_day">İyi günler</string>
     <string name="title_good_evening">İyi akşamlar</string>
     <string name="title_good_morning">Günaydın</string>
     <string name="title_good_night">İyi geceler</string>
-    <string name="title_home">Ana Sayfa</string>
-    <string name="title_material_design_city_wallpaper">Şehir duvar kağıdı</string>
-    <string name="title_material_design_icons">Simgeler</string>
-    <string name="title_notifications">Bildirimler</string>
     <string name="title_user_info">Adınız Nedir</string>
     <string name="today">Bugün</string>
-    <string name="toggle_lyrics_size">Şarkı sözleri boyutunu değiştir</string>
-    <string name="tool_tip_see_all">Tüm şarkıları gör</string>
     <string name="top_albums">En iyi albümler</string>
     <string name="top_artists">En iyi sanatçılar</string>
-    <string name="top_tracks">En iyi parçalar</string>
-    <string name="top_tracks_label">En İyi Parçalar</string>
     <string name="track_hint">"Parça (2.parça için 2 veya 3. CD 4. parça için 3004)"</string>
     <string name="track_list">Parça numarası</string>
     <string name="translate">Çeviri yap</string>
-    <string name="translate_summary">Retro music uygulamasını kendi dilinize çevirmeye yardım edin.</string>
     <string name="unplayable_file">Bu \u015fark\u0131 oynat\u0131lamad\u0131.</string>
     <string name="up_next">Sıradaki</string>
-    <string name="update">Güncelle</string>
     <string name="update_image">Resmi güncelle</string>
-    <string name="updated_artist_image">Sanatçı resmi güncellendi.</string>
     <string name="updating">Güncelleniyor…</string>
-    <string name="user_profile_summary">Profilinizi ve banner resminizi değiştirin</string>
     <string name="version">Sürüm</string>
-    <string name="virtualizer_strength">Sanallaştırıcı Gücü</string>
-    <string name="volume_control">Ses kontrolü</string>
     <string name="web_search">İnternette ara</string>
     <string name="what_do_you_want_to_share">Ne paylaşmak istiyorsunuz?</string>
     <string name="window">Pencere</string>
     <string name="x_has_been_set_as_ringtone">%1$s adlı şarkıyı zil sesi olarak ayarla.</string>
     <string name="x_selected">%1$d öğe seçildi</string>
     <string name="year">Yıl</string>
-    <string name="you_have_to_select_at_least_one_category">En az bir kategori seçmeniz gerekiyor</string>
 </resources>
diff --git a/app/src/main/res/values-v19/dimens.xml b/app/src/main/res/values-v19/dimens.xml
deleted file mode 100644
index 26ebcdcb2..000000000
--- a/app/src/main/res/values-v19/dimens.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="status_bar_padding">25dp</dimen>
-    <dimen name="navigation_drawer_header_height">180dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/dimens.xml b/app/src/main/res/values-v21/dimens.xml
deleted file mode 100644
index d76109ac2..000000000
--- a/app/src/main/res/values-v21/dimens.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="fab_margin_top_left_right">16dp</dimen>
-    <dimen name="tmp_now_playing_skip_rewind_margin">-8dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/fonts.xml b/app/src/main/res/values-v21/fonts.xml
deleted file mode 100644
index 3e707c945..000000000
--- a/app/src/main/res/values-v21/fonts.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- normal -->
-    <string name="font_fontFamily_medium" translatable="false">sans-serif-medium</string>
-
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/integers.xml b/app/src/main/res/values-v21/integers.xml
deleted file mode 100644
index 8be634192..000000000
--- a/app/src/main/res/values-v21/integers.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <integer name="font_textStyle_medium">0</integer>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 48eed172e..128b29fca 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -22,18 +22,8 @@
 
     <style name="Theme.RetroMusic.Notification.Title" parent="@android:style/TextAppearance.Material.Notification.Title" />
 
-    <style name="Fab" parent="FabParent">
-        <item name="android:transitionName">@string/transition_fab</item>
-    </style>
-
     <style name="MusicProgressSlider" parent="MusicProgressSliderParent">
         <item name="android:padding">0dp</item>
     </style>
 
-    <style name="TraditionalMusicProgressSlider" parent="TraditionalMusicProgressSliderParent">
-        <item name="android:elevation">2dp</item>
-        <item name="android:padding">0dp</item>
-        <item name="android:progressBackgroundTint">@android:color/transparent</item>
-    </style>
-
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-xhdpi/dimens.xml b/app/src/main/res/values-xhdpi/dimens.xml
deleted file mode 100644
index 2a6436031..000000000
--- a/app/src/main/res/values-xhdpi/dimens.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="lock_screen_cover_width">380dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-xxhdpi/dimens.xml b/app/src/main/res/values-xxhdpi/dimens.xml
deleted file mode 100644
index a671fa8e0..000000000
--- a/app/src/main/res/values-xxhdpi/dimens.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="lock_screen_cover_width">400dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-xxxhdpi/dimens.xml b/app/src/main/res/values-xxxhdpi/dimens.xml
deleted file mode 100644
index dc8073ca2..000000000
--- a/app/src/main/res/values-xxxhdpi/dimens.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="lock_screen_cover_width">420dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 3546368b4..a75be2d2c 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,430 +1,305 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <resources>
-  <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>
-  <string name="action_add_to_playlist">添加到播放列表…</string>
-  <string name="action_clear_playing_queue">清空播放队列</string>
-  <string name="action_clear_playlist">清空播放列表</string>
-  <string name="action_cycle_repeat">循环播放模式</string>
-  <string name="action_delete">删除</string>
-  <string name="action_delete_from_device">从设备中移除</string>
-  <string name="action_details">详情</string>
-  <string name="action_go_to_album">查看此专辑</string>
-  <string name="action_go_to_artist">查看此艺术家</string>
-  <string name="action_go_to_start_directory">跳转到起始目录</string>
-  <string name="action_grant">授权</string>
-  <string name="action_grid_size">网格大小</string>
-  <string name="action_grid_size_land">网格大小（横屏）</string>
-  <string name="action_new_playlist">新建播放列表…</string>
-  <string name="action_next">下一首</string>
-  <string name="action_play">播放</string>
-  <string name="action_play_next">下一首播放</string>
-  <string name="action_play_pause">播放/暂停</string>
-  <string name="action_previous">上一首</string>
-  <string name="action_re_download_artist_image">更新艺术家图片</string>
-  <string name="action_remove_from_favorites">从收藏夹中移除</string>
-  <string name="action_remove_from_playing_queue">从播放队列中移除</string>
-  <string name="action_remove_from_playlist">从播放列表中移除</string>
-  <string name="action_rename">重命名</string>
-  <string name="action_save_playing_queue">保存播放队列</string>
-  <string name="action_scan">扫描</string>
-  <string name="action_search">搜索</string>
-  <string name="action_set">设置</string>
-  <string name="action_set_as_ringtone">设为铃声</string>
-  <string name="action_set_as_start_directory">设为起始目录</string>
-  <string name="action_settings">"设置"</string>
-  <string name="action_share">分享</string>
-  <string name="action_show_lyrics">显示歌词</string>
-  <string name="action_shuffle_album">随机播放专辑</string>
-  <string name="action_shuffle_all">随机播放全部</string>
-  <string name="action_shuffle_artist">随机播放此艺术家的乐曲</string>
-  <string name="action_shuffle_playlist">随机播放列表</string>
-  <string name="action_sleep_timer">睡眠定时器</string>
-  <string name="action_tag_editor">编辑乐曲信息</string>
-  <string name="action_toggle_favorite">喜欢</string>
-  <string name="action_toggle_shuffle">随机播放模式</string>
-  <string name="add_action">添加</string>
-  <string name="add_photo">添加\n图片</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>
-  <string name="album_artist">专辑艺术家</string>
-  <string name="album_desc">专辑名称降序</string>
-  <string name="album_or_artist_empty">标题或者艺术家为空。</string>
-  <string name="albums">专辑</string>
-  <!-- Android Auto -->
-  <string name="albums_label">专辑</string>
-  <string name="always">始终</string>
-  <string name="app_share">了解关于这款炫酷的播放器的更多信息尽在：https://play.google.com/store/apps/details?id=%s</string>
-  <!-- App Shortcuts -->
-  <string name="app_shortcut_last_added_long">@string/last_added</string>
-  <string name="app_shortcut_last_added_short">@string/last_added</string>
-  <string name="app_shortcut_shuffle_all_long">@string/action_shuffle_all</string>
-  <string name="app_shortcut_top_tracks_long">@string/my_top_tracks</string>
-  <string name="app_shortcut_shuffle_all_short">随机播放</string>
-  <string name="app_shortcut_top_tracks_short">最多播放</string>
-  <string name="app_summary">一款集 Material Design 和 iOS 特色的播放器。</string>
-  <string name="app_widget_big_name">Retro music - 大尺寸</string>
-  <string name="app_widget_big_name_2">Retro music - 大²</string>
-  <string name="app_widget_card_name">Retro music - 卡片</string>
-  <string name="app_widget_classic_name">Retro music - 经典</string>
-  <string name="app_widget_small_name">Retro music - 小尺寸</string>
-  <string name="artist">艺术家</string>
-  <string name="artist_desc">艺术家名称降序</string>
-  <string name="artists">艺术家</string>
-  <string name="artists_label">艺术家</string>
-  <string name="at_least_one_category_must_be_enabled">至少要有一个库启用</string>
-  <string name="audio_focus_denied">请求音频焦点被拒绝。</string>
-  <string name="audio_settings_summary">调整音量设置和均衡器控制</string>
-  <string name="bass_boost_strength">低音增强</string>
-  <string name="biography">简介</string>
-  <string name="biography_unavailable">\u627e\u4e0d\u5230\u6b64\u827a\u672f\u5bb6\u7684\u7b80\u4ecb\u3002</string>
-  <string name="black_theme_name">纯黑</string>
-  <string name="blacklist">黑名单</string>
-  <string name="blur">模糊</string>
-  <string name="blur_card">模糊卡片</string>
-  <string name="buy_retromusic_pro">购买RetroMusic专业版</string>
-  <string name="cancel_current_timer">取消当前定时器</string>
-  <string name="card">卡片</string>
-  <string name="changelog">更新日志</string>
-  <string name="changelog_summary">从 Telegram 获取更新日志</string>
-  <string name="clear_action">清空</string>
-  <string name="clear_blacklist">清空黑名单</string>
-  <string name="clear_playlist_title">清空播放列表</string>
-  <string name="clear_playlist_x"><![CDATA[\u786e\u5b9a\u8981\u6e05\u7a7a\u64ad\u653e\u5217\u8868 <b>%1$s</b> \u5417\uff1f\u64cd\u4f5c\u5c06\u65e0\u6cd5\u64a4\u9500\uff01]]></string>
-  <string name="color">颜色</string>
-  <string name="color_theme_name">颜色</string>
-  <string name="colored_footers">多彩页脚</string>
-  <string name="colors">颜色</string>
-  <string name="could_not_create_playlist">\u65e0\u6cd5\u521b\u5efa\u64ad\u653e\u5217\u8868\u3002</string>
-  <string name="could_not_download_album_cover">"\u65e0\u6cd5\u4e0b\u8f7d\u5230\u5339\u914d\u7684\u5c01\u9762\u3002"</string>
-  <string name="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="currently_listening_to_x_by_x">正在播放 %1$s by %2$s.</string>
-  <string name="custom">自定义</string>
-  <string name="dark_theme_name">暗黑</string>
-  <string name="date">日期</string>
-  <string name="default_hint">无歌词</string>
-  <string name="delete_action">删除</string>
-  <string name="delete_playlist_title">删除播放列表</string>
-  <string name="delete_playlist_x"><![CDATA[确认要删除播放列表 <b>%1$s</b> 吗？]]></string>
-  <string name="delete_playlists_title">删除多个播放列表</string>
-  <string name="delete_song_title">删除乐曲</string>
-  <string name="delete_song_x"><![CDATA[确认要删除歌曲 <b>%1$s</b> 吗？]]></string>
-  <string name="delete_songs_title">删除歌曲</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="deleting_songs">正在删除乐曲…</string>
-  <string name="do_you_want_to_clear_the_blacklist">确认清空黑名单吗？</string>
-  <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[确认从黑名单中移除 <b>%1$s</b> 吗？]]></string>
-  <string name="donate">捐赠</string>
-  <string name="donate_summary">如果您认为我的开发值得回报，您可以为我捐赠一些资金。</string>
-  <string name="donation_header">给我买一个</string>
-  <string name="download_from_last_fm">从 Last.fm 上下载</string>
-  <string name="duration">时长</string>
-  <string name="edit">编辑</string>
-  <string name="edit_categories">编辑库</string>
-  <string name="edit_tags">编辑标签</string>
-  <string name="empty">空</string>
-  <string name="equalizer">均衡器</string>
-  <string name="error_loading_lyrics_from_network">从网络加载歌词出错</string>
-  <string name="experimental">实验室</string>
-  <string name="failed_to_save_playlist">保存播放列表（%s）失败。</string>
-  <string name="favorites">收藏夹</string>
-  <string name="flat">扁平</string>
-  <string name="folders">文件夹</string>
-  <string name="for_you">为您</string>
-  <string name="full">全屏</string>
-  <string name="general_settings_summary">修改整体配色</string>
-  <string name="general_settings_title">外观</string>
-  <string name="genre">流派</string>
-  <string name="genres">风格</string>
-  <string name="gradient">渐变色</string>
-  <string name="grid_size_1">1</string>
-  <string name="grid_size_2">2</string>
-  <string name="grid_size_3">3</string>
-  <string name="grid_size_4">4</string>
-  <string name="grid_size_5">5</string>
-  <string name="grid_size_6">6</string>
-  <string name="grid_size_7">7</string>
-  <string name="grid_size_8">8</string>
-  <string name="history">最近播放</string>
-  <string name="history_label">历史</string>
-  <string name="holiday">假期</string>
-  <string name="home">首页</string>
-  <string name="inserted_x_songs_into_playlist_x">已将 %1$d 首歌曲添加到播放列表 %2$s 中。</string>
-  <string name="inspired_designs_by">设计灵感源于</string>
-  <string name="join_community">加入 Google+ 社区</string>
-  <string name="join_community_summary">如果您有什么疑惑或者需要帮助，欢迎加入我们的 Google+ 社区。</string>
-  <string name="label_bit_rate">比特率</string>
-  <string name="label_details">详情</string>
-  <string name="label_file_format">格式</string>
-  <string name="label_file_name">文件名</string>
-  <string name="label_file_path">文件路径</string>
-  <string name="label_file_size">大小</string>
-  <string name="label_sampling_rate">采样率</string>
-  <string name="label_track_length">时长</string>
-  <string name="language_contributors">翻译贡献者</string>
-  <string name="last_added">最近添加</string>
-  <string name="lets_play_something">让我们来播放些什么吧！</string>
-  <string name="library">浏览</string>
-  <string name="library_categories">音乐库</string>
-  <string name="licenses">开源许可</string>
-  <string name="light_theme_name">纯白</string>
-  <string name="listing_files">正在加载文件</string>
-  <string name="loading">加载中…</string>
-  <string name="loading_products">加载产品…</string>
-  <string name="lyrics">歌词</string>
-  <string name="media_route_menu_title">投影设备</string>
-  <string name="more">更多</string>
-  <string name="my_name">我的名称</string>
-  <string name="my_playlists">播放列表</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="no_albums">无专辑</string>
-  <string name="no_artists">无艺术家</string>
-  <string name="no_audio_ID">"先播放一首乐曲，稍后再作尝试。"</string>
-  <string name="no_equalizer">找不到均衡器。</string>
-  <string name="no_files">无文件</string>
-  <string name="no_genres">无流派</string>
-  <string name="no_lyrics_found">没有找到歌词</string>
-  <string name="no_playlists">无播放列表</string>
-  <string name="no_purchase_found">没有发现您的购买记录。</string>
-  <string name="no_results">无结果</string>
-  <string name="no_songs">无乐曲</string>
-  <string name="normal">一般设定</string>
-  <string name="not_listed_in_media_store"><![CDATA[媒体商店中没有 <b>%s</b>。]]></string>
-  <string name="nothing_to_scan">没有项目可供扫描。</string>
-  <string name="notification">通知</string>
-  <string name="notification_settings_summary">自定义通知类型</string>
-  <string name="now_playing">正在播放</string>
-  <string name="now_playing_queue">当前播放队列</string>
-  <string name="only_on_wifi">仅通过 WiFi</string>
-  <string name="others">其他</string>
-  <string name="past_three_months">3个月内</string>
-  <string name="paypal">使用 PayPal 支付</string>
-  <string name="paypal_summary">使用 PayPal.me 可以方便地向我们捐赠。如果您只链接了一张信用卡或储蓄卡，在美国 PayPal 将会收取捐款中的 2.9% 另加 0.3 美元作为手续费，其他情况下无手续费。 <a href="https://www.paypal.com/us/selfhelp/article/What-are-the-fees-for-PayPal-accounts-FAQ690">更多</a></string>
-  <string name="permission_external_storage_denied">访问外部存储的权限被拒绝。</string>
-  <string name="permissions_denied">权限被拒绝。</string>
-  <string name="personalize">个性化</string>
-  <string name="personalize_settings_summary">自定义播放界面</string>
-  <string name="pick_from_local_storage">在本地存储中选取</string>
-  <string name="plain">纯色</string>
-  <string name="play">播放</string>
-  <string name="play_all">播放全部</string>
-  <string name="playing_notification_description">播放通知提供 播放/暂停 等操作。</string>
-  <string name="playing_notification_name">播放通知</string>
-  <string name="playlist_empty_text">空播放列表</string>
-  <string name="playlist_is_empty">播放列表为空</string>
-  <string name="playlist_name_empty">播放列表名称</string>
-  <string name="playlists">播放列表</string>
-  <string name="playlists_label">播放列表</string>
-  <string name="pref_header_audio">音频</string>
-  <string name="pref_header_general">一般</string>
-  <string name="pref_header_images">图像</string>
-  <string name="pref_header_lockscreen">锁屏</string>
-  <string name="pref_header_now_playing_screen">播放界面</string>
-  <string name="pref_header_playlists">播放列表</string>
-  <string name="pref_only_lollipop">"只适用于Android Lollipop (API 22) 及以上"</string>
-  <string name="pref_only_nougat_mr1">"只适用于Android 7.1。"</string>
-  <string name="pref_summary_about">帮助了此项目的人</string>
-  <string name="pref_summary_album_art_on_lockscreen">将当前乐曲的专辑封面用作锁屏壁纸。</string>
-  <string name="pref_summary_audio_ducking">通知、导航及其他。</string>
-  <string name="pref_summary_blurred_album_art">在锁屏界面使用模糊专辑封面。可能导致第三方应用和小部件出现问题。</string>
-  <string name="pref_summary_carousel_effect">播放界面中专辑封面的旋转效果</string>
-  <string name="pref_summary_circular_album_effect">在播放界面使用圆形样式，会使部分主题失效。</string>
-  <string name="pref_summary_classic_notification">使用经典的通知风格。</string>
-  <string name="pref_summary_colored_app">背景与控制按钮的颜色随播放界面的专辑封面变化。</string>
-  <string name="pref_summary_colored_app_shortcuts">使用强调颜色作为应用快捷方式颜色。每次更改强调色后，请重新打开此选项。</string>
-  <string name="pref_summary_colored_navigation_bar">使用基础色作为导航栏颜色。</string>
-  <string name="pref_summary_colored_notification">"\u4f7f\u7528\u4e13\u8f91\u5c01\u9762\u4e3b\u8272\u5f69\u4f5c\u4e3a\u64ad\u653e\u901a\u77e5\u989c\u8272\u3002"</string>
-  <string name="pref_summary_day_dream">播放音乐时在互动屏保中显示歌曲详情</string>
-  <string name="pref_summary_dominant_color">主色彩将从专辑封面或艺术家肖像中选取</string>
-  <string name="pref_summary_exclude_songs">忽略时长小于30秒的乐曲。</string>
-  <string name="pref_summary_gapless_playback">"在某些设备上可能会引起播放问题。"</string>
-  <string name="pref_summary_ignore_media_store_artwork">可提高专辑封面质量，但会使图片加载速度变慢。建议在专辑封面分辨率较低的情况下启用。</string>
-  <string name="pref_summary_language_en">强制更改应用程序语言为英语（这是为了测试多语言选项）</string>
-  <string name="pref_summary_library_categories">配置音乐库中的序列和可见项目</string>
-  <string name="pref_summary_lock_screen">锁屏页面控制</string>
-  <string name="pref_summary_lock_screen_app">在锁屏显示完整播放控制</string>
-  <string name="pref_summary_open_source_licences">开源软件许可协议详情</string>
-  <string name="pref_summary_round_corners">在窗口、专辑封面等处启用圆角样式。</string>
-  <string name="pref_summary_tab_titles">启用/ 禁用底栏标题</string>
-  <string name="pref_summary_toggle_bottom_bar_titles">关闭底部导航栏标题</string>
-  <string name="pref_summary_toggle_full_screen">启用沉浸模式</string>
-  <string name="pref_summary_toggle_genre">不希望显示流派，将其隐藏</string>
-  <string name="pref_summary_toggle_headset">耳机插入时自动播放</string>
-  <string name="pref_summary_toggle_navigation_bar">隐藏导航栏</string>
-  <string name="pref_summary_toggle_status_bar">隐藏状态栏</string>
-  <string name="pref_summary_toggle_volume">如果正在播放界面有多余空间，显示音量控制</string>
-  <string name="pref_title_album_art_on_lockscreen">显示专辑封面</string>
-  <string name="pref_title_app_shortcuts">多彩应用快捷方式</string>
-  <string name="pref_title_audio_ducking">音频焦点丢失时降低音量</string>
-  <string name="pref_title_auto_download_artist_images">自动下载艺术家图片</string>
-  <string name="pref_title_blurred_album_art">模糊专辑封面</string>
-  <string name="pref_title_classic_notification">经典通知风格</string>
-  <string name="pref_title_colored_app">自适应颜色</string>
-  <string name="pref_title_colored_notification">多彩通知</string>
-  <string name="pref_title_day_dream">日梦</string>
-  <string name="pref_title_exclude_songs">忽略乐曲</string>
-  <string name="pref_title_external_storage_access">获取外部储存器访问权限</string>
-  <string name="pref_title_gapless_playback">无缝播放</string>
-  <string name="pref_title_general_theme">一般主题</string>
-  <string name="pref_title_gradient_color">选择颜色</string>
-  <string name="pref_title_ignore_media_store_artwork">忽略内嵌专辑封面</string>
-  <string name="pref_title_last_added_interval">最近添加列表间隔</string>
-  <string name="pref_title_lock_screen">全屏播放控制</string>
-  <string name="pref_title_lock_screen_app">Retro 音乐锁屏</string>
-  <string name="pref_title_lyrics_options">歌词设置</string>
-  <string name="pref_title_navigation_bar">多彩导航栏</string>
-  <string name="pref_title_now_playing_screen_appearance">外观</string>
-  <string name="pref_title_open_source_licences">开源许可协议</string>
-  <string name="pref_title_round_corners">屏幕圆角</string>
-  <string name="pref_title_toggle_bottom_bar_titles">关闭底栏标题</string>
-  <string name="pref_title_toggle_carousel_effect">旋转效果</string>
-  <string name="pref_title_toggle_circular_album_effect">圆形专辑</string>
-  <string name="pref_title_toggle_dominant_color">主色彩</string>
-  <string name="pref_title_toggle_full_screen">全屏控制</string>
-  <string name="pref_title_toggle_genre">隐藏流派</string>
-  <string name="pref_title_toggle_language_en">英文</string>
-  <string name="pref_title_toggle_navigation_bar">导航栏</string>
-  <string name="pref_title_toggle_status_bar">状态栏</string>
-  <string name="pref_title_toggle_tab_titles">底栏标题</string>
-  <string name="pref_title_toggle_toggle_headset">自动播放</string>
-  <string name="pref_title_toggle_volume">音量控制</string>
-  <string name="pref_title_user_info">用户信息</string>
-  <string name="primary_color">基础色</string>
-  <string name="primary_color_desc">主题基础色默认为白色</string>
-  <string name="purchase">购买</string>
-  <string name="queue">播放队列</string>
-  <string name="queue_label">队列</string>
-  <string name="rate_app">为本应用评分</string>
-  <string name="rate_on_google_play_summary">如果你喜欢 Retro Music，请通过 Google Play 向我们反馈，以获得更好的体验。</string>
-  <string name="recent_activity">最近动态</string>
-  <string name="recent_albums">最近播放的专辑</string>
-  <string name="recent_artists">最近播放的艺术家</string>
-  <string name="remove_action">移除</string>
-  <string name="remove_cover">移除封面</string>
-  <string name="remove_from_blacklist">从黑名单中移除</string>
-  <string name="remove_song_from_playlist_title">从播放列表中删除乐曲</string>
-  <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_action">重命名</string>
-  <string name="rename_playlist_title">重命名播放列表</string>
-  <string name="reset_action">重置</string>
-  <string name="reset_artist_image">重设艺术家图片</string>
-  <string name="restore">恢复</string>
-  <string name="restored_previous_purchase_please_restart">已经恢复以前的购买。 请重新启动 Retro Music 以使用所有功能。</string>
-  <string name="restored_previous_purchases">恢复购买。</string>
-  <string name="restoring_purchase">恢复您的购买</string>
-  <string name="retro">Retro</string>
-  <string name="retro_equalizer">Retro 均衡器</string>
-  <string name="saf_delete_failed">删除文件 %s 失败</string>
-  <!-- SAF -->
-  <string name="saf_error_uri">无法获取 SAF 标识符</string>
-  <string name="saf_guide_slide1_description">打开导航抽屉</string>
-  <string name="saf_guide_slide1_description_before_o">在悬浮窗口中显示「显示储存卡」</string>
-  <!-- SAF guide -->
-  <string name="saf_guide_slide1_title">%s 需要访问储存卡</string>
-  <string name="saf_guide_slide2_description">您需要选择储存卡根目录</string>
-  <string name="saf_guide_slide2_title">请在导航抽屉中选择储存卡</string>
-  <string name="saf_guide_slide3_description">请勿打开任何子目录</string>
-  <string name="saf_guide_slide3_title">按下位于屏幕底端的「选择」按钮</string>
-  <string name="saf_pick_file">需要访问文件，请选择 %s</string>
-  <string name="saf_pick_sdcard">需要储存卡，请选择储存卡根目录</string>
-  <string name="saf_write_failed">写入文件 %s 失败</string>
-  <string name="save_playlist_title">保存为文件</string>
-  <string name="saved_playlist_to">已将播放列表保存到 %s。</string>
-  <string name="saving_changes">保存更改</string>
-  <string name="saving_tags">正在保存标签…</string>
-  <string name="saving_to_file">保存到文件…</string>
-  <string name="scanned_files">已扫描 %2$d 中的 %1$d 个文件。</string>
-  <string name="search_hint">在曲库中查找…</string>
-  <string name="see_all">查看全部</string>
-  <string name="select_preset">选择预设配置</string>
-  <string name="set_artist_image">设置艺术家图片</string>
-  <string name="shuffle">随机播放</string>
-  <string name="simple">简单的</string>
-  <string name="sleep_timer_canceled">睡眠定时器已取消。</string>
-  <string name="sleep_timer_set">%d 分钟后自动停止播放。</string>
-  <string name="slide_unlock">滑动以解锁</string>
-  <string name="solid">立体的</string>
-  <string name="song">乐曲</string>
-  <string name="song_duration">歌曲时长</string>
-  <string name="songs">歌曲</string>
-  <string name="sort_order">排序</string>
-  <string name="speech_not_supported">抱歉！您的设备不支持语音输入。</string>
-  <string name="speech_prompt">在曲库中搜索</string>
-  <string name="suggestions">建议</string>
-  <string name="summary_material_design_city_wallpaper">"Material Design 风格的城市壁纸来自 www.techjuice.pk "</string>
-  <string name="summary_material_design_icons">所有使用的图标来自 www.flaticon.com 或 www.materialdesignicons.com</string>
-  <string name="summary_user_info">仅在主页面显示您的名字</string>
-  <string name="support_development">支持开发者</string>
-  <string name="support_development_summary">如果您喜欢本播放器，请捐赠以支持我的工作。</string>
-  <!-- Message displayed when tag editing fails -->
-  <string name="tag_edit_error">编辑乐曲标签时出错</string>
-  <string name="tag_editor_check_permission">检查权限中…</string>
-  <string name="tag_editor_document_tree_message">选取外部存储器目录</string>
-  <string name="tag_editor_document_tree_permission_failed">似乎没有修改此文件的权限，请在文件选取器中双击此目录。</string>
-  <string name="tag_error_kitkat">编辑乐曲标签时出错。如果文件位于储存卡内，Google 不允许编辑此文件的标签。</string>
-  <string name="tag_error_lollipop">编辑乐曲标签时出错，如果文件位于储存卡内，Retro Music 可能无访问权限。</string>
-  <string name="tag_retrieve_error">获取标签出错。</string>
-  <string name="text">文本</string>
-  <string name="thank_you">感谢！</string>
-  <string name="the_audio_file">音频文件</string>
-  <string name="this_month">本月</string>
-  <string name="this_week">本周</string>
-  <string name="this_year">今年</string>
-  <string name="tiny">极小的</string>
-  <string name="title">标题</string>
-  <string name="title_dashboard">控制面板</string>
-  <string name="title_desc">标题降序</string>
-  <string name="title_good_afternoon">下午好</string>
-  <string name="title_good_day">完美的一天</string>
-  <string name="title_good_evening">晚上好</string>
-  <string name="title_good_morning">早上好</string>
-  <string name="title_good_night">晚安</string>
-  <string name="title_home">主页</string>
-  <string name="title_material_design_city_wallpaper">城市壁纸</string>
-  <string name="title_material_design_icons">图标</string>
-  <string name="title_notifications">通知</string>
-  <string name="title_user_info">您的名字是？</string>
-  <string name="today">今天</string>
-  <string name="toggle_lyrics_size">切换歌词大小</string>
-  <string name="tool_tip_see_all">查看所有曲目</string>
-  <string name="top_albums">播放次数最多的专辑</string>
-  <string name="top_artists">播放次数最多的艺术家</string>
-  <string name="top_tracks">最多播放</string>
-  <string name="top_tracks_label">最高播放量</string>
-  <string name="track_hint">"曲目（2 表示第 2 首歌曲，而 3004 表示第 3 张 CD 的第 4 首歌曲）"</string>
-  <string name="track_list">曲目编号</string>
-  <string name="translate">翻译</string>
-  <string name="translate_summary">帮助翻译让 Retro Music Player 适配您的语言</string>
-  <string name="unplayable_file">\u65e0\u6cd5\u64ad\u653e\u6b64\u4e50\u66f2\u3002</string>
-  <string name="up_next">接下来播放</string>
-  <string name="update">升级</string>
-  <string name="update_image">更新图片</string>
-  <string name="updated_artist_image">艺术家图片己更新。</string>
-  <string name="updating">更新中…</string>
-  <string name="user_profile_summary">修改配置和横幅图片</string>
-  <string name="version">版本</string>
-  <string name="virtualizer_strength">立体声增强</string>
-  <string name="volume_control">音量控制</string>
-  <string name="web_search">网络搜索</string>
-  <string name="what_do_you_want_to_share">您想分享什么？</string>
-  <string name="window">界面</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">你必须选择至少一个库</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>
+    <string name="action_add_to_playlist">添加到播放列表…</string>
+    <string name="action_clear_playing_queue">清空播放队列</string>
+    <string name="action_clear_playlist">清空播放列表</string>
+    <string name="action_delete">删除</string>
+    <string name="action_delete_from_device">从设备中移除</string>
+    <string name="action_details">详情</string>
+    <string name="action_go_to_album">查看此专辑</string>
+    <string name="action_go_to_artist">查看此艺术家</string>
+    <string name="action_go_to_start_directory">跳转到起始目录</string>
+    <string name="action_grant">授权</string>
+    <string name="action_grid_size">网格大小</string>
+    <string name="action_grid_size_land">网格大小（横屏）</string>
+    <string name="action_next">下一首</string>
+    <string name="action_play">播放</string>
+    <string name="action_play_next">下一首播放</string>
+    <string name="action_play_pause">播放/暂停</string>
+    <string name="action_previous">上一首</string>
+    <string name="action_remove_from_favorites">从收藏夹中移除</string>
+    <string name="action_remove_from_playing_queue">从播放队列中移除</string>
+    <string name="action_remove_from_playlist">从播放列表中移除</string>
+    <string name="action_rename">重命名</string>
+    <string name="action_save_playing_queue">保存播放队列</string>
+    <string name="action_scan">扫描</string>
+    <string name="action_search">搜索</string>
+    <string name="action_set">设置</string>
+    <string name="action_set_as_ringtone">设为铃声</string>
+    <string name="action_set_as_start_directory">设为起始目录</string>
+    <string name="action_settings">"设置"</string>
+    <string name="action_share">分享</string>
+    <string name="action_shuffle_all">随机播放全部</string>
+    <string name="action_shuffle_playlist">随机播放列表</string>
+    <string name="action_sleep_timer">睡眠定时器</string>
+    <string name="action_tag_editor">编辑乐曲信息</string>
+    <string name="add_action">添加</string>
+    <string name="add_photo">添加\n图片</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>
+    <string name="album_artist">专辑艺术家</string>
+    <string name="album_or_artist_empty">标题或者艺术家为空。</string>
+    <string name="albums">专辑</string>
+    <!-- Android Auto -->
+    <string name="always">始终</string>
+    <string name="app_share">了解关于这款炫酷的播放器的更多信息尽在：https://play.google.com/store/apps/details?id=%s</string>
+    <!-- App Shortcuts -->
+    <string name="app_shortcut_last_added_long">@string/last_added</string>
+    <string name="app_shortcut_last_added_short">@string/last_added</string>
+    <string name="app_shortcut_shuffle_all_long">@string/action_shuffle_all</string>
+    <string name="app_shortcut_top_tracks_long">@string/my_top_tracks</string>
+    <string name="app_shortcut_shuffle_all_short">随机播放</string>
+    <string name="app_shortcut_top_tracks_short">最多播放</string>
+    <string name="app_widget_big_name">Retro music - 大尺寸</string>
+    <string name="app_widget_card_name">Retro music - 卡片</string>
+    <string name="app_widget_classic_name">Retro music - 经典</string>
+    <string name="app_widget_small_name">Retro music - 小尺寸</string>
+    <string name="artist">艺术家</string>
+    <string name="artists">艺术家</string>
+    <string name="audio_focus_denied">请求音频焦点被拒绝。</string>
+    <string name="audio_settings_summary">调整音量设置和均衡器控制</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="buy_retromusic_pro">购买RetroMusic专业版</string>
+    <string name="cancel_current_timer">取消当前定时器</string>
+    <string name="card">卡片</string>
+    <string name="changelog">更新日志</string>
+    <string name="changelog_summary">从 Telegram 获取更新日志</string>
+    <string name="clear_action">清空</string>
+    <string name="clear_blacklist">清空黑名单</string>
+    <string name="clear_playlist_title">清空播放列表</string>
+    <string name="clear_playlist_x"><![CDATA[\u786e\u5b9a\u8981\u6e05\u7a7a\u64ad\u653e\u5217\u8868 <b>%1$s</b> \u5417\uff1f\u64cd\u4f5c\u5c06\u65e0\u6cd5\u64a4\u9500\uff01]]></string>
+    <string name="color">颜色</string>
+    <string name="color_theme_name">颜色</string>
+    <string name="colors">颜色</string>
+    <string name="could_not_create_playlist">\u65e0\u6cd5\u521b\u5efa\u64ad\u653e\u5217\u8868\u3002</string>
+    <string name="could_not_download_album_cover">"\u65e0\u6cd5\u4e0b\u8f7d\u5230\u5339\u914d\u7684\u5c01\u9762\u3002"</string>
+    <string name="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="currently_listening_to_x_by_x">正在播放 %1$s by %2$s.</string>
+    <string name="dark_theme_name">暗黑</string>
+    <string name="default_hint">无歌词</string>
+    <string name="delete_playlist_title">删除播放列表</string>
+    <string name="delete_playlist_x"><![CDATA[确认要删除播放列表 <b>%1$s</b> 吗？]]></string>
+    <string name="delete_playlists_title">删除多个播放列表</string>
+    <string name="delete_song_x"><![CDATA[确认要删除歌曲 <b>%1$s</b> 吗？]]></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="do_you_want_to_clear_the_blacklist">确认清空黑名单吗？</string>
+    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[确认从黑名单中移除 <b>%1$s</b> 吗？]]></string>
+    <string name="donate">捐赠</string>
+    <string name="donate_summary">如果您认为我的开发值得回报，您可以为我捐赠一些资金。</string>
+    <string name="donation_header">给我买一个</string>
+    <string name="download_from_last_fm">从 Last.fm 上下载</string>
+    <string name="empty">空</string>
+    <string name="equalizer">均衡器</string>
+    <string name="favorites">收藏夹</string>
+    <string name="flat">扁平</string>
+    <string name="folders">文件夹</string>
+    <string name="for_you">为您</string>
+    <string name="full">全屏</string>
+    <string name="general_settings_summary">修改整体配色</string>
+    <string name="general_settings_title">外观</string>
+    <string name="genre">流派</string>
+    <string name="genres">风格</string>
+    <string name="grid_size_1">1</string>
+    <string name="grid_size_2">2</string>
+    <string name="grid_size_3">3</string>
+    <string name="grid_size_4">4</string>
+    <string name="grid_size_5">5</string>
+    <string name="grid_size_6">6</string>
+    <string name="grid_size_7">7</string>
+    <string name="grid_size_8">8</string>
+    <string name="history">最近播放</string>
+    <string name="home">首页</string>
+    <string name="inserted_x_songs_into_playlist_x">已将 %1$d 首歌曲添加到播放列表 %2$s 中。</string>
+    <string name="label_bit_rate">比特率</string>
+    <string name="label_file_format">格式</string>
+    <string name="label_file_name">文件名</string>
+    <string name="label_file_path">文件路径</string>
+    <string name="label_file_size">大小</string>
+    <string name="label_sampling_rate">采样率</string>
+    <string name="label_track_length">时长</string>
+    <string name="last_added">最近添加</string>
+    <string name="lets_play_something">让我们来播放些什么吧！</string>
+    <string name="library">浏览</string>
+    <string name="licenses">开源许可</string>
+    <string name="light_theme_name">纯白</string>
+    <string name="listing_files">正在加载文件</string>
+    <string name="loading_products">加载产品…</string>
+    <string name="lyrics">歌词</string>
+    <string name="my_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="no_albums">无专辑</string>
+    <string name="no_artists">无艺术家</string>
+    <string name="no_audio_ID">"先播放一首乐曲，稍后再作尝试。"</string>
+    <string name="no_equalizer">找不到均衡器。</string>
+    <string name="no_genres">无流派</string>
+    <string name="no_lyrics_found">没有找到歌词</string>
+    <string name="no_playlists">无播放列表</string>
+    <string name="no_purchase_found">没有发现您的购买记录。</string>
+    <string name="no_results">无结果</string>
+    <string name="no_songs">无乐曲</string>
+    <string name="normal">一般设定</string>
+    <string name="not_listed_in_media_store"><![CDATA[媒体商店中没有 <b>%s</b>。]]></string>
+    <string name="nothing_to_scan">没有项目可供扫描。</string>
+    <string name="notification">通知</string>
+    <string name="notification_settings_summary">自定义通知类型</string>
+    <string name="now_playing">正在播放</string>
+    <string name="now_playing_queue">当前播放队列</string>
+    <string name="only_on_wifi">仅通过 WiFi</string>
+    <string name="others">其他</string>
+    <string name="past_three_months">3个月内</string>
+    <string name="paypal">使用 PayPal 支付</string>
+    <string name="paypal_summary">使用 PayPal.me 可以方便地向我们捐赠。如果您只链接了一张信用卡或储蓄卡，在美国 PayPal 将会收取捐款中的 2.9% 另加 0.3 美元作为手续费，其他情况下无手续费。 <a href="https://www.paypal.com/us/selfhelp/article/What-are-the-fees-for-PayPal-accounts-FAQ690">更多</a></string>
+    <string name="permission_external_storage_denied">访问外部存储的权限被拒绝。</string>
+    <string name="permissions_denied">权限被拒绝。</string>
+    <string name="personalize">个性化</string>
+    <string name="personalize_settings_summary">自定义播放界面</string>
+    <string name="pick_from_local_storage">在本地存储中选取</string>
+    <string name="plain">纯色</string>
+    <string name="playing_notification_description">播放通知提供 播放/暂停 等操作。</string>
+    <string name="playing_notification_name">播放通知</string>
+    <string name="playlist_empty_text">空播放列表</string>
+    <string name="playlist_is_empty">播放列表为空</string>
+    <string name="playlist_name_empty">播放列表名称</string>
+    <string name="playlists">播放列表</string>
+    <string name="pref_header_audio">音频</string>
+    <string name="pref_header_general">一般</string>
+    <string name="pref_header_images">图像</string>
+    <string name="pref_header_lockscreen">锁屏</string>
+    <string name="pref_header_playlists">播放列表</string>
+    <string name="pref_only_lollipop">"只适用于Android Lollipop (API 22) 及以上"</string>
+    <string name="pref_summary_album_art_on_lockscreen">将当前乐曲的专辑封面用作锁屏壁纸。</string>
+    <string name="pref_summary_audio_ducking">通知、导航及其他。</string>
+    <string name="pref_summary_blurred_album_art">在锁屏界面使用模糊专辑封面。可能导致第三方应用和小部件出现问题。</string>
+    <string name="pref_summary_carousel_effect">播放界面中专辑封面的旋转效果</string>
+    <string name="pref_summary_classic_notification">使用经典的通知风格。</string>
+    <string name="pref_summary_colored_app">背景与控制按钮的颜色随播放界面的专辑封面变化。</string>
+    <string name="pref_summary_colored_app_shortcuts">使用强调颜色作为应用快捷方式颜色。每次更改强调色后，请重新打开此选项。</string>
+    <string name="pref_summary_colored_navigation_bar">使用基础色作为导航栏颜色。</string>
+    <string name="pref_summary_colored_notification">"\u4f7f\u7528\u4e13\u8f91\u5c01\u9762\u4e3b\u8272\u5f69\u4f5c\u4e3a\u64ad\u653e\u901a\u77e5\u989c\u8272\u3002"</string>
+    <string name="pref_summary_dominant_color">主色彩将从专辑封面或艺术家肖像中选取</string>
+    <string name="pref_summary_gapless_playback">"在某些设备上可能会引起播放问题。"</string>
+    <string name="pref_summary_ignore_media_store_artwork">可提高专辑封面质量，但会使图片加载速度变慢。建议在专辑封面分辨率较低的情况下启用。</string>
+    <string name="pref_summary_lock_screen">锁屏页面控制</string>
+    <string name="pref_summary_open_source_licences">开源软件许可协议详情</string>
+    <string name="pref_summary_round_corners">在窗口、专辑封面等处启用圆角样式。</string>
+    <string name="pref_summary_tab_titles">启用/ 禁用底栏标题</string>
+    <string name="pref_summary_toggle_full_screen">启用沉浸模式</string>
+    <string name="pref_summary_toggle_headset">耳机插入时自动播放</string>
+    <string name="pref_summary_toggle_volume">如果正在播放界面有多余空间，显示音量控制</string>
+    <string name="pref_title_album_art_on_lockscreen">显示专辑封面</string>
+    <string name="pref_title_app_shortcuts">多彩应用快捷方式</string>
+    <string name="pref_title_audio_ducking">音频焦点丢失时降低音量</string>
+    <string name="pref_title_auto_download_artist_images">自动下载艺术家图片</string>
+    <string name="pref_title_blurred_album_art">模糊专辑封面</string>
+    <string name="pref_title_classic_notification">经典通知风格</string>
+    <string name="pref_title_colored_app">自适应颜色</string>
+    <string name="pref_title_colored_notification">多彩通知</string>
+    <string name="pref_title_gapless_playback">无缝播放</string>
+    <string name="pref_title_general_theme">一般主题</string>
+    <string name="pref_title_ignore_media_store_artwork">忽略内嵌专辑封面</string>
+    <string name="pref_title_last_added_interval">最近添加列表间隔</string>
+    <string name="pref_title_lock_screen">全屏播放控制</string>
+    <string name="pref_title_navigation_bar">多彩导航栏</string>
+    <string name="pref_title_now_playing_screen_appearance">外观</string>
+    <string name="pref_title_open_source_licences">开源许可协议</string>
+    <string name="pref_title_round_corners">屏幕圆角</string>
+    <string name="pref_title_toggle_carousel_effect">旋转效果</string>
+    <string name="pref_title_toggle_dominant_color">主色彩</string>
+    <string name="pref_title_toggle_full_screen">全屏控制</string>
+    <string name="pref_title_toggle_tab_titles">底栏标题</string>
+    <string name="pref_title_toggle_toggle_headset">自动播放</string>
+    <string name="pref_title_toggle_volume">音量控制</string>
+    <string name="pref_title_user_info">用户信息</string>
+    <string name="primary_color">基础色</string>
+    <string name="primary_color_desc">主题基础色默认为白色</string>
+    <string name="purchase">购买</string>
+    <string name="queue">播放队列</string>
+    <string name="rate_app">为本应用评分</string>
+    <string name="rate_on_google_play_summary">如果你喜欢 Retro Music，请通过 Google Play 向我们反馈，以获得更好的体验。</string>
+    <string name="recent_albums">最近播放的专辑</string>
+    <string name="recent_artists">最近播放的艺术家</string>
+    <string name="remove_action">移除</string>
+    <string name="remove_cover">移除封面</string>
+    <string name="remove_from_blacklist">从黑名单中移除</string>
+    <string name="remove_song_from_playlist_title">从播放列表中删除乐曲</string>
+    <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="reset_artist_image">重设艺术家图片</string>
+    <string name="restore">恢复</string>
+    <string name="restored_previous_purchase_please_restart">已经恢复以前的购买。 请重新启动 Retro Music 以使用所有功能。</string>
+    <string name="restored_previous_purchases">恢复购买。</string>
+    <string name="restoring_purchase">恢复您的购买</string>
+    <string name="retro_equalizer">Retro 均衡器</string>
+    <!-- SAF -->
+    <!-- SAF guide -->
+    <string name="save_playlist_title">保存为文件</string>
+    <string name="saved_playlist_to">已将播放列表保存到 %s。</string>
+    <string name="saving_changes">保存更改</string>
+    <string name="scanned_files">已扫描 %2$d 中的 %1$d 个文件。</string>
+    <string name="search_hint">在曲库中查找…</string>
+    <string name="set_artist_image">设置艺术家图片</string>
+    <string name="shuffle">随机播放</string>
+    <string name="simple">简单的</string>
+    <string name="sleep_timer_canceled">睡眠定时器已取消。</string>
+    <string name="sleep_timer_set">%d 分钟后自动停止播放。</string>
+    <string name="song">乐曲</string>
+    <string name="song_duration">歌曲时长</string>
+    <string name="songs">歌曲</string>
+    <string name="sort_order">排序</string>
+    <string name="speech_not_supported">抱歉！您的设备不支持语音输入。</string>
+    <string name="speech_prompt">在曲库中搜索</string>
+    <string name="summary_user_info">仅在主页面显示您的名字</string>
+    <string name="support_development">支持开发者</string>
+    <!-- Message displayed when tag editing fails -->
+    <string name="thank_you">感谢！</string>
+    <string name="the_audio_file">音频文件</string>
+    <string name="this_month">本月</string>
+    <string name="this_week">本周</string>
+    <string name="this_year">今年</string>
+    <string name="tiny">极小的</string>
+    <string name="title_dashboard">控制面板</string>
+    <string name="title_good_afternoon">下午好</string>
+    <string name="title_good_day">完美的一天</string>
+    <string name="title_good_evening">晚上好</string>
+    <string name="title_good_morning">早上好</string>
+    <string name="title_good_night">晚安</string>
+    <string name="title_user_info">您的名字是？</string>
+    <string name="today">今天</string>
+    <string name="top_albums">播放次数最多的专辑</string>
+    <string name="top_artists">播放次数最多的艺术家</string>
+    <string name="track_hint">"曲目（2 表示第 2 首歌曲，而 3004 表示第 3 张 CD 的第 4 首歌曲）"</string>
+    <string name="track_list">曲目编号</string>
+    <string name="translate">翻译</string>
+    <string name="unplayable_file">\u65e0\u6cd5\u64ad\u653e\u6b64\u4e50\u66f2\u3002</string>
+    <string name="up_next">接下来播放</string>
+    <string name="update_image">更新图片</string>
+    <string name="updating">更新中…</string>
+    <string name="version">版本</string>
+    <string name="web_search">网络搜索</string>
+    <string name="what_do_you_want_to_share">您想分享什么？</string>
+    <string name="window">界面</string>
+    <string name="x_has_been_set_as_ringtone">将 %1$s 设为您的铃声。</string>
+    <string name="x_selected">已选择 %1$d 首</string>
+    <string name="year">年份</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index fe7f0e499..01a79297a 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -8,7 +8,6 @@
     <string name="action_add_to_playlist">加入至播放清單...</string>
     <string name="action_clear_playing_queue">清除播放列表</string>
     <string name="action_clear_playlist">清除播放清單</string>
-    <string name="action_cycle_repeat">循環播放模式</string>
     <string name="action_delete">刪除</string>
     <string name="action_delete_from_device">由裝置記憶體刪除</string>
     <string name="action_details">内容</string>
@@ -18,13 +17,11 @@
     <string name="action_grant">接收</string>
     <string name="action_grid_size">網格大小</string>
     <string name="action_grid_size_land">網格大小(橫向)</string>
-    <string name="action_new_playlist">新播放清單...</string>
     <string name="action_next">下一首</string>
     <string name="action_play">播放</string>
     <string name="action_play_next">播放下一首</string>
     <string name="action_play_pause">播放/暫停</string>
     <string name="action_previous">上一首</string>
-    <string name="action_re_download_artist_image">更新歌手相片</string>
     <string name="action_remove_from_favorites">由我的最愛移除</string>
     <string name="action_remove_from_playing_queue">由播放列表移除</string>
     <string name="action_remove_from_playlist">由播放清單移除</string>
@@ -37,15 +34,10 @@
     <string name="action_set_as_start_directory">設定為主目錄</string>
     <string name="action_settings">"設定"</string>
     <string name="action_share">分享</string>
-    <string name="action_show_lyrics">顯示歌詞</string>
-    <string name="action_shuffle_album">隨機播放專輯</string>
     <string name="action_shuffle_all">全部隨機播放</string>
-    <string name="action_shuffle_artist">隨機播放歌手</string>
     <string name="action_shuffle_playlist">隨機播放播放清單</string>
     <string name="action_sleep_timer">休眠計時器</string>
     <string name="action_tag_editor">標籤編輯</string>
-    <string name="action_toggle_favorite">切換至我的最愛</string>
-    <string name="action_toggle_shuffle">切換隨機播放模式</string>
     <string name="add_action">增加</string>
     <string name="add_photo">新增\n相片</string>
     <string name="add_playlist_title">"儲存播放清單"</string>
@@ -53,11 +45,9 @@
     <string name="added_x_titles_to_playing_queue">已經將 %1$d 歌曲新增至播放播放列表。</string>
     <string name="album">專輯</string>
     <string name="album_artist">專輯歌手</string>
-    <string name="album_desc">依專輯降序</string>
     <string name="album_or_artist_empty">專輯或歌手一欄是空白的。</string>
     <string name="albums">專輯</string>
     <!-- Android Auto -->
-    <string name="albums_label">專輯</string>
     <string name="always">經常</string>
     <string name="app_share">嗨，看看這個很有型的播放器吧: https://play.google.com/store/apps/details?id=%s</string>
     <!-- App Shortcuts -->
@@ -67,22 +57,15 @@
     <string name="app_shortcut_shuffle_all_short">隨機播放</string>
     <string name="app_shortcut_top_tracks_long">@string/my_top_tracks</string>
     <string name="app_shortcut_top_tracks_short">歌曲榜</string>
-    <string name="app_summary">融合質感設計和iOS介面的跨平台程式</string>
     <string name="app_widget_big_name">Retro Music - 大型模式</string>
-    <string name="app_widget_big_name_2">Retro Music - 大型模式2</string>
     <string name="app_widget_card_name">Retro Music - 卡片模式</string>
     <string name="app_widget_classic_name">Retro Music - 經典模式</string>
     <string name="app_widget_small_name">Retro Music - 小型模式</string>
     <string name="artist">歌手</string>
-    <string name="artist_desc">依歌手名稱排列</string>
     <string name="artists">歌手</string>
-    <string name="artists_label">歌手</string>
-    <string name="at_least_one_category_must_be_enabled">最少一項類別必須顯示。</string>
     <string name="audio_focus_denied">無法找到音頻焦點。</string>
     <string name="audio_settings_summary">調整音頻設定及等化器</string>
-    <string name="bass_boost_strength">低音增強強度</string>
     <string name="biography">演出者資料</string>
-    <string name="biography_unavailable">\u7121\u6cd5\u627e\u5230\u6b4c\u624b\u8cc7\u6599\u3002</string>
     <string name="black_theme_name">純黑色</string>
     <string name="blacklist">黑名單</string>
     <string name="blur">模糊</string>
@@ -98,7 +81,6 @@
     <string name="clear_playlist_x"><![CDATA[\u8981\u6e05\u9664 <b>%1$s</b> \u64ad\u653e\u6e05\u55ae\u55ce? \u8acb\u6ce8\u610f\u9019\u500b\u52d5\u4f5c\u4e0d\u80fd\u9084\u539f!]]></string>
     <string name="color">彩色</string>
     <string name="color_theme_name">彩色</string>
-    <string name="colored_footers">色彩註腳</string>
     <string name="colors">色彩</string>
     <string name="could_not_create_playlist">\u7121\u6cd5\u65b0\u589e\u64ad\u653e\u6e05\u55ae\u3002</string>
     <string name="could_not_download_album_cover">"\u7121\u6cd5\u4e0b\u8f09\u76f8\u7b26\u7684\u5c08\u8f2f\u5716\u7247\u3002"</string>
@@ -107,36 +89,23 @@
     <string name="create_action">新增</string>
     <string name="created_playlist_x">已新增 %1$s 播放清單。</string>
     <string name="currently_listening_to_x_by_x">我在聽由 %2$s 唱的 %1$s</string>
-    <string name="custom">自訂</string>
     <string name="dark_theme_name">暗黑色</string>
-    <string name="date">日期</string>
     <string name="default_hint">沒有歌詞</string>
-    <string name="delete_action">刪除</string>
     <string name="delete_playlist_title">移除播放清單</string>
     <string name="delete_playlist_x"><![CDATA[要移除 <b>%1$s</b> 播放清單嗎?]]></string>
     <string name="delete_playlists_title">移除多個播放清單</string>
-    <string name="delete_song_title">刪除歌曲</string>
     <string name="delete_song_x"><![CDATA[要刪除 <b>%1$s</b> 歌曲嗎？]]></string>
-    <string name="delete_songs_title">刪除多首歌曲</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="deleting_songs">刪除歌曲</string>
     <string name="do_you_want_to_clear_the_blacklist">您想要清除黑名單嗎?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[您想要將 <b>%1$s</b> 由黑名單移除嗎?]]></string>
     <string name="donate">捐款</string>
     <string name="donate_summary">若果您覺得我的開發工作值得回報，可以捐助幾元給我。</string>
     <string name="donation_header">給我買個</string>
     <string name="download_from_last_fm">由Last.fm下載</string>
-    <string name="duration">長度</string>
-    <string name="edit">編輯</string>
-    <string name="edit_categories">修改類別</string>
-    <string name="edit_tags">修改標籤</string>
     <string name="empty">空白</string>
     <string name="equalizer">等化器</string>
-    <string name="error_loading_lyrics_from_network">由網路載入時發生錯誤</string>
-    <string name="experimental">試驗</string>
-    <string name="failed_to_save_playlist">無法儲存播放清單到 %s 。</string>
     <string name="favorites">我的最愛</string>
     <string name="flat">平面</string>
     <string name="folders">資料夾</string>
@@ -146,7 +115,6 @@
     <string name="general_settings_title">介面外觀</string>
     <string name="genre">類型</string>
     <string name="genres">類型</string>
-    <string name="gradient">色彩梯度</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -156,36 +124,24 @@
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
     <string name="history">歷史</string>
-    <string name="history_label">歷史</string>
-    <string name="holiday">假期</string>
     <string name="home">主頁</string>
     <string name="inserted_x_songs_into_playlist_x">已新增了 %1$d 首歌到 %2$s 播放清單。</string>
-    <string name="inspired_designs_by">設計靈感來於</string>
-    <string name="join_community">參與Google+社交圈</string>
-    <string name="join_community_summary">如果你需要協助，或者對程式有問題，Retro Music Google+ 社交圈是一個好去處。</string>
     <string name="label_bit_rate">位元率</string>
-    <string name="label_details">詳細資料</string>
     <string name="label_file_format">格式</string>
     <string name="label_file_name">檔案名</string>
     <string name="label_file_path">檔案位址</string>
     <string name="label_file_size">大小</string>
     <string name="label_sampling_rate">取樣頻率</string>
     <string name="label_track_length">長度</string>
-    <string name="language_contributors">翻譯貢獻者</string>
     <string name="last_added">最近新增</string>
     <string name="lets_play_something">讓我們播放音樂吧</string>
     <string name="library">媒體庫</string>
-    <string name="library_categories">類別庫</string>
     <string name="licenses">許可證</string>
     <string name="light_theme_name">淺白色</string>
     <string name="listing_files">正在列出檔案...</string>
-    <string name="loading">載入中...</string>
     <string name="loading_products">載入中...</string>
     <string name="lyrics">歌詞</string>
-    <string name="media_route_menu_title">投放裝置</string>
-    <string name="more">更多</string>
     <string name="my_name">我的名字</string>
-    <string name="my_playlists">我的播放清單</string>
     <string name="my_top_tracks">我的歌曲榜</string>
     <string name="never">永不</string>
     <string name="new_playlist_title">新播放清單</string>
@@ -194,7 +150,6 @@
     <string name="no_artists">沒有歌手</string>
     <string name="no_audio_ID">"請先播放一首歌曲，然後再試一次。"</string>
     <string name="no_equalizer">找不到等化器。</string>
-    <string name="no_files">沒有檔案</string>
     <string name="no_genres">無類型</string>
     <string name="no_lyrics_found">找不到歌詞</string>
     <string name="no_playlists">沒有播放清單</string>
@@ -219,52 +174,36 @@
     <string name="personalize_settings_summary">個人化現在播放及用戶界面</string>
     <string name="pick_from_local_storage">由裝置儲存空間選擇</string>
     <string name="plain">單色</string>
-    <string name="play">播放</string>
-    <string name="play_all">播放所有</string>
     <string name="playing_notification_description">播放通知欄包含了播放/暫停等動作。</string>
     <string name="playing_notification_name">播放通知欄</string>
     <string name="playlist_empty_text">空白播放清單</string>
     <string name="playlist_is_empty">空白播放清單</string>
     <string name="playlist_name_empty">播放清單名稱</string>
     <string name="playlists">播放清單</string>
-    <string name="playlists_label">播放清單</string>
     <string name="pref_header_audio">音樂</string>
     <string name="pref_header_general">一般</string>
     <string name="pref_header_images">圖片</string>
     <string name="pref_header_lockscreen">鎖定螢幕</string>
-    <string name="pref_header_now_playing_screen">現在播放</string>
     <string name="pref_header_playlists">播放清單</string>
     <string name="pref_only_lollipop">"只適合於Lollipop。"</string>
-    <string name="pref_only_nougat_mr1">"只適合於Nougat 7.1。"</string>
-    <string name="pref_summary_about">協助開發此軟件的人們</string>
     <string name="pref_summary_album_art_on_lockscreen">使用歌曲專輯圖片來用作鎖定畫面背景圖片。</string>
     <string name="pref_summary_audio_ducking">通知聲音、語音導航等</string>
     <string name="pref_summary_blurred_album_art">在鎖定螢幕將專輯圖片模糊化，或會引致第三方程式及工具無法正常運作。</string>
     <string name="pref_summary_carousel_effect">於現正播放專輯圖片使用的走馬燈效果。請注意卡片模式及模糊卡片模式將無法使用此效果。</string>
-    <string name="pref_summary_circular_album_effect">在現在播放中顯示圓形形狀的專輯圖片，但只適用於某些外型</string>
     <string name="pref_summary_classic_notification">使用基本的通知欄設計</string>
     <string name="pref_summary_colored_app">背景、控制按鈕色彩將根據專輯圖片而轉變</string>
     <string name="pref_summary_colored_app_shortcuts">將重色設為程式捷徑色彩。每次當更改色彩後請切換此選項來生效。</string>
     <string name="pref_summary_colored_navigation_bar">設定導航欄色彩為主色調。</string>
     <string name="pref_summary_colored_notification">"\u72c0\u614b\u5217\u984f\u8272\u8207\u5c08\u8f2f\u5716\u7247\u984f\u8272\u76f8\u540c"</string>
-    <string name="pref_summary_day_dream">歌曲播放時於Dream 顯示其資料</string>
     <string name="pref_summary_dominant_color">大多數主色會從專輯或歌手圖片中挑選。</string>
-    <string name="pref_summary_exclude_songs">略過30秒以下的歌曲</string>
     <string name="pref_summary_gapless_playback">"或會引致某些裝置播放功能無法正常運作。"</string>
     <string name="pref_summary_ignore_media_store_artwork">可以提升專輯圖片質素，但這會引致加長圖片載入時間。建議只有當您的載入專輯圖片時質素較差便可啟用。</string>
-    <string name="pref_summary_language_en">強制更改程式語言為英語(EN)(此功能為測試多語言選項)</string>
-    <string name="pref_summary_library_categories">修改類別的可視性及順序。</string>
     <string name="pref_summary_lock_screen">Retro Music鎖定螢幕控制</string>
-    <string name="pref_summary_lock_screen_app">在鎖定螢幕顯示播放控制</string>
     <string name="pref_summary_open_source_licences">開放軟件特許條款內容</string>
     <string name="pref_summary_round_corners">視窗、專輯圖片等使用圓角樣式</string>
     <string name="pref_summary_tab_titles">啟用/禁用底部標題標籤</string>
-    <string name="pref_summary_toggle_bottom_bar_titles">由通知拉下欄底隱藏標題</string>
     <string name="pref_summary_toggle_full_screen">全螢幕模式</string>
-    <string name="pref_summary_toggle_genre">如果想要顯示在底部的類型一欄</string>
     <string name="pref_summary_toggle_headset">當耳機插入時開始立即播放</string>
-    <string name="pref_summary_toggle_navigation_bar">只隱藏導航欄</string>
-    <string name="pref_summary_toggle_status_bar">只隱藏狀態欄</string>
     <string name="pref_summary_toggle_volume">如果現在播放有空間則會啟用音量控制</string>
     <string name="pref_title_album_art_on_lockscreen">顯示專輯圖片</string>
     <string name="pref_title_app_shortcuts">色彩程式捷徑</string>
@@ -274,30 +213,18 @@
     <string name="pref_title_classic_notification">基本通知欄設計</string>
     <string name="pref_title_colored_app">自適應色彩</string>
     <string name="pref_title_colored_notification">色彩通知欄</string>
-    <string name="pref_title_day_dream">Day Dream</string>
-    <string name="pref_title_exclude_songs">略過歌曲</string>
-    <string name="pref_title_external_storage_access">允許存取外置儲存空間</string>
     <string name="pref_title_gapless_playback">無縫播放</string>
     <string name="pref_title_general_theme">主題</string>
-    <string name="pref_title_gradient_color">選擇色彩</string>
     <string name="pref_title_ignore_media_store_artwork">忽略音樂檔內含的專輯圖片</string>
     <string name="pref_title_last_added_interval">最近新增播放清單間隔</string>
     <string name="pref_title_lock_screen">全螢幕控制</string>
-    <string name="pref_title_lock_screen_app">Retro鎖定螢幕</string>
-    <string name="pref_title_lyrics_options">歌詞選項</string>
     <string name="pref_title_navigation_bar">色彩導航欄</string>
     <string name="pref_title_now_playing_screen_appearance">外型</string>
     <string name="pref_title_open_source_licences">開放源碼認證</string>
     <string name="pref_title_round_corners">螢幕圓角</string>
-    <string name="pref_title_toggle_bottom_bar_titles">禁用顯示標題</string>
     <string name="pref_title_toggle_carousel_effect">走馬燈效果</string>
-    <string name="pref_title_toggle_circular_album_effect">專輯圖片圓形化</string>
     <string name="pref_title_toggle_dominant_color">主色</string>
     <string name="pref_title_toggle_full_screen">全螢幕程式</string>
-    <string name="pref_title_toggle_genre">顯示類型</string>
-    <string name="pref_title_toggle_language_en">英語</string>
-    <string name="pref_title_toggle_navigation_bar">導航欄</string>
-    <string name="pref_title_toggle_status_bar">狀態欄</string>
     <string name="pref_title_toggle_tab_titles">標題標籤</string>
     <string name="pref_title_toggle_toggle_headset">自動播放</string>
     <string name="pref_title_toggle_volume">音量控制</string>
@@ -306,10 +233,8 @@
     <string name="primary_color_desc">主原色預設為灰藍色，現在適用於深色色彩</string>
     <string name="purchase">購買</string>
     <string name="queue">播放列表</string>
-    <string name="queue_label">播放列表</string>
     <string name="rate_app">為這個App評分</string>
     <string name="rate_on_google_play_summary">如果您喜歡這個App，就請在Play 商店給我們五星吧！</string>
-    <string name="recent_activity">近期活動</string>
     <string name="recent_albums">近期專輯</string>
     <string name="recent_artists">近期歌手</string>
     <string name="remove_action">移除</string>
@@ -319,113 +244,62 @@
     <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_action">重新命名</string>
     <string name="rename_playlist_title">重新命名播放清單</string>
-    <string name="reset_action">重設</string>
     <string name="reset_artist_image">重設歌手相片</string>
     <string name="restore">恢復</string>
     <string name="restored_previous_purchase_please_restart">已恢復上次購買狀態。請重新啟動程式來應用所有功能。</string>
     <string name="restored_previous_purchases">回復購買狀態</string>
     <string name="restoring_purchase">正在恢復購買狀態...</string>
-    <string name="retro">Retro</string>
     <string name="retro_equalizer">Retro等化器</string>
-    <string name="saf_delete_failed">刪除檔案失敗: %s</string>
     <!-- SAF -->
-    <string name="saf_error_uri">獲取SAF URI失敗</string>
-    <string name="saf_guide_slide1_description">開啟隱藏式選單</string>
-    <string name="saf_guide_slide1_description_before_o">在溢出選單中啟用\"顯示SD卡\"</string>
     <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s 需要SD卡存取權。</string>
-    <string name="saf_guide_slide2_description">您需要選擇SD卡的根目錄。</string>
-    <string name="saf_guide_slide2_title">在隱藏式選單中選擇您的SD卡</string>
-    <string name="saf_guide_slide3_description">不要開啟任何子資料夾</string>
-    <string name="saf_guide_slide3_title">點擊螢幕底下的\"選擇\"按鈕</string>
-    <string name="saf_pick_file">"需要檔案存取權。請選擇 %s "</string>
-    <string name="saf_pick_sdcard">需要SD卡存取權，請選擇SD卡的根目錄。</string>
-    <string name="saf_write_failed">寫人檔案失敗: %s</string>
     <string name="save_playlist_title">儲存檔案</string>
     <string name="saved_playlist_to">已儲存播放清單到 %s 。</string>
     <string name="saving_changes">儲存</string>
-    <string name="saving_tags">儲存標籤</string>
-    <string name="saving_to_file">儲存檔案中...</string>
     <string name="scanned_files">成功掃描 %2$d 項目 中的 %1$d 項目。</string>
     <string name="search_hint">搜尋媒體庫...</string>
-    <string name="see_all">所有歌曲</string>
-    <string name="select_preset">選擇預定設置</string>
     <string name="set_artist_image">設定歌手相片</string>
     <string name="shuffle">隨機播放</string>
     <string name="simple">簡單</string>
     <string name="sleep_timer_canceled">休眠計時器已經取消。</string>
     <string name="sleep_timer_set">休眠計時器從現在開始 %d 分鐘後停止播放。</string>
-    <string name="slide_unlock">滑動螢幕以解鎖</string>
-    <string name="solid">實心</string>
     <string name="song">歌曲</string>
     <string name="song_duration">歌曲長度</string>
     <string name="songs">歌曲</string>
     <string name="sort_order">排序</string>
     <string name="speech_not_supported">對不起！您的裝置不支援語音服務</string>
     <string name="speech_prompt">搜尋媒體庫</string>
-    <string name="suggestions">建議</string>
-    <string name="summary_material_design_city_wallpaper">以質感設計創造的城市背景圖片來自www.techjuice.pk</string>
-    <string name="summary_material_design_icons">所有我們使用的圖示來自 flaticon.com 和
- materialdesignicons.com</string>
     <string name="summary_user_info">只會在首頁顯示您的名字</string>
     <string name="support_development">開發支援</string>
-    <string name="support_development_summary">如果您享受使用Retro Music Player請考慮以捐款來支持我們。</string>
     <!-- Message displayed when tag editing fails -->
-    <string name="tag_edit_error">編輯標籤時發生錯誤。</string>
-    <string name="tag_editor_check_permission">正在檢查權限...</string>
-    <string name="tag_editor_document_tree_message">選擇外置儲存空間的目錄</string>
-    <string name="tag_editor_document_tree_permission_failed">看來我們沒有權限去存取檔案。請在檔案選擇程式中點擊目錄兩下。</string>
-    <string name="tag_error_kitkat">編輯標籤時發生錯誤。檔案是否儲存在SD卡上?若是則Google已經使標籤編輯無法進行。</string>
-    <string name="tag_error_lollipop">編輯標籤時發生錯誤。若檔案儲存在SD卡上則Retro Music可能因為無權存取而發生錯誤。</string>
-    <string name="tag_retrieve_error">檢索標籤時發生錯誤</string>
-    <string name="text">文字</string>
     <string name="thank_you">多謝您!</string>
     <string name="the_audio_file">音樂檔案</string>
     <string name="this_month">這個月</string>
     <string name="this_week">這個星期</string>
     <string name="this_year">這年</string>
     <string name="tiny">迷你</string>
-    <string name="title">標題</string>
     <string name="title_dashboard">通知板</string>
-    <string name="title_desc">依標題降序</string>
     <string name="title_good_afternoon">您好</string>
     <string name="title_good_day">今天真美好</string>
     <string name="title_good_evening">晚安</string>
     <string name="title_good_morning">早晨</string>
     <string name="title_good_night">晚安</string>
-    <string name="title_home">主頁</string>
-    <string name="title_material_design_city_wallpaper">城市背景圖片</string>
-    <string name="title_material_design_icons">圖示</string>
-    <string name="title_notifications">通知</string>
     <string name="title_user_info">您的名字是...</string>
     <string name="today">今天</string>
-    <string name="toggle_lyrics_size">改變歌詞大小</string>
-    <string name="tool_tip_see_all">顯示所有歌曲</string>
     <string name="top_albums">專輯榜</string>
     <string name="top_artists">歌手榜</string>
-    <string name="top_tracks">歌曲榜</string>
-    <string name="top_tracks_label">歌曲榜</string>
     <string name="track_hint">"音軌 (2指音軌2或3004指CD3中的音軌4)"</string>
     <string name="track_list">歌曲號碼</string>
     <string name="translate">翻譯</string>
-    <string name="translate_summary">協助將Retro Music翻譯成為您的語言。</string>
     <string name="unplayable_file">\u7121\u6cd5\u64ad\u653e\u9019\u9996\u6b4c\u66f2\u3002</string>
     <string name="up_next">下一首</string>
-    <string name="update">更新</string>
     <string name="update_image">更新圖片</string>
-    <string name="updated_artist_image">歌手相片已更新。</string>
     <string name="updating">更新中...</string>
-    <string name="user_profile_summary">更改個人資料及橫幅圖片</string>
     <string name="version">版本</string>
-    <string name="virtualizer_strength">音樂效果強度</string>
-    <string name="volume_control">音量控制</string>
     <string name="web_search">網路搜尋</string>
     <string name="what_do_you_want_to_share">有什麼內容想分享的？</string>
     <string name="window">視窗</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">您必須選擇最少一項類別</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index c79b8a363..07781cf88 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -17,13 +17,11 @@
     <string name="action_grant">取得</string>
     <string name="action_grid_size">網格大小</string>
     <string name="action_grid_size_land">網格大小</string>
-    <string name="action_new_playlist">新增播放清單...</string>
     <string name="action_next">下一首</string>
     <string name="action_play">播放</string>
     <string name="action_play_next">在下一首播放</string>
     <string name="action_play_pause">播放/暫停</string>
     <string name="action_previous">上一首</string>
-    <string name="action_re_download_artist_image">更新演唱者圖片</string>
     <string name="action_remove_from_favorites">從最愛中移除</string>
     <string name="action_remove_from_playing_queue">從播放佇列中移除</string>
     <string name="action_remove_from_playlist">從播放清單移除</string>
@@ -35,10 +33,7 @@
     <string name="action_set_as_start_directory">設為起始目錄</string>
     <string name="action_settings">"設定"</string>
     <string name="action_share">分享</string>
-    <string name="action_show_lyrics">顯示歌詞</string>
-    <string name="action_shuffle_album">隨機播放專輯</string>
     <string name="action_shuffle_all">隨機播放</string>
-    <string name="action_shuffle_artist">隨機播放</string>
     <string name="action_shuffle_playlist">隨機播放清單</string>
     <string name="action_sleep_timer">睡眠定時器</string>
     <string name="action_tag_editor">編輯音樂資訊</string>
@@ -47,7 +42,6 @@
     <string name="added_x_titles_to_playing_queue">已將 %1$d 首歌加到播放佇列。</string>
     <string name="album">專輯</string>
     <string name="album_artist">專輯演出者</string>
-    <string name="album_desc">專輯名稱降序</string>
     <string name="album_or_artist_empty">專輯名稱或演出者欄是空的。</string>
     <string name="albums">專輯</string>
     <string name="always">永遠</string>
@@ -59,22 +53,18 @@
     <string name="app_shortcut_top_tracks_long">@string/my_top_tracks</string>
     <string name="app_shortcut_top_tracks_short">最佳單曲</string>
     <string name="app_widget_big_name">Retro music - 大型</string>
-    <string name="app_widget_big_name_2">Retro music - 大型2</string>
     <string name="app_widget_classic_name">Retro music - 經典</string>
     <string name="app_widget_small_name">Retro music - 小型</string>
     <string name="artist">演唱者</string>
-    <string name="artist_desc">演出者名稱降序</string>
     <string name="artists">演唱者</string>
     <string name="audio_focus_denied">無法控制音訊焦點。</string>
     <string name="biography">簡介</string>
-    <string name="biography_unavailable">\u627e\u4e0d\u5230\u9019\u4f4d\u6f14\u5531\u8005\u7684\u7c21\u4ecb\u3002</string>
     <string name="black_theme_name">純黑（AMOLED）</string>
     <string name="cancel_current_timer">取消目前的計時器</string>
     <string name="changelog">新功能</string>
     <string name="clear_action">清空</string>
     <string name="clear_playlist_title">清空播放清單</string>
     <string name="clear_playlist_x"><![CDATA[\u78ba\u5b9a\u8981\u6e05\u9664\u64ad\u653e\u6e05\u55ae <b>%1$s</b> \u55ce\uff1f\u6b64\u64cd\u4f5c\u662f\u7121\u6cd5\u5fa9\u539f\u7684\uff01]]></string>
-    <string name="colored_footers">彩色註腳</string>
     <string name="colors">主題顏色</string>
     <string name="could_not_create_playlist">\u7121\u6cd5\u65b0\u589e\u64ad\u653e\u6e05\u55ae\u3002</string>
     <string name="could_not_download_album_cover">"\u7121\u6cd5\u4e0b\u8f09\u5408\u9069\u7684\u5c08\u8f2f\u5c01\u9762\u3002"</string>
@@ -82,24 +72,18 @@
     <string name="create_action">建立</string>
     <string name="created_playlist_x">已新增播放清單 %1$s。</string>
     <string name="currently_listening_to_x_by_x">我正在聽 %2$s 的 %1$s ！</string>
-    <string name="date">日期</string>
-    <string name="delete_action">刪除</string>
     <string name="delete_playlist_title">刪除播放清單</string>
     <string name="delete_playlist_x"><![CDATA[確定要刪除播放清單 <b>%1$s</b> 嗎？]]></string>
     <string name="delete_playlists_title">刪除多個播放清單</string>
-    <string name="delete_song_title">刪除歌曲</string>
     <string name="delete_song_x"><![CDATA[確定刪除歌曲 <b>%1$s</b> 嗎？]]></string>
-    <string name="delete_songs_title">刪除多首歌曲</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="donate">捐助</string>
     <string name="donate_summary">如果你認為我的努力值得回報，你可以在這裡留幾塊錢。</string>
     <string name="download_from_last_fm">從 Last.fm 下載</string>
-    <string name="duration">歌曲時間</string>
     <string name="empty">空的</string>
     <string name="equalizer">等化器</string>
-    <string name="failed_to_save_playlist">無法儲存播放清單（%s）</string>
     <string name="favorites">最愛</string>
     <string name="flat">方角</string>
     <string name="folders">文件夾</string>
@@ -115,11 +99,7 @@
     <string name="history">記錄</string>
     <string name="home">首頁</string>
     <string name="inserted_x_songs_into_playlist_x">已將 %1$d 首歌加入播放清單 %2$s 中。</string>
-    <string name="inspired_designs_by">設計靈感來自</string>
-    <string name="join_community">加入 Google+ 社群</string>
-    <string name="join_community_summary">如果您需要幫助或遇到問題，Google+ 上的 Retro music 社群是個發問的好地方。</string>
     <string name="label_bit_rate">位元率</string>
-    <string name="label_details">詳細資訊</string>
     <string name="label_file_format">格式</string>
     <string name="label_file_name">檔案名稱</string>
     <string name="label_file_path">檔案路徑</string>
@@ -133,7 +113,6 @@
     <string name="listing_files">清單文件</string>
     <string name="loading_products">正在載入</string>
     <string name="lyrics">歌詞</string>
-    <string name="more">更多</string>
     <string name="my_top_tracks">我的最佳單曲</string>
     <string name="never">永不</string>
     <string name="new_playlist_title">新增播放清單</string>
@@ -142,7 +121,6 @@
     <string name="no_artists">沒有演唱者</string>
     <string name="no_audio_ID">"請先播放一首歌後再重試一遍。"</string>
     <string name="no_equalizer">找不到等化器。</string>
-    <string name="no_files">沒有檔案</string>
     <string name="no_playlists">沒有播放清單</string>
     <string name="no_results">沒有搜尋結果</string>
     <string name="no_songs">沒有歌曲</string>
@@ -156,16 +134,13 @@
     <string name="permission_external_storage_denied">無法取得存取外部儲存空間的權限。</string>
     <string name="permissions_denied">存取被拒</string>
     <string name="pick_from_local_storage">從手機裡選擇（SD卡或記憶體）</string>
-    <string name="play">播放</string>
     <string name="playlist_empty_text">播放清單是空的</string>
     <string name="playlist_name_empty">播放清單名稱</string>
     <string name="playlists">播放清單</string>
     <string name="pref_header_audio">音訊</string>
     <string name="pref_header_images">圖片</string>
     <string name="pref_header_lockscreen">鎖定螢幕</string>
-    <string name="pref_header_now_playing_screen">播放面板</string>
     <string name="pref_only_lollipop">"只適用於 Lollipop。"</string>
-    <string name="pref_only_nougat_mr1">"只適用於 Nougat 7.1。"</string>
     <string name="pref_summary_album_art_on_lockscreen">將播放中歌曲的專輯封面設為鎖定螢幕背景。</string>
     <string name="pref_summary_audio_ducking">通知鈴聲、導航語音等。</string>
     <string name="pref_summary_blurred_album_art">在鎖定畫面上模糊化專輯圖片。第三方程式和小工具可能不正常運作。</string>
@@ -173,7 +148,6 @@
     <string name="pref_summary_colored_app_shortcuts">將重點色調設為應用快捷方式的顏色。每次更改重點色調後，請切換此功能以生效。</string>
     <string name="pref_summary_colored_navigation_bar">將主色調設為導航列的顏色。</string>
     <string name="pref_summary_colored_notification">"\u72c0\u614b\u5217\u984f\u8272\u8207\u5c08\u8f2f\u5716\u7247\u984f\u8272\u4e00\u81f4"</string>
-    <string name="pref_summary_exclude_songs">排除時間少於 30 秒的歌曲。</string>
     <string name="pref_summary_gapless_playback">"可能會在某些裝置上出現播放問題。"</string>
     <string name="pref_summary_ignore_media_store_artwork">提高專輯封面的成像品質，但會造成較長的讀取時間。建議只有在您對低畫質的專輯封面有問題時才開啟此選項。</string>
     <string name="pref_summary_round_corners">使視窗邊角為圓形邊角</string>
@@ -185,7 +159,6 @@
     <string name="pref_title_colored_app">自適應顏色</string>
     <string name="dark_theme_name">暗沉</string>
     <string name="pref_title_colored_notification">彩色的狀態列</string>
-    <string name="pref_title_exclude_songs">排除歌曲</string>
     <string name="pref_title_gapless_playback">無縫播放</string>
     <string name="pref_title_general_theme">主題</string>
     <string name="pref_title_ignore_media_store_artwork">忽略音訊檔內嵌的專輯封面</string>
@@ -203,13 +176,11 @@
     <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_action">重新命名</string>
     <string name="rename_playlist_title">重新命名播放清單</string>
     <string name="restored_previous_purchases">回復購買</string>
     <string name="save_playlist_title">儲存檔案</string>
     <string name="saved_playlist_to">已儲存播放清單至 %s</string>
     <string name="saving_changes">儲存變更</string>
-    <string name="saving_to_file">正在儲存檔案...</string>
     <string name="scanned_files">已掃描 %2$d 個檔案夾中的 %1$d 個。</string>
     <string name="search_hint">搜尋音樂庫…</string>
     <string name="shuffle">隨機播放</string>
@@ -223,15 +194,11 @@
     <string name="support_development">支援開發</string>
     <string name="thank_you">感謝你！</string>
     <string name="the_audio_file">音訊檔案</string>
-    <string name="title">標題</string>
-    <string name="title_desc">標題名稱降序</string>
     <string name="track_hint">"音軌（用2表示第2首歌或用3004表示 CD3 的第4首歌）"</string>
     <string name="translate">翻譯</string>
-    <string name="translate_summary">幫助我將 Retro music 翻譯成您的語言</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="updated_artist_image">演唱者圖片已更新。</string>
     <string name="updating">正在更新…</string>
     <string name="version">版本</string>
     <string name="web_search">網路搜尋</string>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index a9ccfced9..8956e0b4d 100755
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -50,15 +50,6 @@
         <item>never</item>
     </array>
 
-    <array name="pref_album_detail_style_titles">
-        <item>@string/style1</item>
-        <item>@string/style2</item>
-    </array>
-    <array name="pref_album_detail_style_index">
-        <item>0</item>
-        <item>1</item>
-    </array>
-
     <array name="pref_album_detail_style_values">
         <item>@layout/activity_album</item>
         <item>@layout/activity_album_style_2</item>
@@ -131,16 +122,6 @@
         <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/5.png</item>
         <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/1.png</item>
     </string-array>
-    <string-array name="pref_lyrics_options_list_titles">
-        <item>Offline</item>
-        <!--<item>Lyrics Wiki</item>-->
-        <item>Kugou</item>
-    </string-array>
-    <string-array name="pref_lyrics_options_list_values">
-        <item>offline</item>
-        <!--<item>wiki</item>-->
-        <item>kugou</item>
-    </string-array>
 
     <string-array name="pref_equalizer_types_titles">
         <item>@string/system_equalizer</item>
@@ -152,13 +133,11 @@
         <item>retro</item>
     </string-array>
 
-    <string name="style1">Normal style</string>
-    <string name="style2">Card style</string>
 
     <array name="cast_expanded_controller_control_buttons">
         <item>@id/cast_button_type_empty</item>
-        <item>@id/cast_button_type_skip_previous</item>
-        <item>@id/cast_button_type_skip_next</item>
+        <item>@id/cast_button_type_rewind_30_seconds</item>
         <item>@id/cast_button_type_mute_toggle</item>
+        <item>@id/cast_button_type_empty</item>
     </array>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index c3383dae0..98152fb33 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,42 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-  <attr format="reference" name="roundSelector"/>
-  <attr format="reference" name="rectSelector"/>
-  <attr format="reference" name="rectSelectorStrong"/>
+    <attr name="roundSelector" format="reference" />
+    <attr name="rectSelector" format="reference" />
+    <attr name="rectSelectorStrong" format="reference" />
 
-  <attr format="color" name="defaultFooterColor"/>
+    <attr name="defaultFooterColor" format="color" />
 
-  <attr format="reference" name="toolbarPopupTheme"/>
+    <attr name="toolbarPopupTheme" format="reference" />
 
-  <attr format="color" name="iconColor"/>
-  <attr format="color" name="dividerColor"/>
+    <attr name="iconColor" format="color" />
+    <attr name="dividerColor" format="color" />
 
 
-  <declare-styleable name="BlurLayout">
-    <attr format="float" name="blk_downscaleFactor"/>
-    <attr format="integer" name="blk_blurRadius"/>
-    <attr format="integer" name="blk_fps"/>
-    <attr format="dimension" name="blk_cornerRadius"/>
-  </declare-styleable>
+    <declare-styleable name="BlurLayout">
+        <attr name="blk_downscaleFactor" format="float" />
+        <attr name="blk_blurRadius" format="integer" />
+        <attr name="blk_fps" format="integer" />
+        <attr name="blk_cornerRadius" format="dimension" />
+    </declare-styleable>
 
-  <declare-styleable name="NetworkImageView">
-    <attr format="string" name="url_link"/>
-  </declare-styleable>
+    <declare-styleable name="NetworkImageView">
+        <attr name="url_link" format="string" />
+    </declare-styleable>
 
-  <declare-styleable name="LyricView">
-    <attr format="string" name="hint"/>
-    <attr format="color" name="hintColor"/>
-    <attr format="color" name="textColor"/>
-    <attr format="color" name="highlightColor"/>
-    <attr format="dimension" name="textSize"/>
-    <attr format="dimension" name="maxLength"/>
-    <attr format="boolean" name="fadeInFadeOut"/>
-    <attr format="dimension" name="lineSpace"/>
-    <attr name="textAlign">
-      <enum name="left" value="0"/>
-      <enum name="center" value="1"/>
-      <enum name="right" value="2"/>
-    </attr>
-  </declare-styleable>
+    <declare-styleable name="LyricView">
+        <attr name="hint" format="string" />
+        <attr name="hintColor" format="color" />
+        <attr name="textColor" format="color" />
+        <attr name="highlightColor" format="color" />
+        <attr name="textSize" format="dimension" />
+        <attr name="maxLength" format="dimension" />
+        <attr name="fadeInFadeOut" format="boolean" />
+        <attr name="lineSpace" format="dimension" />
+        <attr name="textAlign">
+            <enum name="left" value="0" />
+            <enum name="center" value="1" />
+            <enum name="right" value="2" />
+        </attr>
+    </declare-styleable>
+    <declare-styleable name="ContributorsView">
+        <attr name="profile_url" format="string" />
+        <attr name="profile_name" format="string" />
+        <attr name="profile_summary" format="string" />
+        <attr name="profile_link" format="string" />
+    </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/cast_style.xml b/app/src/main/res/values/cast_style.xml
index b717340d6..9f7f3c576 100644
--- a/app/src/main/res/values/cast_style.xml
+++ b/app/src/main/res/values/cast_style.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.CastVideosDark" parent="Theme.AppCompat.NoActionBar">
-        <item name="colorPrimaryDark">@color/md_black_1000</item>
-    </style>
-
-    <style name="CustomCastMiniController" parent="CastMiniController">
-        <item name="castShowImageThumbnail">true</item>
-        <item name="castTitleTextAppearance">@style/TextAppearance.AppCompat.Subhead</item>
-        <item name="castSubtitleTextAppearance">@style/TextAppearance.AppCompat.Caption</item>
-    </style>
-
     <style name="CustomCastExpandedController" parent="CastExpandedController">
         <item name="castControlButtons">
             @array/cast_expanded_controller_control_buttons
@@ -24,15 +14,5 @@
         </item>
     </style>
 
-    <style name="DarkDialogTheme" parent="Theme.AppCompat.Dialog">
-        <item name="colorPrimary">@color/md_grey_500</item>
-        <item name="colorPrimaryDark">@color/md_grey_700</item>
-        <item name="colorAccent">@color/md_pink_A400</item>
-        <item name="android:windowBackground">@color/md_grey_900</item>
-        <item name="android:textColorPrimary">@android:color/white</item>
-        <item name="android:windowNoTitle">true</item>
-    </style>
-
-
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b3c197b92..4b6cad0a7 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,5 +4,4 @@
     <color name="eighty_percent_black_overlay">#80000000</color>
     <color name="app_shortcut_default_foreground">#607d8b</color>
     <color name="app_shortcut_default_background">#f5f5f5</color>
-    <color name="colorOverlay">#78ffffff</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index c8cea0123..b08f4b5d7 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -4,58 +4,30 @@
     <dimen name="toolbar_elevation">4dp</dimen>
     <dimen name="default_item_margin">16dp</dimen>
 
-    <dimen name="navigation_drawer_header_height">156dp</dimen>
-
-    <dimen name="title_view_height">72dp</dimen>
     <dimen name="card_elevation">2dp</dimen>
 
-    <dimen name="header_image_height">360dp</dimen>
     <dimen name="progress_container_height">20dp</dimen>
-    <dimen name="fab_media_controller_container_height">120dp</dimen>
-    <dimen name="media_controller_container_height">104dp</dimen>
 
 
     <dimen name="tab_height">48dp</dimen>
 
-    <dimen name="tagEditorHeaderVariableSpace">100dp</dimen>
-
     <dimen name="pause_bar_width">5dp</dimen>
     <dimen name="pause_bar_distance">4dp</dimen>
     <dimen name="pause_bar_height">16dp</dimen>
 
 
-    <dimen name="color_view_border">1dp</dimen>
-
     <dimen name="empty_text_size">20sp</dimen>
 
-    <dimen name="seek_bar_margin_left_right">-17dp</dimen>
-    <dimen name="list_padding_vertical">2dp</dimen>
-
     <dimen name="notification_big_image_size">134dp</dimen>
 
-    <dimen name="scrollbar_width">8dp</dimen>
-    <dimen name="scrollbar_inset">8dp</dimen>
     <!-- MUST BE THE RESULT OF WIDTH PLUS INSET-->
-    <dimen name="scrollbar_width_plus_inset">16dp</dimen>
 
     <!-- ONLY 0dp WHILE THERE IS THE BUG IN DESIGN SUPPORT LIBRARY 22.2.0-->
-    <dimen name="fab_margin_top_left_right">0dp</dimen>
-    <dimen name="tmp_now_playing_skip_rewind_margin">-24dp</dimen>
-
-    <dimen name="title_box_padding_small">16dp</dimen>
-    <dimen name="title_box_padding_large">32dp</dimen>
-    <dimen name="title_box_title_text_size_small">@dimen/abc_text_size_title_material</dimen>
-    <dimen name="title_box_title_text_size_large">24sp</dimen>
-    <dimen name="title_box_caption_text_size_small">@dimen/abc_text_size_caption_material</dimen>
-    <dimen name="title_box_caption_text_size_large">14sp</dimen>
-    <dimen name="title_box_text_spacing_small">0dp</dimen>
-    <dimen name="title_box_text_spacing_large">2dp</dimen>
 
     <!-- For use with 24dp drawables in the item_list layouts-->
     <dimen name="list_item_image_icon_padding">8dp</dimen>
 
     <dimen name="mini_player_height">48dp</dimen>
-    <dimen name="mini_player_height_expanded">68dp</dimen>
 
 
     <!--
@@ -81,15 +53,11 @@ http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
     <dimen name="app_widget_card_min_height">64dp</dimen>
     <dimen name="app_widget_card_buttons_width">128dp</dimen>
     <dimen name="app_widget_card_radius">2dp</dimen>
-    <dimen name="material_component_lists_three_line_height">88dp</dimen>
-    <dimen name="player_control_icon">78dp</dimen>
-    <dimen name="bottom_padding">48dp</dimen>
-    <dimen name="lock_screen_cover_width">360dp</dimen>
     <dimen name="now_playing_top_margin">12dp</dimen>
 
-    <dimen name="column_width">80dp</dimen>
     <dimen name="icon_notification_dimen">32dp</dimen>
-    <dimen name="overlap_toolbar_height">-12dp</dimen>
     <dimen name="horizontal_margin">0dp</dimen>
+    <dimen name="bottom_sheet_width">0dp</dimen>
+    <dimen name="mini_player_height_expanded">104dp</dimen>
 
 </resources>
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index e7299f6b3..55627b4ff 100755
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -9,38 +9,10 @@
         <item>code_name_monkey_donate_6</item>
         <item>code_name_monkey_donate_7</item>
     </string-array>
-    <string name="dev_info" translatable="false">Hi i\'m Hemanth s, love to be Android developer, i\'m from Hosur, Tamil Nadu, India.</string>
-
-    <string name="luis_gomez" translatable="false">Luis Gomez</string>
-    <string name="luis_gomez_summary" translatable="false">For making Play Store Illustrations and App icon</string>
 
     <string name="app_name" translatable="false">Retro Music</string>
     <string name="google_plus" translatable="false">Google Plus</string>
     <string name="git_hub" translatable="false">GitHub</string>
-    <string name="twitter" translatable="false">Twitter</string>
     <string name="social_buttons" translatable="false">Social Buttons</string>
-    <string name="license_dialog_style" translatable="false">
-        body {
-        background-color: #{bg-color};
-        color: #{text-color};
-        font-family: sans-serif;
-        overflow-wrap: break-word;
-        }
-        pre {
-        background-color: #{license-bg-color};
-        padding: 1em;
-        white-space: pre-wrap;
-        }
-    </string>
-    <string name="hemanth_s" translatable="false">Hemanth S</string>
-    <string name="hosur_india" translatable="false">Hosur, India</string>
     <string name="circular_std_black" translatable="false">fonts/circular_std_black.otf</string>
-    <string name="circular_std_book" translatable="false">fonts/circular_std_book.otf</string>
-    <string name="marko_name" translatable="false">Marko Ivanović </string>
-    <string name="marko_summary" translatable="false">Contributor</string>
-    <string name="yt_gaming_name" translatable="false">Gaming Inc</string>
-    <string name="yt_gaming_summary" translatable="false">Discord server maintainer</string>
-    <string name="moderator" translatable="false">Moderator</string>
-    <string name="gaurav_singh_name" translatable="false">Gaurav Singh</string>
-    <string name="gaurav_singh_summary" translatable="false">Member</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
index c5d5899fd..a6b3daec9 100644
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#FFFFFF</color>
-</resources>
\ No newline at end of file
+<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml
index 980dbf72a..25b942c9c 100644
--- a/app/src/main/res/values/integers.xml
+++ b/app/src/main/res/values/integers.xml
@@ -11,8 +11,6 @@
     <integer name="max_columns">4</integer>
     <integer name="max_columns_land">6</integer>
 
-    <integer name="font_textStyle_medium">1</integer>
     <integer name="anim_duration_medium">300</integer>
-    <integer name="anim_duration_long">400</integer>
     <integer name="options_height">240</integer>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/md_colors.xml b/app/src/main/res/values/md_colors.xml
index 6805ac72a..0d2c4cc40 100644
--- a/app/src/main/res/values/md_colors.xml
+++ b/app/src/main/res/values/md_colors.xml
@@ -1,279 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <array name="mdcolor_50">
-        <item name="red_50" type="color">#fde0dc</item>
-        <item name="pink_50" type="color">#fce4ec</item>
-        <item name="purple_50" type="color">#f3e5f5</item>
-        <item name="deep_purple_50" type="color">#ede7f6</item>
-        <item name="indigo_50" type="color">#e8eaf6</item>
-        <item name="blue_50" type="color">#e7e9fd</item>
-        <item name="light_blue_50" type="color">#e1f5fe</item>
-        <item name="cyan_50" type="color">#e0f7fa</item>
-        <item name="teal_50" type="color">#e0f2f1</item>
-        <item name="green_50" type="color">#d0f8ce</item>
-        <item name="light_green_50" type="color">#f1f8e9</item>
-        <item name="lime_50" type="color">#f9fbe7</item>
-        <item name="yellow_50" type="color">#fffde7</item>
-        <item name="amber_50" type="color">#fff8e1</item>
-        <item name="orange_50" type="color">#fff3e0</item>
-        <item name="deep_orange_50" type="color">#fbe9e7</item>
-        <item name="brown_50" type="color">#efebe9</item>
-        <item name="grey_50" type="color">#fafafa</item>
-        <item name="blue_grey_50" type="color">#eceff1</item>
-    </array>
-    <array name="mdcolor_100">
-        <item name="red_100" type="color">#f9bdbb</item>
-        <item name="pink_100" type="color">#f8bbd0</item>
-        <item name="purple_100" type="color">#e1bee7</item>
-        <item name="deep_purple_100" type="color">#d1c4e9</item>
-        <item name="indigo_100" type="color">#c5cae9</item>
-        <item name="blue_100" type="color">#d0d9ff</item>
-        <item name="light_blue_100" type="color">#b3e5fc</item>
-        <item name="cyan_100" type="color">#b2ebf2</item>
-        <item name="teal_100" type="color">#b2dfdb</item>
-        <item name="green_100" type="color">#a3e9a4</item>
-        <item name="light_green_100" type="color">#dcedc8</item>
-        <item name="lime_100" type="color">#f0f4c3</item>
-        <item name="yellow_100" type="color">#fff9c4</item>
-        <item name="amber_100" type="color">#ffecb3</item>
-        <item name="orange_100" type="color">#ffe0b2</item>
-        <item name="deep_orange_100" type="color">#ffccbc</item>
-        <item name="brown_100" type="color">#d7ccc8</item>
-        <item name="grey_100" type="color">#f5f5f5</item>
-        <item name="blue_grey_100" type="color">#cfd8dc</item>
-    </array>
-    <array name="mdcolor_200">
-        <item name="red_200" type="color">#f69988</item>
-        <item name="pink_200" type="color">#f48fb1</item>
-        <item name="purple_200" type="color">#ce93d8</item>
-        <item name="deep_purple_200" type="color">#b39ddb</item>
-        <item name="indigo_200" type="color">#9fa8da</item>
-        <item name="blue_200" type="color">#afbfff</item>
-        <item name="light_blue_200" type="color">#81d4fa</item>
-        <item name="cyan_200" type="color">#80deea</item>
-        <item name="teal_200" type="color">#80cbc4</item>
-        <item name="green_200" type="color">#72d572</item>
-        <item name="light_green_200" type="color">#c5e1a5</item>
-        <item name="lime_200" type="color">#e6ee9c</item>
-        <item name="yellow_200" type="color">#fff59d</item>
-        <item name="orange_200" type="color">#ffcc80</item>
-        <item name="deep_orange_200" type="color">#ffab91</item>
-        <item name="brown_200" type="color">#bcaaa4</item>
-        <item name="grey_200" type="color">#eeeeee</item>
-        <item name="blue_grey_200" type="color">#b0bec5</item>
-    </array>
-    <array name="mdcolor_300">
-        <item name="red_300" type="color">#f36c60</item>
-        <item name="pink_300" type="color">#f06292</item>
-        <item name="purple_300" type="color">#ba68c8</item>
-        <item name="deep_purple_300" type="color">#9575cd</item>
-        <item name="indigo_300" type="color">#7986cb</item>
-        <item name="blue_300" type="color">#91a7ff</item>
-        <item name="light_blue_300" type="color">#4fc3f7</item>
-        <item name="cyan_300" type="color">#4dd0e1</item>
-        <item name="teal_300" type="color">#4db6ac</item>
-        <item name="green_300" type="color">#42bd41</item>
-        <item name="light_green_300" type="color">#aed581</item>
-        <item name="lime_300" type="color">#dce775</item>
-        <item name="yellow_300" type="color">#fff176</item>
-        <item name="orange_300" type="color">#ffb74d</item>
-        <item name="deep_orange_300" type="color">#ff8a65</item>
-        <item name="brown_300" type="color">#a1887f</item>
-        <item name="grey_300" type="color">#e0e0e0</item>
-        <item name="blue_grey_300" type="color">#90a4ae</item>
-    </array>
-    <array name="mdcolor_400">
-        <item name="red_400" type="color">#e84e40</item>
-        <item name="pink_400" type="color">#ec407a</item>
-        <item name="purple_400" type="color">#ab47bc</item>
-        <item name="deep_purple_400" type="color">#7e57c2</item>
-        <item name="indigo_400" type="color">#5c6bc0</item>
-        <item name="blue_400" type="color">#738ffe</item>
-        <item name="light_blue_400" type="color">#29b6f6</item>
-        <item name="cyan_400" type="color">#26c6da</item>
-        <item name="teal_400" type="color">#26a69a</item>
-        <item name="green_400" type="color">#2baf2b</item>
-        <item name="light_green_400" type="color">#9ccc65</item>
-        <item name="lime_400" type="color">#d4e157</item>
-        <item name="yellow_400" type="color">#ffee58</item>
-        <item name="orange_400" type="color">#ffa726</item>
-        <item name="deep_orange_400" type="color">#ff7043</item>
-        <item name="brown_400" type="color">#8d6e63</item>
-        <item name="grey_400" type="color">#bdbdbd</item>
-        <item name="blue_grey_400" type="color">#78909c</item>
-    </array>
-    <array name="mdcolor_500">
-        <item name="red_500" type="color">#e51c23</item>
-        <item name="pink_500" type="color">#e91e63</item>
-        <item name="purple_500" type="color">#9c27b0</item>
-        <item name="deep_purple_500" type="color">#673ab7</item>
-        <item name="indigo_500" type="color">#3f51b5</item>
-        <item name="blue_500" type="color">#5677fc</item>
-        <item name="light_blue_500" type="color">#03a9f4</item>
-        <item name="cyan_500" type="color">#00bcd4</item>
-        <item name="teal_500" type="color">#009688</item>
-        <item name="green_500" type="color">#259b24</item>
-        <item name="light_green_500" type="color">#8bc34a</item>
-        <item name="lime_500" type="color">#cddc39</item>
-        <item name="yellow_500" type="color">#ffeb3b</item>
-        <item name="orange_500" type="color">#ff9800</item>
-        <item name="deep_orange_500" type="color">#ff5722</item>
-        <item name="brown_500" type="color">#795548</item>
-        <item name="grey_500" type="color">#9e9e9e</item>
-        <item name="blue_grey_500" type="color">#607d8b</item>
-    </array>
-    <array name="mdcolor_600">
-        <item name="red_600" type="color">#dd191d</item>
-        <item name="pink_600" type="color">#d81b60</item>
-        <item name="purple_600" type="color">#8e24aa</item>
-        <item name="deep_purple_600" type="color">#5e35b1</item>
-        <item name="indigo_600" type="color">#3949ab</item>
-        <item name="blue_600" type="color">#4e6cef</item>
-        <item name="light_blue_600" type="color">#039be5</item>
-        <item name="cyan_600" type="color">#00acc1</item>
-        <item name="teal_600" type="color">#00897b</item>
-        <item name="green_600" type="color">#0a8f08</item>
-        <item name="light_green_600" type="color">#7cb342</item>
-        <item name="lime_600" type="color">#c0ca33</item>
-        <item name="yellow_600" type="color">#fdd835</item>
-        <item name="orange_600" type="color">#fb8c00</item>
-        <item name="deep_orange_600" type="color">#f4511e</item>
-        <item name="brown_600" type="color">#6d4c41</item>
-        <item name="grey_600" type="color">#757575</item>
-        <item name="blue_grey_600" type="color">#546e7a</item>
-    </array>
-    <array name="mdcolor_700">
-        <item name="red_700" type="color">#d01716</item>
-        <item name="pink_700" type="color">#c2185b</item>
-        <item name="purple_700" type="color">#7b1fa2</item>
-        <item name="deep_purple_700" type="color">#512da8</item>
-        <item name="indigo_700" type="color">#303f9f</item>
-        <item name="blue_700" type="color">#455ede</item>
-        <item name="light_blue_700" type="color">#0288d1</item>
-        <item name="cyan_700" type="color">#0097a7</item>
-        <item name="teal_700" type="color">#00796b</item>
-        <item name="green_700" type="color">#0a7e07</item>
-        <item name="light_green_700" type="color">#689f38</item>
-        <item name="lime_700" type="color">#afb42b</item>
-        <item name="yellow_700" type="color">#fbc02d</item>
-        <item name="orange_700" type="color">#f57c00</item>
-        <item name="deep_orange_700" type="color">#e64a19</item>
-        <item name="brown_700" type="color">#5d4037</item>
-        <item name="grey_700" type="color">#616161</item>
-        <item name="blue_grey_700" type="color">#455a64</item>
-    </array>
-    <array name="mdcolor_800">
-        <item name="red_800" type="color">#c41411</item>
-        <item name="pink_800" type="color">#ad1457</item>
-        <item name="purple_800" type="color">#6a1b9a</item>
-        <item name="deep_purple_800" type="color">#4527a0</item>
-        <item name="indigo_800" type="color">#283593</item>
-        <item name="blue_800" type="color">#3b50ce</item>
-        <item name="light_blue_800" type="color">#0277bd</item>
-        <item name="cyan_800" type="color">#00838f</item>
-        <item name="teal_800" type="color">#00695c</item>
-        <item name="green_800" type="color">#056f00</item>
-        <item name="light_green_800" type="color">#558b2f</item>
-        <item name="lime_800" type="color">#9e9d24</item>
-        <item name="yellow_800" type="color">#f9a825</item>
-        <item name="orange_800" type="color">#ef6c00</item>
-        <item name="deep_orange_800" type="color">#d84315</item>
-        <item name="brown_800" type="color">#4e342e</item>
-        <item name="grey_800" type="color">#424242</item>
-        <item name="blue_grey_800" type="color">#37474f</item>
-    </array>
-    <array name="mdcolor_900">
-        <item name="red_900" type="color">#b0120a</item>
-        <item name="pink_900" type="color">#880e4f</item>
-        <item name="purple_900" type="color">#4a148c</item>
-        <item name="deep_purple_900" type="color">#311b92</item>
-        <item name="indigo_900" type="color">#1a237e</item>
-        <item name="blue_900" type="color">#2a36b1</item>
-        <item name="light_blue_900" type="color">#01579b</item>
-        <item name="cyan_900" type="color">#006064</item>
-        <item name="teal_900" type="color">#004d40</item>
-        <item name="green_900" type="color">#0d5302</item>
-        <item name="light_green_900" type="color">#33691e</item>
-        <item name="lime_900" type="color">#827717</item>
-        <item name="yellow_900" type="color">#f57f17</item>
-        <item name="orange_900" type="color">#e65100</item>
-        <item name="deep_orange_900" type="color">#bf360c</item>
-        <item name="brown_900" type="color">#3e2723</item>
-        <item name="grey_900" type="color">#212121</item>
-        <item name="blue_grey_900" type="color">#263238</item>
-    </array>
-    <array name="mdcolor_A100">
-        <item name="red_A100" type="color">#ff7997</item>
-        <item name="pink_A100" type="color">#ff80ab</item>
-        <item name="purple_A100" type="color">#ea80fc</item>
-        <item name="deep_purple_A100" type="color">#b388ff</item>
-        <item name="indigo_A100" type="color">#8c9eff</item>
-        <item name="blue_A100" type="color">#a6baff</item>
-        <item name="light_blue_A100" type="color">#80d8ff</item>
-        <item name="cyan_A100" type="color">#84ffff</item>
-        <item name="teal_A100" type="color">#a7ffeb</item>
-        <item name="green_A100" type="color">#a2f78d</item>
-        <item name="light_green_A100" type="color">#ccff90</item>
-        <item name="lime_A100" type="color">#f4ff81</item>
-        <item name="yellow_A100" type="color">#ffff8d</item>
-        <item name="orange_A100" type="color">#ffd180</item>
-        <item name="deep_orange_A100" type="color">#ff9e80</item>
-    </array>
-    <array name="mdcolor_A200">
-        <item name="red_A200" type="color">#ff5177</item>
-        <item name="pink_A200" type="color">#ff4081</item>
-        <item name="purple_A200" type="color">#e040fb</item>
-        <item name="deep_purple_A200" type="color">#7c4dff</item>
-        <item name="indigo_A200" type="color">#536dfe</item>
-        <item name="blue_A200" type="color">#6889ff</item>
-        <item name="light_blue_A200" type="color">#40c4ff</item>
-        <item name="cyan_A200" type="color">#18ffff</item>
-        <item name="teal_A200" type="color">#64ffda</item>
-        <item name="green_A200" type="color">#5af158</item>
-        <item name="light_green_A200" type="color">#b2ff59</item>
-        <item name="lime_A200" type="color">#eeff41</item>
-        <item name="yellow_A200" type="color">#ffff00</item>
-        <item name="orange_A200" type="color">#ffab40</item>
-        <item name="deep_orange_A200" type="color">#ff6e40</item>
-    </array>
-    <array name="mdcolor_A400">
-        <item name="red_A400" type="color">#ff2d6f</item>
-        <item name="pink_A400" type="color">#f50057</item>
-        <item name="purple_A400" type="color">#d500f9</item>
-        <item name="deep_purple_A400" type="color">#651fff</item>
-        <item name="indigo_A400" type="color">#3d5afe</item>
-        <item name="blue_A400" type="color">#4d73ff</item>
-        <item name="light_blue_A400" type="color">#00b0ff</item>
-        <item name="cyan_A400" type="color">#00e5ff</item>
-        <item name="teal_A400" type="color">#1de9b6</item>
-        <item name="green_A400" type="color">#14e715</item>
-        <item name="light_green_A400" type="color">#76ff03</item>
-        <item name="lime_A400" type="color">#c6ff00</item>
-        <item name="yellow_A400" type="color">#ffea00</item>
-        <item name="orange_A400" type="color">#ff9100</item>
-        <item name="deep_orange_A400" type="color">#ff3d00</item>
-    </array>
-    <array name="mdcolor_A700">
-        <item name="red_A700" type="color">#e00032</item>
-        <item name="pink_A700" type="color">#c51162</item>
-        <item name="purple_A700" type="color">#aa00ff</item>
-        <item name="deep_purple_A700" type="color">#6200ea</item>
-        <item name="indigo_A700" type="color">#304ffe</item>
-        <item name="blue_A700" type="color">#4d69ff</item>
-        <item name="light_blue_A700" type="color">#0091ea</item>
-        <item name="cyan_A700" type="color">#00b8d4</item>
-        <item name="teal_A700" type="color">#00bfa5</item>
-        <item name="green_A700" type="color">#12c700</item>
-        <item name="light_green_A700" type="color">#64dd17</item>
-        <item name="lime_A700" type="color">#aeea00</item>
-        <item name="yellow_A700" type="color">#ffd600</item>
-        <item name="orange_A700" type="color">#ff6d00</item>
-        <item name="deep_orange_A700" type="color">#dd2c00</item>
-    </array>
-    <array name="extra">
-        <item name="grey_1000b" type="color">#000000</item>
-        <item name="grey_1000w" type="color">#ffffff</item>
-    </array>
-
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e387a161d..36ac5eab1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_add_to_playlist">Add to playlist…</string>
     <string name="action_clear_playing_queue">Clear playing queue</string>
     <string name="action_clear_playlist">Clear playlist</string>
-    <string name="action_cycle_repeat">Cycle repeat mode</string>
     <string name="action_delete">Delete</string>
     <string name="action_delete_from_device">Delete from device</string>
     <string name="action_details">Details</string>
@@ -20,13 +19,11 @@
     <string name="action_grant">Grant</string>
     <string name="action_grid_size">Grid size</string>
     <string name="action_grid_size_land">Grid size (land)</string>
-    <string name="action_new_playlist">New playlist…</string>
     <string name="action_next">Next</string>
     <string name="action_play">Play</string>
     <string name="action_play_next">Play next</string>
     <string name="action_play_pause">Play/Pause</string>
     <string name="action_previous">Previous</string>
-    <string name="action_re_download_artist_image">Update artist image</string>
     <string name="action_remove_from_favorites">Remove from favorites</string>
     <string name="action_remove_from_playing_queue">Remove from playing queue</string>
     <string name="action_remove_from_playlist">Remove from playlist</string>
@@ -40,16 +37,11 @@
     <string name="action_set_as_start_directory">Set as start directory</string>
     <string name="action_settings">"Settings"</string>
     <string name="action_share">Share</string>
-    <string name="action_show_lyrics">Show lyrics</string>
-    <string name="action_shuffle_album">Shuffle album</string>
     <string name="action_shuffle_all">Shuffle all</string>
-    <string name="action_shuffle_artist">Shuffle artist</string>
     <string name="action_shuffle_playlist">Shuffle playlist</string>
     <string name="action_sleep_timer">Sleep timer</string>
     <string name="action_sort_order">Sort order</string>
     <string name="action_tag_editor">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>
 
@@ -62,12 +54,10 @@
 
     <string name="album">Album</string>
     <string name="album_artist">Album artist</string>
-    <string name="album_desc">Album desc.</string>
     <string name="album_or_artist_empty">The title or artist is empty.</string>
 
     <string name="albums">Albums</string>
     <!-- Android Auto -->
-    <string name="albums_label">Albums</string>
 
     <string name="always">Always</string>
 
@@ -79,29 +69,22 @@
     <string name="app_shortcut_shuffle_all_short">Shuffle</string>
     <string name="app_shortcut_top_tracks_long">@string/my_top_tracks</string>
     <string name="app_shortcut_top_tracks_short">Top Tracks</string>
-    <string name="app_summary">A Hybrid application between Material design and iOS in mind.</string>
     <string name="app_widget_big_name">Retro music - Big</string>
-    <string name="app_widget_big_name_2">Retro music - Big2</string>
     <string name="app_widget_card_name">Retro music - Card</string>
     <string name="app_widget_classic_name">Retro music - Classic</string>
     <string name="app_widget_small_name">Retro music - Small</string>
 
     <string name="artist">Artist</string>
-    <string name="artist_desc">Artist desc.</string>
 
     <string name="artists">Artists</string>
 
 
-    <string name="at_least_one_category_must_be_enabled">At least one category must be enabled.</string>
-
     <string name="audio_focus_denied">Audio focus denied.</string>
     <string name="audio_settings_summary">Change the sound settings and adjust the equalizer controls</string>
 
     <string name="bass_boost">Bass Boost</string>
-    <string name="bass_boost_strength">Bass Boost Strength</string>
 
     <string name="biography">Biography</string>
-    <string name="biography_unavailable">Couldn\u2019t find the artists biography.</string>
 
     <string name="black_theme_name">Just Black</string>
 
@@ -138,9 +121,6 @@
 
     <string name="color">Color</string>
     <string name="color_theme_name">Color</string>
-    <string name="color_type">Color style</string>
-
-    <string name="colored_footers">Colored footers</string>
 
     <string name="colors">Colors</string>
 
@@ -157,28 +137,19 @@
 
     <string name="currently_listening_to_x_by_x">Currently listening to %1$s by %2$s.</string>
 
-    <string name="custom">Custom</string>
-
     <string name="dark_theme_name">Kinda Dark</string>
 
-    <string name="date">Date</string>
-
     <string name="default_hint">No Lyrics</string>
 
-    <string name="delete_action">Delete</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>
-    <string name="delete_song_title">Delete song</string>
     <string name="delete_song_x"><![CDATA[Delete the song <b>%1$s</b>?]]></string>
-    <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="deleting_songs">Deleting songs</string>
-
     <string name="discord_page">Discord</string>
     <string name="discord_summary">Join the Discord server to keep up with the latest news</string>
 
@@ -193,26 +164,12 @@
 
     <string name="download_from_last_fm">Download from Last.fm</string>
 
-    <string name="duration">Duration</string>
-
-    <string name="edit">Edit</string>
-    <string name="edit_categories">Edit categories</string>
     <string name="edit_cover">Edit cover</string>
-    <string name="edit_tags">Edit tags</string>
 
     <string name="empty">Empty</string>
 
     <string name="equalizer">Equalizer</string>
 
-    <string name="error_loading_lyrics_from_network">Error loading from network</string>
-
-    <string name="experimental">Experimental</string>
-
-    <string name="facebook_page">Facebook Page</string>
-    <string name="facebook_page_summary">Help us to grove faster by  sharing facebook page</string>
-
-    <string name="failed_to_save_playlist">Failed to save playlist (%s).</string>
-
     <string name="faq">FAQ</string>
 
     <string name="favorites">Favorites</string>
@@ -236,8 +193,6 @@
 
     <string name="google_plus_community">Join the Google Plus community where you can ask for help or follow Retro Music updates</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>
@@ -248,9 +203,6 @@
     <string name="grid_size_8">8</string>
 
     <string name="history">History</string>
-    <string name="history_label">History</string>
-
-    <string name="holiday">Holiday</string>
 
     <string name="home">Home</string>
 
@@ -258,16 +210,10 @@
 
     <string name="inserted_x_songs_into_playlist_x">Inserted %1$d songs into the playlist %2$s.</string>
 
-    <string name="inspired_designs_by">Inspired designs by</string>
-
     <string name="instagram_page">Instagram</string>
     <string name="instagram_page_summary">Share your Retro Music setup to showcase on Instagram</string>
 
-    <string name="join_community">Join the Google Plus community</string>
-    <string name="join_community_summary">If you need help or have questions, the Retro Music community on Google Plus is a good place to go.</string>
-
     <string name="label_bit_rate">Bitrate</string>
-    <string name="label_details">Details</string>
     <string name="label_file_format">Format</string>
     <string name="label_file_name">File name</string>
     <string name="label_file_path">File path</string>
@@ -275,42 +221,30 @@
     <string name="label_sampling_rate">Sampling rate</string>
     <string name="label_track_length">Length</string>
 
-    <string name="language_contributors">Language translators</string>
-
     <string name="last_added">Last added</string>
 
     <string name="lets_play_something">Let\'s play some music</string>
 
     <string name="library">Library</string>
-    <string name="library_categories">Library categories</string>
 
     <string name="licenses">Licenses</string>
 
     <string name="light_theme_name">Clearly White</string>
 
-    <string name="list_type">List style</string>
-
     <string name="listing_files">Listing files</string>
 
-    <string name="loading">Loading...</string>
     <string name="loading_products">Loading products…</string>
 
     <string name="lyrics">Lyrics</string>
 
     <string name="material">Material</string>
 
-    <string name="media_route_menu_title">Cast device</string>
-
-    <string name="more">More</string>
-
     <string name="my_name">My Name</string>
-    <string name="my_playlists">My playlist</string>
     <string name="my_top_tracks">Most played</string>
 
     <string name="never">Never</string>
 
     <string name="new_banner_photo">New banner photo</string>
-    <string name="new_music_mix">New Music  Mix</string>
     <string name="new_playlist_title">New playlist</string>
     <string name="new_profile_photo">New profile photo</string>
     <string name="new_start_directory">%s is the new start directory.</string>
@@ -319,7 +253,6 @@
     <string name="no_artists">No artists</string>
     <string name="no_audio_ID">"Play a song first, then try again."</string>
     <string name="no_equalizer">No equalizer found</string>
-    <string name="no_files">No files</string>
     <string name="no_genres">No genres</string>
     <string name="no_lyrics_found">No lyrics found</string>
     <string name="no_playlists">No playlists</string>
@@ -347,9 +280,6 @@
 
     <string name="past_three_months">Past 3 months</string>
 
-    <string name="patreon_page">Patreon page</string>
-    <string name="patreon_page_summary">Support us from patreon</string>
-
     <string name="paypal">PayPal.me</string>
     <string name="paypal_summary">PayPal.me is an easy way to donate me money. In case you only linked a debit or a credit card the fee in the U.S. is 2.9% of the donation + $0.30 USD. Otherwise, there is no fee.<a href="https://www.paypal.com/us/selfhelp/article/What-are-the-fees-for-PayPal-accounts-FAQ690">more</a>
     </string>
@@ -365,9 +295,6 @@
 
     <string name="plain">Plain</string>
 
-    <string name="play">Play</string>
-    <string name="play_all">Play all</string>
-
     <string name="playing_notification_description">The playing notification provides actions for play/pause etc.</string>
     <string name="playing_notification_name">Playing notification</string>
 
@@ -376,50 +303,36 @@
     <string name="playlist_name_empty">Playlist name</string>
 
     <string name="playlists">Playlists</string>
-    <string name="playlists_label">Playlists</string>
 
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_general">Theme</string>
     <string name="pref_header_images">Images</string>
     <string name="pref_header_lockscreen">Lockscreen</string>
-    <string name="pref_header_now_playing_screen">Now playing</string>
     <string name="pref_header_playlists">Playlists</string>
     <string name="pref_only_lollipop">"Only available on Lollipop."</string>
-    <string name="pref_only_nougat_mr1">"Only available on Nougat 7.1."</string>
-    <string name="pref_summary_about">People who helped on the project</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_audio_ducking">Lower the volume when a system sound is played or a notification is received</string>
     <string name="pref_summary_blurred_album_art">Blur the album cover on the lockscreen. Can cause problems with third party apps and widgets</string>
     <string name="pref_summary_carousel_effect">Carousel effect for the album art in the now playing screen. Note that Card and Blur Card themes won\'t work</string>
-    <string name="pref_summary_circular_album_effect">Show a circular album cover in the now playing screen. Note that only a few themes work with this feature</string>
     <string name="pref_summary_classic_notification">Use the classic notification design</string>
     <string name="pref_summary_colored_app">The background and control button colors change according to the album art from the now playing screen</string>
     <string name="pref_summary_colored_app_shortcuts">Colors the app shortcuts in the accent color. Every time you change the color please toggle this to take effect</string>
     <string name="pref_summary_colored_navigation_bar">Colors the navigation bar in the primary color</string>
     <string name="pref_summary_colored_notification">"Colors the notification in the album cover\u2019s vibrant color"</string>
-    <string name="pref_summary_day_dream">Shows song details on dream when music is playing</string>
     <string name="pref_summary_dominant_color">Most dominant color will be picked from the album or artist cover</string>
-    <string name="pref_summary_exclude_songs">Exclude songs that are less than 30 secs. </string>
     <string name="pref_summary_gapless_playback">"Can cause playback issues on some devices."</string>
     <string name="pref_summary_ignore_media_store_artwork">Can increase the album cover quality, but causes slower image loading times. Only enable this if you have problems with low resolution artworks</string>
-    <string name="pref_summary_language_en">Change app language forcefully to english(this is testing for multiple language option)</string>
-    <string name="pref_summary_library_categories">Configure visibility and order of library categories.</string>
     <string name="pref_summary_lock_screen">Use Retro Music\'s custom lockscreen controls</string>
-    <string name="pref_summary_lock_screen_app">Show full controls from the lock screen</string>
     <string name="pref_summary_open_source_licences">License details for open source software</string>
     <string name="pref_summary_round_corners">Round the app\'s edges</string>
     <string name="pref_summary_tab_titles">Toggle titles for the bottom navigation bar tabs</string>
-    <string name="pref_summary_toggle_animations">Animations makes some device run slow, load images slow</string>
-    <string name="pref_summary_toggle_bottom_bar_titles">Disable titles from bottom navigation bar</string>
     <string name="pref_summary_toggle_full_screen">Immersive mode</string>
-    <string name="pref_summary_toggle_genre">Show genres on the home screen</string>
     <string name="pref_summary_toggle_headset">Start playing immediately after headphones are connected</string>
-    <string name="pref_summary_toggle_navigation_bar">Hide only navigation bar</string>
-    <string name="pref_summary_toggle_separate_line">Toggle view of separate line in list of items</string>
     <string name="pref_summary_toggle_shuffle">Shuffle mode will turn off when playing a new list of songs</string>
-    <string name="pref_summary_toggle_status_bar">Hide only status bar</string>
     <string name="pref_summary_toggle_volume">If enough space is available, show volume controls in the now playing screen</string>
     <string name="pref_summary_extra_controls">Add extra controls for mini player</string>
+    <string name="pref_summary_genre_toggle">Toggle genre tab</string>
+    <string name="pref_summary_home_banner">Toggle home banner style</string>
     <string name="pref_title_album_art_on_lockscreen">Show album cover</string>
     <string name="pref_title_album_grid_style">Album grid</string>
     <string name="pref_title_app_shortcuts">Colored app shortcuts</string>
@@ -431,38 +344,26 @@
     <string name="pref_title_classic_notification">Classic notification design</string>
     <string name="pref_title_colored_app">Adaptive color</string>
     <string name="pref_title_colored_notification">Colored notification</string>
-    <string name="pref_title_day_dream">Day dream</string>
-    <string name="pref_title_exclude_songs">Exclude songs</string>
-    <string name="pref_title_external_storage_access">Give access  to external storage</string>
     <string name="pref_title_gapless_playback">Gapless playback</string>
     <string name="pref_title_general_theme">App theme</string>
-    <string name="pref_title_gradient_color">Choose color</string>
     <string name="pref_title_ignore_media_store_artwork">Ignore Media Store covers</string>
     <string name="pref_title_last_added_interval">Last added playlist interval</string>
     <string name="pref_title_lock_screen">Fullscreen controls</string>
-    <string name="pref_title_lock_screen_app">Retro lock screen</string>
-    <string name="pref_title_lyrics_options">Lyrics options</string>
     <string name="pref_title_navigation_bar">Colored navigation bar</string>
     <string name="pref_title_now_playing_screen_appearance">Now playing theme</string>
     <string name="pref_title_open_source_licences">Open source licences</string>
     <string name="pref_title_round_corners">Corner edges</string>
-    <string name="pref_title_toggle_animations">Animations</string>
-    <string name="pref_title_toggle_bottom_bar_titles">Disable titles</string>
     <string name="pref_title_toggle_carousel_effect">Carousel effect</string>
-    <string name="pref_title_toggle_circular_album_effect">Circular album</string>
     <string name="pref_title_toggle_dominant_color">Dominant color</string>
     <string name="pref_title_toggle_full_screen">Fullscreen app</string>
-    <string name="pref_title_toggle_genre">Show genre</string>
-    <string name="pref_title_toggle_language_en">English language</string>
-    <string name="pref_title_toggle_navigation_bar">Navigation bar</string>
-    <string name="pref_title_toggle_separate_line">Separate line</string>
-    <string name="pref_title_toggle_status_bar">Status bar</string>
     <string name="pref_title_toggle_tab_titles">Tab titles</string>
     <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="pref_title_user_info">User info</string>
     <string name="pref_title_extra_controls">Extra controls</string>
+    <string name="pref_title_home_banner">Home banner</string>
+    <string name="pref_title_genre_toggle">Show genre tab</string>
 
     <string name="primary_color">Primary color</string>
     <string name="primary_color_desc">The primary theme color, defaults to blue grey, for now works with dark colors</string>
@@ -471,12 +372,10 @@
     <string name="purchase_summary">*Think before buying, don\'t ask for refund.</string>
 
     <string name="queue">Queue</string>
-    <string name="queue_label">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_activity">Recent activity</string>
     <string name="recent_albums">Recent albums</string>
     <string name="recent_artists">Recent artists</string>
 
@@ -490,10 +389,8 @@
     <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_action">Rename</string>
     <string name="rename_playlist_title">Rename playlist</string>
 
-    <string name="reset_action">Reset</string>
     <string name="reset_artist_image">Reset artist image</string>
 
     <string name="restore">Restore</string>
@@ -503,23 +400,10 @@
 
     <string name="restoring_purchase">Restoring purchase…</string>
 
-    <string name="retro">Retro</string>
     <string name="retro_equalizer">Retro Music Equalizer</string>
 
-    <string name="saf_delete_failed">File delete failed: %s</string>
     <!-- SAF -->
-    <string name="saf_error_uri">Can\'t get SAF URI</string>
-    <string name="saf_guide_slide1_description">Open navigation drawer</string>
-    <string name="saf_guide_slide1_description_before_o">Enable \'Show SD card\' in overflow menu</string>
     <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s needs SD card access</string>
-    <string name="saf_guide_slide2_description">You need to select your SD card root directory</string>
-    <string name="saf_guide_slide2_title">Select your SD card in navigation drawer</string>
-    <string name="saf_guide_slide3_description">Do not open any subfolders</string>
-    <string name="saf_guide_slide3_title">Tap \'select\' button at the bottom of the screen</string>
-    <string name="saf_pick_file">File access required. Pick %s</string>
-    <string name="saf_pick_sdcard">SD card access required. Please pick root directory of SD card</string>
-    <string name="saf_write_failed">File write failed: %s</string>
 
     <string name="save_playlist_title">Save as file</string>
     <string name="save_playlists_title">Save as files</string>
@@ -527,8 +411,6 @@
     <string name="saved_playlist_to">Saved playlist to %s.</string>
 
     <string name="saving_changes">Saving changes</string>
-    <string name="saving_tags">Saving tags</string>
-    <string name="saving_to_file">Saving to file…</string>
 
     <string name="scan_media">Scan media</string>
 
@@ -536,12 +418,8 @@
 
     <string name="search_hint">Search your library…</string>
 
-    <string name="see_all">See all</string>
-
     <string name="select_all">Select all</string>
     <string name="select_banner_photo">Select banner photo</string>
-    <string name="select_preset">Select Preset</string>
-    <string name="select_profile_photo">Set a profile photo</string>
 
     <string name="set_artist_image">Set artist image</string>
 
@@ -552,16 +430,8 @@
     <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="slide_unlock">Swipe to unlock</string>
-
-    <string name="smart_playlists">Smart playlists</string>
-
     <string name="social">Social</string>
 
-    <string name="solid">Solid</string>
-
-    <string name="some_files_are_not_listed_in_the_media_store">Some files are not listed in the media store.</string>
-
     <string name="song">Song</string>
     <string name="song_duration">Song duration</string>
 
@@ -578,33 +448,19 @@
     <string name="speech_not_supported">Sorry! Your device doesn\'t support speech input</string>
     <string name="speech_prompt">Search your library</string>
 
-    <string name="suggestions">Suggestions</string>
-
-    <string name="summary_material_design_city_wallpaper">Material design city wallpapers from www.techjuice.pk website</string>
-    <string name="summary_material_design_icons">For all icons we used from this websites www.flaticon.com or www.materialdesignicons.com</string>
     <string name="summary_user_info">Just show your name on home screen</string>
 
     <string name="support_development">Support development</string>
-    <string name="support_development_summary">If you enjoy using Retro Music Player consider donation as support to my work.</string>
 
     <string name="synced_lyrics">Synced lyrics</string>
 
     <string name="system_equalizer">System Equalizer</string>
 
     <!-- Message displayed when tag editing fails -->
-    <string name="tag_edit_error">An error occurred editing tags.</string>
-    <string name="tag_editor_check_permission">Checking for permissions</string>
-    <string name="tag_editor_document_tree_message">Select the external storage directory</string>
-    <string name="tag_editor_document_tree_permission_failed">It seems that we don\'t have permission to edit the files. Double check the directory in the file picker.</string>
-    <string name="tag_error_kitkat">An error occurred editing tags. Is the file stored on an SD Card? If so, Google have made tag editing impossible for this file.</string>
-    <string name="tag_error_lollipop">An error occurred editing tags. If the file is stored on an SD Card, Retro Music might not have permission to access it.</string>
-    <string name="tag_retrieve_error">An error occurred retrieving tags.</string>
 
     <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="text">Text</string>
-
     <string name="thank_you">Thank you!</string>
 
     <string name="the_audio_file">The audio file</string>
@@ -615,30 +471,18 @@
 
     <string name="tiny">Tiny</string>
 
-    <string name="title">Title</string>
     <string name="title_dashboard">Dashboard</string>
-    <string name="title_desc">Title desc.</string>
     <string name="title_good_afternoon">Good afternoon</string>
     <string name="title_good_day">Good day</string>
     <string name="title_good_evening">Good evening</string>
     <string name="title_good_morning">Good morning</string>
     <string name="title_good_night">Good night</string>
-    <string name="title_home">Home</string>
-    <string name="title_material_design_city_wallpaper">City wallpaper</string>
-    <string name="title_material_design_icons">Icons</string>
-    <string name="title_notifications">Notifications</string>
     <string name="title_user_info">What\'s Your Name</string>
 
     <string name="today">Today</string>
 
-    <string name="toggle_lyrics_size">Toggle lyrics size</string>
-
-    <string name="tool_tip_see_all">See all songs</string>
-
     <string name="top_albums">Top albums</string>
     <string name="top_artists">Top artists</string>
-    <string name="top_tracks">Top tracks</string>
-    <string name="top_tracks_label">Top Tracks</string>
 
     <string name="track_hint">"Track (2 for track 2 or 3004 for CD3 track 4)"</string>
     <string name="track_list">Track number</string>
@@ -653,21 +497,13 @@
 
     <string name="up_next">Up next</string>
 
-    <string name="update">Update</string>
     <string name="update_image">Update image</string>
 
-    <string name="updated_artist_image">Artist image updated.</string>
-
     <string name="updating">Updating…</string>
 
-    <string name="user_profile_summary">Change profile and banner image</string>
-
     <string name="version">Version</string>
 
     <string name="virtualizer">Virtualizer</string>
-    <string name="virtualizer_strength">Virtualizer Strength</string>
-
-    <string name="volume_control">Volume control</string>
 
     <string name="web_search">Web search</string>
 
@@ -680,7 +516,6 @@
 
     <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="made_with_love">Made with ❤️ in India</string>
     <string name="clear_app_data">Clear app data</string>
     <string name="bug_report_summary">An unexpected error occurred. Sorry you found this bug, if it
@@ -693,5 +528,8 @@
     <string name="pref_title_album_cover_style">Album cover theme</string>
     <string name="circular">Circular</string>
     <string name="carousal">Carousal</string>
-    <string name="now_playing_summary">Customzie now playing screen</string>
+    <string name="now_playing_summary">Customize now playing screen</string>
+    <string name="full_card">Full card</string>
+    <string name="profile">Profile</string>
+    <string name="bio">Bio</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1a5adc4c4..26036fd6c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -23,23 +23,10 @@
         <item name="android:focusable">false</item>
     </style>
 
-    <style name="PlayingIndicator">
-        <item name="android:layout_width">36dp</item>
-        <item name="android:layout_height">36dp</item>
-        <item name="android:padding">8dp</item>
-        <item name="android:layout_gravity">center</item>
-    </style>
-
-    <style name="Fab" parent="FabParent" />
-
     <style name="MusicProgressSlider" parent="MusicProgressSliderParent">
         <item name="android:thumbOffset">0dp</item>
     </style>
 
-    <style name="TraditionalMusicProgressSlider" parent="TraditionalMusicProgressSliderParent">
-        <item name="android:thumbOffset">0dp</item>
-    </style>
-
     <style name="Toolbar">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">?actionBarSize</item>
@@ -58,79 +45,11 @@
         <item name="android:layout_height">48dp</item>
     </style>
 
-    <style name="Theme.Transparent" parent="android:Theme">
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:backgroundDimEnabled">false</item>
-    </style>
-
-
-    <style name="SettingsTabsTextAppearance" parent="TextAppearance.Design.Tab">
-        <item name="android:textAllCaps">false</item>
-        <item name="textAllCaps">false</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <style name="ExpandedTitleAppearance">
-        <item name="android:textAppearance">@style/TextAppearance.AppCompat.Display1</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:textStyle">bold</item>
-        <item name="fontPath">@string/circular_std_black</item>
-    </style>
-
-    <style name="ExpandedTitleAppearance.White" parent="ExpandedTitleAppearance">
-        <item name="android:textColor">@color/md_white_1000</item>
-    </style>
-
-    <style name="CollapsedTitleAppearance">
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-    </style>
-
-    <style name="CollapsedTitleAppearance.White">
-        <item name="android:textColor">@color/md_white_1000</item>
-    </style>
-
-    <style name="FullScreenTitleAppearance">
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:textAppearance">@style/TextAppearance.AppCompat.Body2</item>
-    </style>
-
-    <style name="FullScreenSubTitleAppearance">
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
-        <item name="android:textAppearance">@style/TextAppearance.AppCompat.Body1</item>
-    </style>
 
     <style name="ToolbarTextAppearance">
         <item name="fontPath">fonts/sans_regular.ttf</item>
     </style>
 
-    <style name="HintTextAppearance">
-        <item name="android:textColor">@color/md_white_1000</item>
-        <item name="android:textSize">12sp</item>
-    </style>
-
-    <style name="Toolbar.CenterTitle" parent="Toolbar">
-        <item name="titleTextAppearance">@style/ToolbarTitleGravity</item>
-        <item name="android:titleTextAppearance">@style/ToolbarTitleGravity</item>
-        <item name="subtitleTextAppearance">@style/ToolbarSubTitleGravity</item>
-        <item name="android:subtitleTextAppearance">@style/ToolbarSubTitleGravity</item>
-    </style>
-
-    <style name="ToolbarTitleGravity" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_gravity">center_horizontal</item>
-        <item name="android:gravity">center_horizontal</item>
-    </style>
-
-    <style name="ToolbarSubTitleGravity" parent="TextAppearance.Widget.AppCompat.Toolbar.Subtitle">
-        <item name="android:layout_gravity">center_horizontal</item>
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:gravity">center_horizontal</item>
-    </style>
-
     <style name="BigTitleTextAppearance">
         <item name="android:textAppearance">@style/TextAppearance.AppCompat.Title</item>
         <item name="android:layout_width">wrap_content</item>
@@ -140,12 +59,5 @@
         <item name="android:gravity">center</item>
     </style>
 
-    <style name="CollapsedToolbarLayout" parent="Widget.Design.CollapsingToolbar">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="layout_scrollFlags">scroll|enterAlwaysCollapsed</item>
-        <item name="titleEnabled">false</item>
-    </style>
-
 
 </resources>
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index ffaed9a42..5504b74c0 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -95,12 +95,6 @@
     </style>
 
 
-    <style name="FabParent">
-        <item name="borderWidth">0dp</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-    </style>
-
     <style name="MusicProgressSliderParent">
         <item name="android:progressDrawable">@android:color/transparent</item>
         <item name="android:layout_width">match_parent</item>
@@ -108,38 +102,15 @@
         <item name="android:thumb">@drawable/slider_thumb</item>
     </style>
 
-    <style name="TraditionalMusicProgressSliderParent">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginLeft">@dimen/seek_bar_margin_left_right</item>
-        <item name="android:layout_marginRight">@dimen/seek_bar_margin_left_right</item>
-    </style>
-
     <!-- content description is necessary to find the overflow button later in the layout-->
     <style name="Widget.ActionButton.Overflow" parent="Widget.AppCompat.ActionButton.Overflow">
         <item name="android:contentDescription">@string/abc_action_menu_overflow_description</item>
     </style>
 
-    <style name="SearchViewTheme" parent="PlaidDarkOverlay">
-        <item name="colorControlActivated">?android:colorAccent</item>
-        <item name="android:searchViewStyle">@style/SearchView</item>
-    </style>
-
-    <style name="PlaidDarkOverlay" parent="@android:style/ThemeOverlay.Material.Dark.ActionBar">
-        <!-- Used to theme dark elements in light themed screens.
-             Extend the material dark Action Bar overlay as this contains text styling. -->
-    </style>
-
-    <style name="SearchView" parent="android:style/Widget.Material.SearchView">
-        <item name="android:searchIcon">@android:color/transparent</item>
-        <item name="android:searchHintIcon">@android:color/transparent</item>
-        <item name="android:queryBackground">@android:color/transparent</item>
-        <item name="android:submitBackground">@android:color/transparent</item>
-    </style>
-
     <!-- set the rounded drawable as background to your bottom sheet -->
     <style name="BottomSheet" parent="@style/Widget.Design.BottomSheet.Modal">
         <item name="android:background">@drawable/bg_bottom_sheet_dialog_fragment</item>
+       <!-- <item name="behavior_peekHeight">200dp</item>-->
     </style>
 
 
diff --git a/app/src/main/res/values/values.xml b/app/src/main/res/values/values.xml
index 7953c97f0..8af546e70 100755
--- a/app/src/main/res/values/values.xml
+++ b/app/src/main/res/values/values.xml
@@ -2,7 +2,5 @@
 <resources>
     <string name="transition_album_art" translatable="false">album_art_transition</string>
     <string name="transition_artist_image" translatable="false">artist_image_transition</string>
-    <string name="transition_fab" translatable="false">fab_transition</string>
     <string name="transition_mini_player" translatable="false">mini_player_transition</string>
-    <string name="transition_search_bar" translatable="false">search_bar_transition</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_extras.xml b/app/src/main/res/xml/pref_extras.xml
new file mode 100644
index 000000000..31ccb5def
--- /dev/null
+++ b/app/src/main/res/xml/pref_extras.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference
+        android:defaultValue="0"
+        android:entries="@array/pref_grid_style_list_titles"
+        android:entryValues="@array/pref_grid_style_list_values"
+        android:key="album_grid_style"
+        android:negativeButtonText="@null"
+        android:positiveButtonText="@null"
+        android:title="@string/pref_title_album_grid_style"
+        app:iconSpaceReserved="false" />
+
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_others.xml b/app/src/main/res/xml/pref_others.xml
deleted file mode 100644
index 9f93c8f9f..000000000
--- a/app/src/main/res/xml/pref_others.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreference
-        android:key="changelog"
-        app:iconSpaceReserved="false"
-        android:summary="@string/changelog_summary"
-        android:title="@string/changelog" />
-
-    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreference
-        android:key="app_version"
-        android:summary="0.0.0"
-        app:iconSpaceReserved="false"
-        android:title="@string/version" />
-
-    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreference
-        android:key="open_source"
-        app:iconSpaceReserved="false"
-        android:summary="@string/pref_summary_open_source_licences"
-        android:title="@string/pref_title_open_source_licences" />
-
-    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreference
-        android:key="about"
-        app:iconSpaceReserved="false"
-        android:summary="@string/pref_summary_about"
-        android:title="@string/action_about" />
-
-</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_ui.xml b/app/src/main/res/xml/pref_ui.xml
index 0f43bee4b..fbb2ad28f 100644
--- a/app/src/main/res/xml/pref_ui.xml
+++ b/app/src/main/res/xml/pref_ui.xml
@@ -30,4 +30,18 @@
         android:title="@string/pref_title_toggle_tab_titles"
         app:iconSpaceReserved="false" />
 
+    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
+        android:defaultValue="false"
+        android:key="toggle_home_banner"
+        android:summary="@string/pref_summary_home_banner"
+        android:title="@string/pref_title_home_banner"
+        app:iconSpaceReserved="false" />
+
+    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
+        android:defaultValue="false"
+        android:key="toggle_genre"
+        android:summary="@string/pref_summary_genre_toggle"
+        android:title="@string/pref_title_genre_toggle"
+        app:iconSpaceReserved="false" />
+
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/appthemehelper/appthemehelper.iml b/appthemehelper/appthemehelper.iml
index 0f0d2e48c..9e4f2481e 100644
--- a/appthemehelper/appthemehelper.iml
+++ b/appthemehelper/appthemehelper.iml
@@ -8,11 +8,11 @@
     </facet>
     <facet type="android" name="Android">
       <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="release" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleRelease" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileReleaseSources" />
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <afterSyncTasks>
-          <task>generateReleaseSources</task>
+          <task>generateDebugSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -24,32 +24,46 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
-    <output url="file://$MODULE_DIR$/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/releaseUnitTest/compileReleaseUnitTestJavaWithJavac/classes" />
+    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/release" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/release/generateReleaseRFile/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/release/compileReleaseAidl/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/release" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/release/compileReleaseRenderscript/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/release" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/release" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/release" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/release/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testRelease/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debugAndroidTest/processDebugAndroidTestResources/r" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -73,7 +87,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/aapt_friendly_merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/consumer_proguard_file" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
@@ -81,7 +95,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
diff --git a/appthemehelper/src/main/res/drawable/ate_check.xml b/appthemehelper/src/main/res/drawable/ate_check.xml
index 67e2f7925..aaf763171 100755
--- a/appthemehelper/src/main/res/drawable/ate_check.xml
+++ b/appthemehelper/src/main/res/drawable/ate_check.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="52dp"
-        android:height="52dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="#fff"
-        android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M9,16.17L5.53,12.7c-0.39,-0.39 -1.02,-0.39 -1.41,0l0,0c-0.39,0.39 -0.39,1.02 0,1.41l4.18,4.18c0.39,0.39 1.02,0.39 1.41,0L20.29,7.71c0.39,-0.39 0.39,-1.02 0,-1.41l0,0c-0.39,-0.39 -1.02,-0.39 -1.41,0L9,16.17z" />
 </vector>
diff --git a/appthemehelper/src/main/res/drawable/ic_toggle_switch.xml b/appthemehelper/src/main/res/drawable/ic_toggle_switch.xml
index b7d9d68cd..efbd5ee5a 100644
--- a/appthemehelper/src/main/res/drawable/ic_toggle_switch.xml
+++ b/appthemehelper/src/main/res/drawable/ic_toggle_switch.xml
@@ -1,10 +1,10 @@
 <!-- drawable/toggle_switch.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-  android:height="24dp"
-  android:viewportHeight="24"
-  android:viewportWidth="24"
-  android:width="24dp">
-  <path
-    android:fillColor="#000"
-    android:pathData="M17,7A5,5 0 0,1 22,12A5,5 0 0,1 17,17A5,5 0 0,1 12,12A5,5 0 0,1 17,7M4,14A2,2 0 0,1 2,12A2,2 0 0,1 4,10H10V14H4Z"/>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M17,7H7c-2.76,0-5,2.24-5,5s2.24,5,5,5h10c2.76,0,5-2.24,5-5S19.76,7,17,7z M17,15c-1.66,0-3-1.34-3-3s1.34-3,3-3 s3,1.34,3,3S18.66,15,17,15z" />
 </vector>
\ No newline at end of file
diff --git a/appthemehelper/src/main/res/drawable/ic_toggle_switch_off.xml b/appthemehelper/src/main/res/drawable/ic_toggle_switch_off.xml
index 55fa630f1..8f7202e7a 100644
--- a/appthemehelper/src/main/res/drawable/ic_toggle_switch_off.xml
+++ b/appthemehelper/src/main/res/drawable/ic_toggle_switch_off.xml
@@ -1,8 +1,11 @@
-<!-- drawable/toggle_switch_off.xml -->
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M7,7A5,5 0 0,1 12,12A5,5 0 0,1 7,17A5,5 0 0,1 2,12A5,5 0 0,1 7,7M20,14H14V10H20A2,2 0 0,1 22,12A2,2 0 0,1 20,14M7,9A3,3 0 0,0 4,12A3,3 0 0,0 7,15A3,3 0 0,0 10,12A3,3 0 0,0 7,9Z" />
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M17,7H7c-2.76,0-5,2.24-5,5s2.24,5,5,5h10c2.76,0,5-2.24,5-5S19.76,7,17,7z M7,15c-1.66,0-3-1.34-3-3s1.34-3,3-3 s3,1.34,3,3S8.66,15,7,15z" />
 </vector>
\ No newline at end of file
diff --git a/appthemehelper/src/main/res/values/colors.xml b/appthemehelper/src/main/res/values/colors.xml
index 45808b18f..f755a5d85 100755
--- a/appthemehelper/src/main/res/values/colors.xml
+++ b/appthemehelper/src/main/res/values/colors.xml
@@ -14,7 +14,6 @@
     <color name="ate_text_disabled_light">#61000000</color>
     <!-- 54% -->
     <color name="ate_secondary_text_light">#8A000000</color>
-    <color name="ate_icon_light">#8A000000</color>
     <color name="ate_control_normal_light">#8A000000</color>
     <!-- 87% -->
     <color name="ate_primary_text_light">#DE000000</color>
@@ -23,7 +22,6 @@
     <!--Grey 400, #BDBDBD, Opacity  100%-->
     <color name="ate_switch_thumb_disabled_light">#FFBDBDBD</color>
     <!---->
-    <color name="ate_navigation_drawer_selected_light">#E8E8E8</color>
 
     <!--DARK-->
     <!--10%-->
@@ -37,7 +35,6 @@
     <color name="ate_text_disabled_dark">#4DFFFFFF</color>
     <!-- 70% -->
     <color name="ate_secondary_text_dark">#B3FFFFFF</color>
-    <color name="ate_icon_dark">#B3FFFFFF</color>
     <color name="ate_control_normal_dark">#B3FFFFFF</color>
     <!-- 100% -->
     <color name="ate_primary_text_dark">#FFFFFFFF</color>
@@ -46,7 +43,5 @@
     <!--Grey 800, #424242, Opacity 100%-->
     <color name="ate_switch_thumb_disabled_dark">#FF424242</color>
     <!---->
-    <color name="ate_navigation_drawer_selected_dark">#202020</color>
-    <color name="black_p50">#7f000000</color>
 
 </resources>
diff --git a/appthemehelper/src/main/res/values/colors_material_design.xml b/appthemehelper/src/main/res/values/colors_material_design.xml
index a00ddac9e..b430f3039 100755
--- a/appthemehelper/src/main/res/values/colors_material_design.xml
+++ b/appthemehelper/src/main/res/values/colors_material_design.xml
@@ -5,331 +5,76 @@
     https://www.google.com/design/spec/style/color.html#color-color-palette -->
 
     <!-- Items Light -->
-    <color name="md_light_background">@color/md_grey_50</color>
     <!-- 12% -->
-    <color name="md_light_dividers">#1F000000</color>
     <!-- 38% -->
-    <color name="md_light_disabled">#61000000</color>
     <!-- 54% -->
-    <color name="md_light_secondary">#8A000000</color>
-    <color name="md_light_primary_icon">#8A000000</color>
     <!-- 87% -->
-    <color name="md_light_primary_text">#DE000000</color>
     <!-- other specifications -->
-    <color name="md_light_statusbar">@color/md_grey_300</color>
-    <color name="md_light_appbar">@color/md_grey_100</color>
-    <color name="md_light_cards">@color/md_white_1000</color>
-    <color name="md_light_dialogs">@color/md_white_1000</color>
 
     <!-- Items Dark -->
-    <color name="md_dark_background">@color/md_grey_850</color>
     <!-- 12% -->
-    <color name="md_dark_dividers">#1FFFFFFF</color>
     <!-- 30% -->
-    <color name="md_dark_disabled">#4DFFFFFF</color>
     <!-- 70% -->
-    <color name="md_dark_secondary">#B3FFFFFF</color>
-    <color name="md_dark_primary_icon">#B3FFFFFF</color>
     <!-- 100% -->
-    <color name="md_dark_primary_text">#FFFFFFFF</color>
     <!-- other specifications -->
-    <color name="md_dark_statusbar">@color/md_black_1000</color>
-    <color name="md_dark_appbar">@color/md_grey_900</color>
-    <color name="md_dark_cards">@color/md_grey_800</color>
-    <color name="md_dark_dialogs">@color/md_grey_800</color>
 
     <!-- Red -->
-    <color name="md_red_50">#FFEBEE</color>
-    <color name="md_red_100">#FFCDD2</color>
-    <color name="md_red_200">#EF9A9A</color>
-    <color name="md_red_300">#E57373</color>
     <color name="md_red_400">#EF5350</color>
     <color name="md_red_500">#F44336</color>
-    <color name="md_red_600">#E53935</color>
-    <color name="md_red_700">#D32F2F</color>
-    <color name="md_red_800">#C62828</color>
-    <color name="md_red_900">#B71C1C</color>
-    <color name="md_red_A100">#FF8A80</color>
-    <color name="md_red_A200">#FF5252</color>
-    <color name="md_red_A400">#FF1744</color>
     <color name="md_red_A700">#D50000</color>
 
     <!-- Pink -->
-    <color name="md_pink_50">#FCE4EC</color>
-    <color name="md_pink_100">#F8BBD0</color>
-    <color name="md_pink_200">#F48FB1</color>
-    <color name="md_pink_300">#F06292</color>
-    <color name="md_pink_400">#EC407A</color>
     <color name="md_pink_500">#E91E63</color>
-    <color name="md_pink_600">#D81B60</color>
-    <color name="md_pink_700">#C2185B</color>
-    <color name="md_pink_800">#AD1457</color>
-    <color name="md_pink_900">#880E4F</color>
-    <color name="md_pink_A100">#FF80AB</color>
-    <color name="md_pink_A200">#FF4081</color>
     <color name="md_pink_A400">#F50057</color>
-    <color name="md_pink_A700">#C51162</color>
 
     <!-- Purple -->
-    <color name="md_purple_50">#F3E5F5</color>
-    <color name="md_purple_100">#E1BEE7</color>
-    <color name="md_purple_200">#CE93D8</color>
-    <color name="md_purple_300">#BA68C8</color>
-    <color name="md_purple_400">#AB47BC</color>
-    <color name="md_purple_500">#9C27B0</color>
-    <color name="md_purple_600">#8E24AA</color>
-    <color name="md_purple_700">#7B1FA2</color>
-    <color name="md_purple_800">#6A1B9A</color>
-    <color name="md_purple_900">#4A148C</color>
-    <color name="md_purple_A100">#EA80FC</color>
-    <color name="md_purple_A200">#E040FB</color>
-    <color name="md_purple_A400">#D500F9</color>
-    <color name="md_purple_A700">#AA00FF</color>
 
     <!-- Deep Purple -->
-    <color name="md_deep_purple_50">#EDE7F6</color>
-    <color name="md_deep_purple_100">#D1C4E9</color>
-    <color name="md_deep_purple_200">#B39DDB</color>
-    <color name="md_deep_purple_300">#9575CD</color>
-    <color name="md_deep_purple_400">#7E57C2</color>
-    <color name="md_deep_purple_500">#673AB7</color>
-    <color name="md_deep_purple_600">#5E35B1</color>
-    <color name="md_deep_purple_700">#512DA8</color>
-    <color name="md_deep_purple_800">#4527A0</color>
-    <color name="md_deep_purple_900">#311B92</color>
-    <color name="md_deep_purple_A100">#B388FF</color>
-    <color name="md_deep_purple_A200">#7C4DFF</color>
     <color name="md_deep_purple_A400">#651FFF</color>
     <color name="md_deep_purple_A700">#6200EA</color>
 
     <!-- Indigo -->
-    <color name="md_indigo_50">#E8EAF6</color>
-    <color name="md_indigo_100">#C5CAE9</color>
-    <color name="md_indigo_200">#9FA8DA</color>
-    <color name="md_indigo_300">#7986CB</color>
-    <color name="md_indigo_400">#5C6BC0</color>
     <color name="md_indigo_500">#3F51B5</color>
-    <color name="md_indigo_600">#3949AB</color>
-    <color name="md_indigo_700">#303F9F</color>
-    <color name="md_indigo_800">#283593</color>
-    <color name="md_indigo_900">#1A237E</color>
-    <color name="md_indigo_A100">#8C9EFF</color>
-    <color name="md_indigo_A200">#536DFE</color>
-    <color name="md_indigo_A400">#3D5AFE</color>
-    <color name="md_indigo_A700">#304FFE</color>
 
     <!-- Blue -->
-    <color name="md_blue_50">#E3F2FD</color>
-    <color name="md_blue_100">#BBDEFB</color>
-    <color name="md_blue_200">#90CAF9</color>
-    <color name="md_blue_300">#64B5F6</color>
-    <color name="md_blue_400">#42A5F5</color>
     <color name="md_blue_500">#2196F3</color>
-    <color name="md_blue_600">#1E88E5</color>
-    <color name="md_blue_700">#1976D2</color>
-    <color name="md_blue_800">#1565C0</color>
-    <color name="md_blue_900">#0D47A1</color>
-    <color name="md_blue_A100">#82B1FF</color>
     <color name="md_blue_A200">#448AFF</color>
     <color name="md_blue_A400">#2979FF</color>
-    <color name="md_blue_A700">#2962FF</color>
 
     <!-- Light Blue -->
-    <color name="md_light_blue_50">#E1F5FE</color>
-    <color name="md_light_blue_100">#B3E5FC</color>
-    <color name="md_light_blue_200">#81D4FA</color>
-    <color name="md_light_blue_300">#4FC3F7</color>
-    <color name="md_light_blue_400">#29B6F6</color>
-    <color name="md_light_blue_500">#03A9F4</color>
-    <color name="md_light_blue_600">#039BE5</color>
-    <color name="md_light_blue_700">#0288D1</color>
-    <color name="md_light_blue_800">#0277BD</color>
-    <color name="md_light_blue_900">#01579B</color>
-    <color name="md_light_blue_A100">#80D8FF</color>
-    <color name="md_light_blue_A200">#40C4FF</color>
-    <color name="md_light_blue_A400">#00B0FF</color>
-    <color name="md_light_blue_A700">#0091EA</color>
 
     <!-- Cyan -->
-    <color name="md_cyan_50">#E0F7FA</color>
-    <color name="md_cyan_100">#B2EBF2</color>
-    <color name="md_cyan_200">#80DEEA</color>
-    <color name="md_cyan_300">#4DD0E1</color>
-    <color name="md_cyan_400">#26C6DA</color>
-    <color name="md_cyan_500">#00BCD4</color>
-    <color name="md_cyan_600">#00ACC1</color>
-    <color name="md_cyan_700">#0097A7</color>
-    <color name="md_cyan_800">#00838F</color>
-    <color name="md_cyan_900">#006064</color>
-    <color name="md_cyan_A100">#84FFFF</color>
-    <color name="md_cyan_A200">#18FFFF</color>
-    <color name="md_cyan_A400">#00E5FF</color>
-    <color name="md_cyan_A700">#00B8D4</color>
 
     <!-- Teal -->
-    <color name="md_teal_50">#E0F2F1</color>
-    <color name="md_teal_100">#B2DFDB</color>
-    <color name="md_teal_200">#80CBC4</color>
-    <color name="md_teal_300">#4DB6AC</color>
-    <color name="md_teal_400">#26A69A</color>
-    <color name="md_teal_500">#009688</color>
-    <color name="md_teal_600">#00897B</color>
-    <color name="md_teal_700">#00796B</color>
-    <color name="md_teal_800">#00695C</color>
-    <color name="md_teal_900">#004D40</color>
-    <color name="md_teal_A100">#A7FFEB</color>
-    <color name="md_teal_A200">#64FFDA</color>
-    <color name="md_teal_A400">#1DE9B6</color>
-    <color name="md_teal_A700">#00BFA5</color>
 
     <!-- Green -->
-    <color name="md_green_50">#E8F5E9</color>
-    <color name="md_green_100">#C8E6C9</color>
-    <color name="md_green_200">#A5D6A7</color>
-    <color name="md_green_300">#81C784</color>
-    <color name="md_green_400">#66BB6A</color>
-    <color name="md_green_500">#4CAF50</color>
-    <color name="md_green_600">#43A047</color>
-    <color name="md_green_700">#388E3C</color>
-    <color name="md_green_800">#2E7D32</color>
-    <color name="md_green_900">#1B5E20</color>
-    <color name="md_green_A100">#B9F6CA</color>
     <color name="md_green_A200">#69F0AE</color>
-    <color name="md_green_A400">#00E676</color>
     <color name="md_green_A700">#00C853</color>
 
     <!-- Light Green -->
-    <color name="md_light_green_50">#F1F8E9</color>
-    <color name="md_light_green_100">#DCEDC8</color>
-    <color name="md_light_green_200">#C5E1A5</color>
-    <color name="md_light_green_300">#AED581</color>
-    <color name="md_light_green_400">#9CCC65</color>
-    <color name="md_light_green_500">#8BC34A</color>
-    <color name="md_light_green_600">#7CB342</color>
-    <color name="md_light_green_700">#689F38</color>
-    <color name="md_light_green_800">#558B2F</color>
-    <color name="md_light_green_900">#33691E</color>
-    <color name="md_light_green_A100">#CCFF90</color>
-    <color name="md_light_green_A200">#B2FF59</color>
-    <color name="md_light_green_A400">#76FF03</color>
-    <color name="md_light_green_A700">#64DD17</color>
 
     <!-- Lime -->
-    <color name="md_lime_50">#F9FBE7</color>
-    <color name="md_lime_100">#F0F4C3</color>
-    <color name="md_lime_200">#E6EE9C</color>
-    <color name="md_lime_300">#DCE775</color>
-    <color name="md_lime_400">#D4E157</color>
-    <color name="md_lime_500">#CDDC39</color>
-    <color name="md_lime_600">#C0CA33</color>
-    <color name="md_lime_700">#AFB42B</color>
-    <color name="md_lime_800">#9E9D24</color>
-    <color name="md_lime_900">#827717</color>
-    <color name="md_lime_A100">#F4FF81</color>
-    <color name="md_lime_A200">#EEFF41</color>
-    <color name="md_lime_A400">#C6FF00</color>
-    <color name="md_lime_A700">#AEEA00</color>
 
     <!-- Yellow -->
-    <color name="md_yellow_50">#FFFDE7</color>
-    <color name="md_yellow_100">#FFF9C4</color>
-    <color name="md_yellow_200">#FFF59D</color>
-    <color name="md_yellow_300">#FFF176</color>
-    <color name="md_yellow_400">#FFEE58</color>
-    <color name="md_yellow_500">#FFEB3B</color>
-    <color name="md_yellow_600">#FDD835</color>
-    <color name="md_yellow_700">#FBC02D</color>
-    <color name="md_yellow_800">#F9A825</color>
-    <color name="md_yellow_900">#F57F17</color>
-    <color name="md_yellow_A100">#FFFF8D</color>
-    <color name="md_yellow_A200">#FFFF00</color>
-    <color name="md_yellow_A400">#FFEA00</color>
-    <color name="md_yellow_A700">#FFD600</color>
 
     <!-- Amber -->
-    <color name="md_amber_50">#FFF8E1</color>
-    <color name="md_amber_100">#FFECB3</color>
-    <color name="md_amber_200">#FFE082</color>
-    <color name="md_amber_300">#FFD54F</color>
-    <color name="md_amber_400">#FFCA28</color>
-    <color name="md_amber_500">#FFC107</color>
-    <color name="md_amber_600">#FFB300</color>
-    <color name="md_amber_700">#FFA000</color>
-    <color name="md_amber_800">#FF8F00</color>
-    <color name="md_amber_900">#FF6F00</color>
-    <color name="md_amber_A100">#FFE57F</color>
-    <color name="md_amber_A200">#FFD740</color>
-    <color name="md_amber_A400">#FFC400</color>
-    <color name="md_amber_A700">#FFAB00</color>
 
     <!-- Orange -->
-    <color name="md_orange_50">#FFF3E0</color>
-    <color name="md_orange_100">#FFE0B2</color>
-    <color name="md_orange_200">#FFCC80</color>
-    <color name="md_orange_300">#FFB74D</color>
-    <color name="md_orange_400">#FFA726</color>
-    <color name="md_orange_500">#FF9800</color>
-    <color name="md_orange_600">#FB8C00</color>
-    <color name="md_orange_700">#F57C00</color>
-    <color name="md_orange_800">#EF6C00</color>
-    <color name="md_orange_900">#E65100</color>
-    <color name="md_orange_A100">#FFD180</color>
-    <color name="md_orange_A200">#FFAB40</color>
-    <color name="md_orange_A400">#FF9100</color>
-    <color name="md_orange_A700">#FF6D00</color>
 
     <!-- Deep Orange -->
-    <color name="md_deep_orange_50">#FBE9E7</color>
-    <color name="md_deep_orange_100">#FFCCBC</color>
-    <color name="md_deep_orange_200">#FFAB91</color>
-    <color name="md_deep_orange_300">#FF8A65</color>
-    <color name="md_deep_orange_400">#FF7043</color>
-    <color name="md_deep_orange_500">#FF5722</color>
-    <color name="md_deep_orange_600">#F4511E</color>
-    <color name="md_deep_orange_700">#E64A19</color>
-    <color name="md_deep_orange_800">#D84315</color>
-    <color name="md_deep_orange_900">#BF360C</color>
-    <color name="md_deep_orange_A100">#FF9E80</color>
-    <color name="md_deep_orange_A200">#FF6E40</color>
-    <color name="md_deep_orange_A400">#FF3D00</color>
-    <color name="md_deep_orange_A700">#DD2C00</color>
 
     <!-- Brown -->
-    <color name="md_brown_50">#EFEBE9</color>
-    <color name="md_brown_100">#D7CCC8</color>
-    <color name="md_brown_200">#BCAAA4</color>
-    <color name="md_brown_300">#A1887F</color>
-    <color name="md_brown_400">#8D6E63</color>
-    <color name="md_brown_500">#795548</color>
-    <color name="md_brown_600">#6D4C41</color>
-    <color name="md_brown_700">#5D4037</color>
-    <color name="md_brown_800">#4E342E</color>
-    <color name="md_brown_900">#3E2723</color>
 
     <!-- Grey -->
-    <color name="md_grey_50">#FAFAFA</color>
-    <color name="md_grey_100">#F5F5F5</color>
     <color name="md_grey_200">#EEEEEE</color>
-    <color name="md_grey_300">#E0E0E0</color>
     <color name="md_grey_400">#BDBDBD</color>
     <color name="md_grey_500">#9E9E9E</color>
-    <color name="md_grey_600">#757575</color>
     <color name="md_grey_700">#616161</color>
     <color name="md_grey_800">#424242</color>
-    <color name="md_grey_850">#303030</color>
     <color name="md_grey_900">#212121</color>
 
     <!-- Blue Grey -->
-    <color name="md_blue_grey_50">#ECEFF1</color>
-    <color name="md_blue_grey_100">#CFD8DC</color>
-    <color name="md_blue_grey_200">#B0BEC5</color>
-    <color name="md_blue_grey_300">#90A4AE</color>
-    <color name="md_blue_grey_400">#78909C</color>
-    <color name="md_blue_grey_500">#607D8B</color>
-    <color name="md_blue_grey_600">#546E7A</color>
-    <color name="md_blue_grey_700">#455A64</color>
     <color name="md_blue_grey_800">#37474F</color>
-    <color name="md_blue_grey_900">#263238</color>
 
     <!-- Black & White -->
     <color name="md_black_1000">#000000</color>
diff --git a/appthemehelper/src/main/res/values/dimens.xml b/appthemehelper/src/main/res/values/dimens.xml
index 61ce1cb01..930b05bb6 100755
--- a/appthemehelper/src/main/res/values/dimens.xml
+++ b/appthemehelper/src/main/res/values/dimens.xml
@@ -3,15 +3,8 @@
 
     <dimen name="ate_circleview_border">1dp</dimen>
 
-    <dimen name="ate_default_textsize_display4">112sp</dimen>
-    <dimen name="ate_default_textsize_display3">56sp</dimen>
-    <dimen name="ate_default_textsize_display2">45sp</dimen>
-    <dimen name="ate_default_textsize_display1">34sp</dimen>
-    <dimen name="ate_default_textsize_headline">24sp</dimen>
-    <dimen name="ate_default_textsize_title">20sp</dimen>
     <dimen name="ate_default_textsize_subheading">16sp</dimen>
     <dimen name="ate_default_textsize_body">14sp</dimen>
-    <dimen name="ate_default_textsize_caption">12sp</dimen>
 
     <dimen name="ate_preference_inset">16dp</dimen>
 
diff --git a/build.gradle b/build.gradle
index a7ecaa50a..49bdf9aca 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,13 +1,19 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    
+    ext {
+        supportLibVersion = '1.0.0-rc01'
+        firebase = "11.8.0"
+        retrofit = "2.3.0"
+        butterKnife = "9.0.0-SNAPSHOT"
+        materialDialog = "0.9.6.0"
+    }
     repositories {
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0-alpha07'
+        classpath 'com.android.tools.build:gradle:3.3.0-alpha08'
     }
 }